dolibarr

Author	SHA1	Message	Date
John BOTELLA	4fa10296f4	Fix screen size fall	2018-12-15 12:34:41 +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	b511a056f4	Fix phpcs	2018-12-15 11:48:21 +01:00
Laurent Destailleur	baf9b6f309	Fix regression (bad name of function)	2018-12-14 19:21:19 +01:00
Laurent Destailleur	38ddfd9a62	Merge pull request #10152 from defrance/patch-134 refactoring list.php with dol_sql_datefilter	2018-12-14 19:06:29 +01:00
Laurent Destailleur	3571eaee3d	Merge branch 'develop' into NEW_change_order_concat_desc	2018-12-14 17:44:08 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	83efdee7d3	Merge branch 'develop' into new_mass_generate	2018-12-14 15:44:46 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	233e160489	Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2 NEW Extend import option to Order's card and Propal's card	2018-12-14 15:29:27 +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	f97b561af0	Merge branch 'develop' into qual_rename_facnumber	2018-12-13 20:24:12 +01:00
Laurent Destailleur	210c937725	Merge pull request #10213 from inoveaconseil/patch-5 NEW: Add note in tooltips	2018-12-13 20:06:13 +01:00
Laurent Destailleur	4a61c1b6ed	FIX lang not loaded	2018-12-11 13:25:09 +01:00
Laurent Destailleur	5ec9a1ca7f	Remove deprecated parameter	2018-12-11 10:15:13 +01:00
Laurent Destailleur	434cf2e046	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-11 09:58:14 +01:00
Laurent Destailleur	a107d16338	Revert "clean and update code" This reverts commit `68de0ba93b`.	2018-12-11 09:52:00 +01:00
Laurent Destailleur	b47e7b2267	Work on new unsubscribe process	2018-12-11 09:49:46 +01:00
Inovea Conseil	9bfcabc8c9	NEW: Add note in tooltips	2018-12-10 16:09:56 +01:00
Laurent Destailleur	138640fc63	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php	2018-12-04 14:58:11 +01:00
Laurent Destailleur	8e333c3feb	Standardize code	2018-12-04 14:54:58 +01:00
Laurent Destailleur	d80baaea69	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/contrat/class/contrat.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php	2018-12-04 14:29:47 +01:00
Ferran Marcet	7247b14bd9	FIX Lines are not inserted correctly if VAT have code	2018-12-03 12:28:17 +01:00
Ferran Marcet	8312d57d16	FIX Lines are not inserted correctly if VAT have code	2018-12-03 11:58:39 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
BENKE Charlene	21b55f3a83	refactoring dol_sql_datefilter	2018-12-01 23:30:58 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
florian HENRY	7a182c7880	fix #10069	2018-11-30 23:25:44 +01:00
Inovea Conseil	ad7117be60	FIX mass action closed proposal	2018-11-30 15:05:28 +01:00
BENKE Charlene	10bf7bdc95	Duplicate declaration of $object Already present line 126	2018-11-29 10:29:04 +01:00
Laurent Destailleur	3b66a2bf9c	Fix missing email in popup	2018-11-28 14:20:55 +01:00
Laurent Destailleur	0367795488	Fix auto jump on record if only 1 record in a search	2018-11-27 11:09:47 +01:00
Laurent Destailleur	f0e4c262a3	Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete	2018-11-24 11:13:49 +01:00
Laurent Destailleur	5bd9c14929	Update demo data for 8.0 and 9.0	2018-11-23 14:05:45 +01:00
Thibault Descamps	c2e5a29246	NEW redirect if only one result on global search on card	2018-11-22 11:36:30 +01:00
Thibault Descamps	1cc130e5f6	NEW : conf to change concat desc order	2018-11-21 09:57:44 +01:00
Frédéric FRANCE	8f17ae8df5	GETPOSTISSET has only one parameter	2018-11-19 20:28:55 +01:00
Laurent Destailleur	39621ec686	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2018-11-19 20:07:51 +01:00
Laurent Destailleur	25ee999d27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 20:05:32 +01:00
Laurent Destailleur	2f87ee6640	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-19 15:56:38 +01:00
Laurent Destailleur	f85ab8d0a6	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/card.php	2018-11-19 15:55:41 +01:00
Laurent Destailleur	5f93315097	Clean code	2018-11-19 15:14:46 +01:00
Laurent Destailleur	0886928a64	FIX Link between action and project must use field not the link table	2018-11-19 14:38:30 +01:00
Laurent Destailleur	1e1ccd4c88	Fix pagination in action/event list	2018-11-19 14:25:34 +01:00
florian HENRY	dc2f1e9812	fix list agenda extrafield visibility	2018-11-19 11:25:48 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Regis Houssin	0592e8a31c	FIX config is override by multicompany module	2018-11-14 16:44:10 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Regis Houssin	04edcaa89c	FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-13 20:20:46 +01:00
gauthier	f404cae546	FIX : Same on customer card	2018-11-12 16:04:42 +01:00
gauthier	66ea8bbe87	FIX : fourn payment modes musn't be available on customer docs	2018-11-12 15:58:41 +01:00
Laurent Destailleur	84983140b6	Merge pull request #9896 from hregis/develop_email FIX change my deprecated email	2018-11-11 17:35:35 +01:00
Laurent Destailleur	de259e9db6	Code comment	2018-11-11 14:36:35 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	3e844db74f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fichinter/stats/index.php	2018-11-08 20:19:28 +01:00
Laurent Destailleur	be788e6167	FIX responsive	2018-11-08 19:57:31 +01:00
Laurent Destailleur	46db246273	Look and feel v9: Autofocus on create forms	2018-11-07 13:04:43 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
John BOTELLA	abb6b41f91	Fix screen size fall	2018-11-07 11:25:13 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	68ec172798	Fix setup to enable reminder b email	2018-11-03 12:37:52 +01:00
Frédéric FRANCE	fe5056add8	remove fieldlabel and add fieldeditkey	2018-10-27 18:07:05 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Laurent Destailleur	852b069785	Fix reponsive in stats pages	2018-10-26 15:46:17 +02:00
atm-john	759b2b6ccf	Extend import option to Order's card and Propal's card	2018-10-25 21:39:22 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	01adaf253c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/class/account.class.php htdocs/product/list.php	2018-10-24 03:35:44 +02:00
Laurent Destailleur	23a9416c19	Fix deprecated field	2018-10-23 23:51:27 +02:00
Laurent Destailleur	c8aa884462	Fix search all	2018-10-23 17:16:46 +02:00
Laurent Destailleur	9959ba3662	Merge pull request #9761 from frederic34/patch-20 Update actioncomm.class.php	2018-10-16 20:29:15 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
Frédéric FRANCE	cab9c81ce2	Update actioncomm.class.php	2018-10-15 21:53:54 +02:00
Laurent Destailleur	743d4d7c01	NEW add option PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT	2018-10-15 16:40:40 +02:00
Maxime Kohlhaas	d4d921b1cc	Add massaction generate on main lists	2018-10-14 16:27:59 +02:00
Laurent Destailleur	532e05c42e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: ChangeLog htdocs/filefunc.inc.php	2018-10-13 14:29:51 +02:00
Laurent Destailleur	c15505bc13	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-13 14:27:50 +02:00
Marc de Lima Lucio	afd9b4ea1a	FIX: propal pdf: missing parenthesis for customs code	2018-10-12 18:19:17 +02:00
Laurent Destailleur	1d04ce2185	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-10-09 17:07:32 +02:00
Laurent Destailleur	01c32525df	Merge	2018-10-09 17:06:08 +02:00
Laurent Destailleur	0938ac4afa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/list.php	2018-10-09 14:54:18 +02:00
Laurent Destailleur	3c8b365c3e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-09 14:53:39 +02:00
Laurent Destailleur	4d959bbea7	Fix consistency of label of proposal status	2018-10-09 14:06:45 +02:00
Laurent Destailleur	bc4ddce314	Merge pull request #9713 from frederic34/patch-9 Update index.php	2018-10-09 12:43:32 +02:00
Frédéric FRANCE	b615d03b0b	Update index.php	2018-10-09 12:17:51 +02:00
Philippe GRAND	af0bcb2631	Standardize code	2018-10-09 09:40:00 +02:00
Philippe GRAND	ac214a7258	Standardize code	2018-10-09 08:53:08 +02:00
Laurent Destailleur	91038af84d	FIX properties on proposal must not be modified if error	2018-10-08 18:15:46 +02:00
Laurent Destailleur	c930218dd2	FIX Missing transaction around action	2018-10-08 17:40:17 +02:00
Philippe GRAND	da560289e3	Standardize code	2018-10-05 15:48:38 +02:00
atm-ph	bfaf25ca2a	Fix wrong value for module part and return access denied	2018-10-04 16:55:16 +02:00
Alexey Pyltsyn	49de7a5881	Replace multiple load calls with loadLangs method	2018-10-01 09:22:23 +03:00
Laurent Destailleur	e2f450aa8c	Fix regession losing description. Rename updateligne into updateline.	2018-09-28 16:15:17 +02:00
Laurent Destailleur	26d20d0b76	Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price NEW Advanced permission to ignore price min	2018-09-27 09:57:49 +02:00
Laurent Destailleur	d9ccc7624b	Standardize code	2018-09-23 16:09:25 +02:00
Laurent Destailleur	6c814b32bd	Standardize cod	2018-09-23 15:58:33 +02:00
Laurent Destailleur	5bd538fb2c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/core/modules/modStripe.class.php htdocs/filefunc.inc.php htdocs/projet/element.php	2018-09-20 23:43:34 +02:00
Laurent Destailleur	eb80c5c338	Fix translation not loaded and test on multicompany	2018-09-20 19:45:13 +02:00
John BOTELLA	83d3e5ec39	NEW : can add project's task to agenda on create event card	2018-09-20 10:17:43 +02:00
Laurent Destailleur	a546ef7f2d	FIX default day	2018-09-19 20:01:25 +02:00
Laurent Destailleur	92aa6929de	Fix go back on agenda view on correct page	2018-09-19 17:03:13 +02:00
Laurent Destailleur	824b572bd0	FIX Amount when using mutlicurrency on PDF Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php	2018-09-19 15:03:24 +02:00
Frédéric FRANCE	1d43c6bc3a	call to deprecated add_object_linked was present two times	2018-09-19 10:57:59 +02:00
Laurent Destailleur	03928a914d	Merge pull request #9537 from frederic34/patch-20 reduce complexity of actioncomm reminder class	2018-09-18 15:08:46 +02:00
Frédéric FRANCE	beb7a0609c	reduce complexity of actioncomm reminder class	2018-09-16 19:06:21 +02:00
Frédéric FRANCE	7b37c41cfb	reduce complexity of actioncomm class	2018-09-16 19:04:43 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	74a9c680df	FIX "Other ..." link so the "Back to" link works.	2018-09-16 12:27:56 +02:00
Laurent Destailleur	4efab446d0	Merge pull request #9508 from frederic34/patch-15 reduce complexity of libstatut propal.class.php	2018-09-15 17:24:59 +02:00
Laurent Destailleur	80fb1e0657	NEW Each user can set its prefered default calendar	2018-09-14 11:23:15 +02:00
Frédéric FRANCE	bcc9a3d259	reduce complexity of libstatut propal.class.php	2018-09-13 21:45:46 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	6291f18179	Merge pull request #9440 from frederic34/patch-5 Upper Lower Casing	2018-09-12 18:24:02 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Frédéric FRANCE	fa895b2c2d	replace select_date	2018-09-09 11:30:40 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Frédéric FRANCE	8249756726	replace select_date	2018-09-09 10:40:00 +02:00
Frédéric FRANCE	14bc8ed18d	Update multiprix.php	2018-09-08 23:19:11 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Philippe GRAND	97c740f510	Merge branch 'develop' of github.com:grandoc/dolibarr into develop	2018-09-06 19:28:10 +02:00
Laurent Destailleur	ff05997f0a	FIX Several fixes on the management of minimal amount for orders	2018-09-06 17:37:02 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +02:00
Frédéric FRANCE	aa74d2ac38	Update api_agendaevents.class.php	2018-09-04 23:53:37 +02:00
Laurent Destailleur	ab8155f170	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php	2018-09-04 21:35:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Philippe Grand	c32c67ca57	Merge branch 'develop' into develop	2018-09-04 16:58:59 +02:00
Philippe GRAND	707f8b7312	fix merge	2018-09-04 14:49:56 +02:00
Laurent Destailleur	3d50c454c1	Code comment	2018-09-03 17:05:44 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Frédéric FRANCE	03a5aba8a2	move phpcs:ignore	2018-09-02 18:49:23 +02:00
Frédéric FRANCE	e13a8ec572	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-02 18:19:45 +02:00
Frédéric FRANCE	4ea582ad4a	move phpcs:ignore	2018-09-02 11:12:07 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Frédéric FRANCE	b60f7db60a	move phpcs:ignore	2018-09-02 10:43:34 +02:00
Frédéric FRANCE	47879d44bc	move phpcs:ignore	2018-09-02 09:57:19 +02:00
Frédéric FRANCE	e98b8e5e25	move phpcs:ignore	2018-09-02 09:27:59 +02:00
Frédéric FRANCE	71977514d7	Update actioncommreminder.class.php	2018-09-02 09:06:51 +02:00
Frédéric FRANCE	3e723af018	start changing phpcs:ignore	2018-09-01 23:46:13 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Philippe GRAND	c013f9cf3d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 15:13:04 +02:00
Laurent Destailleur	c2548b8b39	Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm NEW hook formConfirm always called if hooked	2018-09-01 14:50:08 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	7354e485b0	precise label comment	2018-09-01 13:22:08 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	b863b5176d	Merge pull request #9322 from grandoc/new_branch_29_08_2018 New branch 29 08 2018	2018-09-01 12:11:01 +02:00
Laurent Destailleur	482ddd548a	Merge pull request #9332 from frederic34/functionClosingBrace PSR2 FunctionClosingBrace	2018-09-01 12:06:08 +02:00
Frédéric FRANCE	9454f897ef	doxygen fix	2018-09-01 09:40:50 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Laurent Destailleur	7b1a705be4	Clean duplicate code	2018-08-31 13:50:58 +02:00
Philippe Grand	b3c84ac3bc	Merge branch 'develop' into new_branch_29_08_2018	2018-08-30 12:09:40 +02:00
ksar-ksar	49d3bea192	Remove the test After discussion with Frederic, the best solution is to remove the test	2018-08-30 11:27:48 +02:00
Frédéric FRANCE	5100b8b7b0	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-30 10:42:47 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	489e766cbf	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticket/class/ticket.class.php	2018-08-29 20:24:01 +02:00
Laurent Destailleur	3ebfb23407	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: .travis.yml htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/fournisseurs.php htdocs/ticket/class/ticket.class.php	2018-08-29 20:22:50 +02:00
Laurent Destailleur	8b291b2053	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: README.md	2018-08-29 19:55:10 +02:00
Laurent Destailleur	0c11007e34	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: README.md htdocs/comm/propal/card.php	2018-08-29 18:53:39 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Frédéric FRANCE	0e512cbc36	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 15:47:55 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
Frédéric FRANCE	7b2bfb28c2	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 12:48:12 +02:00
Philippe Grand	0ab593fdb1	Merge branch 'develop' into new_branch_29_08_2018	2018-08-29 12:47:01 +02:00
Laurent Destailleur	b648a28893	Fix regression	2018-08-29 11:57:43 +02:00
Frédéric FRANCE	846778657f	fix syntax error	2018-08-29 11:44:26 +02:00
Philippe GRAND	5b0425706c	try to fix space errors	2018-08-29 11:39:38 +02:00
Philippe GRAND	84a9ca3f68	fix : Parse error: ./htdocs/comm/mailing/cibles.php:644	2018-08-29 10:40:30 +02:00
gauthier	61a57e619f	FIX : $fk_account is always empty, must be $soc->fk_account	2018-08-28 16:54:04 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +02:00
Laurent Destailleur	2349f99eb9	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-28 02:58:51 +02:00
Laurent Destailleur	50d50c2e10	Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info NEW On customer/supplier card, add simple tooltip to amount boxes	2018-08-28 02:48:05 +02:00
Laurent Destailleur	9c6ce4b29d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-28 02:36:15 +02:00
Laurent Destailleur	9a14611d55	Merge pull request #8996 from grandoc/new_branch_20_06_2018 clean and update code	2018-08-28 02:35:59 +02:00
Laurent Destailleur	2db84a679e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/modulebuilder/index.php	2018-08-28 02:35:45 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	32ef9695a7	Merge pull request #9282 from frederic34/patch-19 Update card.php	2018-08-28 02:28:35 +02:00
Laurent Destailleur	7462a1ae1d	Update card.php	2018-08-28 02:27:56 +02:00
Laurent Destailleur	2306f8a7c2	Merge pull request #9265 from grandoc/new_branch_18_08_2018 Typo	2018-08-28 02:25:24 +02:00
Laurent Destailleur	0a7ce338f9	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/commondocgenerator.class.php	2018-08-28 02:23:34 +02:00
Laurent Destailleur	d90eed3098	Merge pull request #9291 from frederic34/patch-23 typo	2018-08-28 01:55:44 +02:00
Laurent Destailleur	534eadb7a2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-28 01:35:43 +02:00
Marc de Lima Lucio	d09f9b2543	FIX: customer/supplier card: add simple tooltip to amount boxes	2018-08-27 18:19:42 +02:00
atm-ph	d9beb3f882	Fix tms missing in fetch propal	2018-08-27 10:19:07 +02:00
ksar-ksar	a844855ade	Update hook formConfirm The hook should be called when the $formconfirm is not empty	2018-08-24 16:40:26 +02:00
Frédéric FRANCE	85ae8f3901	Update card.php	2018-08-24 09:29:17 +02:00
Philippe GRAND	2fa82edd39	Standardize and update code	2018-08-23 17:07:27 +02:00
Frédéric FRANCE	343e6ce8b3	typo	2018-08-23 14:34:27 +02:00
Philippe Grand	f98d2078e2	Merge branch 'develop' into new_branch_20_06_2018	2018-08-23 10:41:34 +02:00
Philippe Grand	9b2e754b46	Update advtargetemailing.class.php	2018-08-22 22:41:22 +02:00
Philippe Grand	eeaa257f11	Update cactioncomm.class.php	2018-08-22 22:39:51 +02:00
Philippe Grand	c626dcb710	Update actioncomm.class.php	2018-08-22 22:38:00 +02:00
Philippe GRAND	449ef9c464	Update and standardize code	2018-08-22 18:12:44 +02:00
Frédéric FRANCE	0334409d18	Update card.php	2018-08-22 13:43:30 +02:00
Philippe GRAND	6542dcf0bd	Update and standardize code	2018-08-22 12:04:50 +02:00
Philippe GRAND	e0462b975b	Update and standardize code	2018-08-22 11:48:26 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	29f15b4ae6	Update and standardize code	2018-08-22 10:51:55 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	289f194641	Merge pull request #9058 from defrance/patch-123 New : Add total price on dashboard	2018-08-21 13:33:33 +02:00
Laurent Destailleur	5e09d5160f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 13:17:20 +02:00
Laurent Destailleur	0f1e5a78c6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 13:17:11 +02:00
Philippe Grand	ccdae4c597	Update html.formadvtargetemailing.class.php	2018-08-18 19:15:25 +02:00
Philippe GRAND	c8c8af55a0	Typo	2018-08-18 15:56:23 +02:00
Philippe GRAND	da951e61f2	Update and standardize code	2018-08-17 22:29:21 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	71d3af8b07	Update propal.class.php	2018-08-17 13:44:07 +02:00
Laurent Destailleur	4e02b134da	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-08-16 14:50:04 +02:00
Laurent Destailleur	2719c4eb43	Fix escape	2018-08-16 01:01:38 +02:00
Laurent Destailleur	4b7889b295	Fix left join broken	2018-08-16 01:00:38 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Laurent Destailleur	5a1a6ac095	Fix error message	2018-08-15 14:42:03 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Frédéric FRANCE	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Frédéric FRANCE	6113b536a0	remove superfluous spaces	2018-08-12 19:59:39 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +02:00
Laurent Destailleur	61a5be6e2a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-08-12 19:19:21 +02:00
Laurent Destailleur	b81b6b651f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-08-12 19:17:26 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Laurent Destailleur	3d4d42462c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-12 16:30:21 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
Laurent Destailleur	9b50bc2197	Fix css	2018-08-09 19:29:48 +02:00
Laurent Destailleur	61d7629ab1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php	2018-08-08 17:44:22 +02:00
Juanjo Menent	ca7666793b	Merge pull request #9213 from fmarcet/develop New: Sales representative column on Propal List	2018-08-08 11:11:20 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
Philippe GRAND	68de0ba93b	clean and update code	2018-08-07 10:56:59 +02:00
Ferran Marcet	c74ffade7d	New: Sales representative column on Propal List	2018-08-07 10:05:50 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
Laurent Destailleur	b01f07efda	Merge branch 'develop' into FIX_project_overview	2018-08-02 18:43:55 +02:00
Juanjo Menent	b8efe3b239	Merge pull request #9172 from grandoc/new_branch_28_07_2018 standardize	2018-08-02 11:27:02 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include Include and co are statements	2018-08-02 11:03:44 +02:00
Philippe GRAND	d1f100b0c9	standardize	2018-07-29 17:17:29 +02:00
Philippe GRAND	de70bf983e	standardize	2018-07-29 13:40:35 +02:00
Laurent Destailleur	7af42c66cc	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php	2018-07-27 12:54:45 +02:00
Frédéric FRANCE	b90d125fda	trim trailing	2018-07-26 20:19:52 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Frédéric FRANCE	2dd907a8e1	extrafield totalizable	2018-07-26 09:41:44 +02:00
Laurent Destailleur	e024ea9c05	Merge pull request #9146 from grandoc/new_branch_24_07_2018 Clean and update code	2018-07-24 21:41:12 +02:00
Philippe	d7f58d0087	FIX search on ref project on propal list	2018-07-24 20:28:49 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	d871b8964f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-24 19:23:40 +02:00
Laurent Destailleur	20f178fdfe	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/action/index.php htdocs/core/lib/functions.lib.php	2018-07-24 19:22:00 +02:00
Philippe GRAND	2a6f050e32	Clean and update code	2018-07-24 18:28:56 +02:00
Philippe GRAND	442ffb95ba	clean and update code	2018-07-23 17:57:11 +02:00
Laurent Destailleur	19bb8a5091	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/accountancy.lang	2018-07-18 14:12:28 +02:00
Laurent Destailleur	4beca8d989	Fix restore look and feel	2018-07-18 13:00:38 +02:00
Philippe Grand	e913d854d0	Fix PR	2018-07-16 11:00:39 +02:00
Laurent Destailleur	387abf2da8	Merge pull request #9057 from inoveaconseil/checkRightOnLink ADD Check right on link	2018-07-16 09:31:21 +02:00
Laurent Destailleur	d968a61445	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-15 20:17:17 +02:00
Laurent Destailleur	f3b7bc53bd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/tpl/extrafields_list_print_fields.tpl.php	2018-07-15 20:16:08 +02:00
gauthier	80ff7fa86f	FIX : case when we valid form with keyboard	2018-07-11 15:18:30 +02:00
gauthier	103c7e6d06	FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)	2018-07-11 09:51:36 +02:00
Laurent Destailleur	c0d6aee040	Update propal.class.php	2018-07-10 11:10:01 +02:00
Laurent Destailleur	ed3023f7d9	Update propal.class.php	2018-07-10 11:09:08 +02:00
Laurent Destailleur	dc7fcc009b	Update propal.class.php	2018-07-10 10:56:45 +02:00
Marc de Lima Lucio	2ba7c07574	FIX: propal: correctly preset project when creating with origin/originid	2018-07-09 17:34:31 +02:00
John BOTELLA	1daba56bbc	Fix count(): Parameter must be an array or an object that implements Countable	2018-07-09 10:05:53 +02:00
BENKE Charlene	bfe7cd0d9f	Update propal.class.php	2018-07-05 12:11:20 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	4e7f9b1b4d	Merge pull request #9038 from hregis/8.0_multicompany Fix: possibility to overload permissions (multicompany sharing)	2018-07-02 16:12:40 +02:00
Laurent Destailleur	7c5aa148d9	Fix fetch	2018-07-02 15:26:01 +02:00
Regis Houssin	26495fb698	Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!!	2018-07-01 18:49:37 +02:00
Regis Houssin	05c666c18b	Fix: use numbering model corresponding to the entity of the object	2018-07-01 17:06:19 +02:00
Regis Houssin	df55bee8ae	Fix: missing "$disableremove" global	2018-07-01 15:33:10 +02:00
Regis Houssin	c0c8a70dd5	Fix: permissions	2018-07-01 12:21:51 +02:00
Regis Houssin	d699667722	Fix: possibility to overload permissions (multicompany sharing)	2018-07-01 11:06:47 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Regis Houssin	4925624ed9	Fix: avoid NULL value when "subprice" is 0	2018-06-30 10:38:30 +02:00
Laurent Destailleur	8693775fc5	Fix phpunit	2018-06-24 18:15:49 +02:00
Laurent Destailleur	459fe7189d	Fix phpunit	2018-06-24 17:55:03 +02:00
Laurent Destailleur	af9d2c3b5a	Merge pull request #9008 from grandoc/new_branch_22_06_2018 clean and update code	2018-06-24 13:47:26 +02:00
Laurent Destailleur	5819333b80	Css	2018-06-24 11:30:44 +02:00
Philippe Grand	21ca374c27	Update cibles.php Fixes	2018-06-24 10:57:53 +02:00
Philippe Grand	b528368a8b	Update cibles.php	2018-06-24 10:56:06 +02:00
Laurent Destailleur	5829014218	Merge branch 'develop' into NEW_advance_targer_filter_everywhere	2018-06-24 10:24:26 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Philippe GRAND	afda5288a8	clean and update code	2018-06-22 16:27:11 +02:00
atm-quentin	d53aa71673	NEW advance target filtering can be used everywhere with tpl and fk_element	2018-06-22 10:54:00 +02:00
Philippe GRAND	4f554ab52a	clean and update code	2018-06-20 12:09:47 +02:00
Laurent Destailleur	d81398e72d	Fix info on tooltip	2018-06-18 16:27:25 +02:00
Inovea Conseil	d5a3e63e05	Fix missing paramater for generateDocument	2018-06-15 09:47:28 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
Laurent Destailleur	4c2af6fc70	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php	2018-06-13 23:04:08 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
altatof	d42f00bca9	FIX : pu_ht_devise was not converted to numeric so decimals were lost when clculating total_ht_devise	2018-06-13 16:35:52 +02:00
Laurent Destailleur	8aa7956b4f	Fix missing extraparams field in insert action	2018-06-07 12:53:06 +02:00
Laurent Destailleur	7a8fac4198	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/list.php	2018-06-04 15:14:26 +02:00
Laurent Destailleur	de2ffa1122	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/comm/action/listactions.php	2018-06-04 14:09:17 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
florian HENRY	b996237142	fix: when agenda is filterd with "todo" event, do not display "not applicable" event	2018-05-30 13:37:17 +02:00
Laurent Destailleur	323bf6ef1f	Merge pull request #8873 from frederic34/loadlangs loadlangs	2018-05-29 10:07:10 +02:00
Laurent Destailleur	f83dedf1b0	Fix space/tab	2018-05-29 10:04:20 +02:00
Neil Orley	748be12da2	Get external contacts ids instead of BILLING contacts ids.	2018-05-28 09:42:24 +02:00
Neil Orley	4ad1f81ea9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2018-05-28 09:30:21 +02:00
Frédéric FRANCE	d986909109	loadlangs	2018-05-26 23:52:52 +02:00
Frédéric FRANCE	30a3b95368	loadlangs	2018-05-26 20:32:23 +02:00
Frédéric FRANCE	f24a6ed4d6	loadlangs	2018-05-26 19:03:41 +02:00
Laurent Destailleur	182abfdb5b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/societe/card.php	2018-05-25 15:02:24 +02:00
Laurent Destailleur	943d1dce2e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-25 13:15:38 +02:00
Laurent Destailleur	8a64ee2297	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/expedition/class/expedition.class.php htdocs/expedition/list.php htdocs/societe/card.php	2018-05-25 13:14:58 +02:00
Laurent Destailleur	823936ef87	Merge pull request #8847 from frederic34/multipriceqty NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-25 12:55:02 +02:00
Laurent Destailleur	7f77f1bd5a	Merge pull request #8825 from atm-florian/develop_advtrgtml new : add adv targt emailing amdin with main feature level 1	2018-05-25 11:10:51 +02:00
Laurent Destailleur	973384604e	Merge pull request #8850 from grandoc/new_branch_24_05_2018 clean and update code	2018-05-25 10:45:39 +02:00
Günter Lukas	3adfce35e2	Update card.php	2018-05-24 13:32:13 +02:00
Günter Lukas	1b237a75b9	Update card.php	2018-05-24 13:31:23 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
Philippe GRAND	11b63325bf	clean and update code	2018-05-24 10:48:03 +02:00
atm-quentin	eb224e43a5	FIX missing filters during ordering	2018-05-24 10:41:24 +02:00
Frédéric FRANCE	8547827575	Merge remote-tracking branch 'upstream/develop' into multipriceqty	2018-05-23 17:06:02 +02:00
Frédéric FRANCE	efbb053e54	PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-23 17:05:08 +02:00
Neil Orley	15e02c7082	NEW : adds billing contacts ids to REST API returns adds billing contacts ids to REST API returns for proposals, orders and invoices	2018-05-22 11:40:32 +02:00
florian HENRY	22cdbffb0a	new : add adv targt emailing amdin with main feature level 1	2018-05-21 10:58:16 +02:00
Laurent Destailleur	c9d23d3930	Merge pull request #8783 from grandoc/new_branch_12_05_2018 Clean and update code	2018-05-18 08:56:06 +02:00
Laurent Destailleur	689ef37d56	Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element Add propals lines inport on invoices.	2018-05-18 08:55:29 +02:00
Laurent Destailleur	67ed1e0841	Fix filter criteria when using backto for events	2018-05-16 20:59:45 +02:00
Laurent Destailleur	133e736801	Fix save code	2018-05-16 20:52:45 +02:00
Laurent Destailleur	ef395fc36b	Fix scrutinizer bugs	2018-05-16 15:23:52 +02:00
Laurent Destailleur	63ed5dcccc	Fix securekey for new online payment form	2018-05-12 11:23:40 +02:00
Philippe GRAND	29c735d8bd	Clean and update code	2018-05-12 10:46:17 +02:00
atm-john	6b2dfa0528	Extend lines import to propal	2018-05-10 21:06:18 +02:00
Ferran Marcet	70527e64c5	New: Add Date delivery and Availability on Propals List	2018-05-08 18:15:02 +02:00
atm-quentin	8cd6c72a2f	NEW advanced rights	2018-05-07 10:04:43 +02:00
Laurent Destailleur	86697c58d8	Merge pull request #8712 from atm-quentin/develop_categ_filter NEW thirdparty categ filter on lists	2018-05-05 12:56:27 +02:00
atm-quentin	ec5e84075e	NEW Rights to ignore price min	2018-05-03 10:18:38 +02:00
atm-quentin	21b387a4c4	NEW thirdparty categ filter on lists	2018-05-02 15:01:32 +02:00
ATM-Nicolas	73c3529831	NEW : Display price HT on all commercial area boards	2018-05-02 14:36:55 +02:00
Laurent Destailleur	3374c50e2d	CSS	2018-05-01 10:42:09 +02:00
Laurent Destailleur	32ace6a8cf	NEW Add hook setContentSecurityPolicy	2018-04-30 15:17:38 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +02:00
Regis Houssin	2906358383	Fix: use "socpeople" instead "societe"	2018-04-27 10:42:10 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not visible.	2018-04-24 11:37:57 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	46e448a086	Fix default agenda view	2018-04-22 17:57:20 +02:00
Laurent Destailleur	912d5c53f2	Standardize code	2018-04-21 15:54:05 +02:00
Laurent Destailleur	411949a6bb	Optimize constructors	2018-04-21 15:08:46 +02:00
Laurent Destailleur	394b988a4e	FIX key in getEntity for supplier proposals	2018-04-21 14:41:31 +02:00
Laurent Destailleur	c81c744aaf	Clean deprecated var	2018-04-21 13:14:58 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Laurent Destailleur	38d200d8a6	Fix left menu	2018-04-20 13:23:34 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
florian HENRY	ad403c7045	fix syntax and uniformize code	2018-04-14 17:04:38 +02:00
Laurent Destailleur	86112f0096	Syntax error	2018-04-13 14:15:33 +02:00
Laurent Destailleur	d4cd5a0d95	Fix syntax error	2018-04-13 13:37:43 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for action on CRUD events.	2018-04-10 12:03:01 +02:00
Laurent Destailleur	4d94327ead	Look and feel v8	2018-04-07 16:17:40 +02:00
Laurent Destailleur	d46a8eb8f0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/company.php	2018-04-07 12:30:30 +02:00
Laurent Destailleur	ee870342ef	Fix navigation/translation	2018-04-06 20:22:20 +02:00
Laurent Destailleur	1009a629d9	Try better Fix for #8432	2018-04-06 13:20:09 +02:00
Laurent Destailleur	2207e5e470	Fix tooltip	2018-04-05 19:23:36 +02:00
Laurent Destailleur	2d547abaa9	Merge pull request #8498 from atm-john/New_import_lines_from_linked_element New import lines from linked element	2018-04-05 18:26:47 +02:00
Laurent Destailleur	9d9f3ddf85	Merge pull request #8502 from ATM-Marc/NEW_create_from_list NEW: generalize use of button to create new element from list	2018-04-05 16:40:15 +02:00
Marc de Lima Lucio	c2d3e2a701	NEW: generalize button to create object from list, for the remaining lists	2018-04-03 15:28:12 +02:00
John	d689e88b92	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-04-03 11:38:12 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Marc de Lima Lucio	0366e645d5	NEW: generalize button to create object from list, for most of the lists	2018-03-30 16:54:38 +02:00
Laurent Destailleur	b6e9e0e287	Fix missing hooks	2018-03-30 16:44:58 +02:00
Laurent Destailleur	6ccdb52229	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-29 13:30:22 +02:00
Laurent Destailleur	072b6c02c0	FIX Test on mandatory status when closing proposal failed	2018-03-29 13:25:03 +02:00
Laurent Destailleur	b806b85761	Fix field filtert is set twice	2018-03-29 11:15:50 +02:00
Laurent Destailleur	6ef1dbbe0f	FIX auto open contract if one result found	2018-03-24 18:28:06 +01:00
Laurent Destailleur	630ed04e17	FIX missing properties in last contract list	2018-03-24 13:15:00 +01:00
Laurent Destailleur	6e52c896f2	Dolibarrize module ticket	2018-03-22 10:46:42 +01:00
Laurent Destailleur	d4ae0395ed	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
Laurent Destailleur	e639f2a91f	Removed deprecated method classer_facturee(). Duplicate of classifyBilled	2018-03-16 10:51:12 +01:00
Laurent Destailleur	c962b89495	NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull	2018-03-15 20:46:55 +01:00
Laurent Destailleur	620ceb54e3	Clean code to avoid confusion	2018-03-15 14:25:09 +01:00
Laurent Destailleur	0258d3aeeb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-13 18:04:59 +01:00
ptibogxiv	4f6f0b302e	FIX for nondisplay of fk_element 's id in REST API response the fk_element don't display when the call is made with REST API (reason non found)	2018-03-13 10:28:44 +01:00
Laurent Destailleur	78b0585798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/taxes.php	2018-03-12 19:09:57 +01:00
Laurent Destailleur	93f4d6fdcd	Translation	2018-03-11 21:34:38 +01:00
Laurent Destailleur	a3d25b24d3	FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id}	2018-03-11 19:27:03 +01:00
Laurent Destailleur	4070d78d13	Fix phpcs	2018-03-11 02:18:46 +01:00
Laurent Destailleur	7f469e9f6f	Fix PHPCS	2018-03-11 02:04:08 +01:00
Alexis Algoud	129c032118	NEW hidden conf to set nb weeks to show into user view	2018-03-10 16:46:57 +01:00
Laurent Destailleur	466f87ee15	Merge pull request #8322 from inoveaconseil/develop Add research with phone number on left search	2018-03-10 11:20:16 +01:00
Inovea Conseil	9075ed4107	Add mass action proposal closed	2018-03-10 00:04:58 +01:00
Laurent Destailleur	20ec269d4d	Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink 7.0 betterthirdpartylink	2018-03-09 23:03:23 +01:00
florian HENRY	a34709c112	fix better thirdparty link	2018-03-09 22:36:00 +01:00
Regis Houssin	ea175cd6c1	Fix: compatibility with multicompany dictionnary sharing	2018-03-09 09:37:23 +01:00
Laurent Destailleur	1c9e7145e7	Merge pull request #8276 from ATM-Consulting/develop_atm NEW: supplier credit notes & discounts (absolute and relative)	2018-03-08 20:06:37 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Laurent Destailleur	7e3b118257	Standardize output	2018-03-07 12:03:40 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
Laurent Destailleur	f800d50fec	WIP to show event per hours	2018-03-07 11:53:30 +01:00
Laurent Destailleur	a0a9e12178	Fix css	2018-03-07 11:29:50 +01:00
Laurent Destailleur	1a5cc4e516	Fix in edit mode, title of event is required	2018-03-07 11:06:14 +01:00
Laurent Destailleur	f3fd5f4cfa	FIX Label of event show twice	2018-03-07 11:03:35 +01:00
Laurent Destailleur	1e6a55745c	CSS	2018-03-06 11:54:05 +01:00
Marc de Lima Lucio	1765b09fda	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-05 11:05:38 +01:00
Marc de Lima Lucio	6a4a3c9e82	NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL	2018-03-05 10:58:19 +01:00
Laurent Destailleur	864edce665	NEW Accept anonmymous events (no user assigned) NEW Online payment now record the payment on invoices	2018-03-04 19:39:46 +01:00
Laurent Destailleur	0270e21289	Merge pull request #8242 from hregis/develop_multicompany Fix: use "multidir_output" instead "dir_output" (propal)	2018-03-02 17:49:25 +01:00
Marc de Lima Lucio	451d943927	NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)	2018-03-02 16:48:25 +01:00
Laurent Destailleur	191a1e9350	Fix css	2018-03-02 11:18:29 +01:00
Laurent Destailleur	a3350d12d8	css	2018-03-01 23:51:06 +01:00
Laurent Destailleur	0f237e4d5c	NEW Add mass action enable/disable on cron job list	2018-03-01 15:24:50 +01:00
Marc de Lima Lucio	059801fe03	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-01 10:22:21 +01:00
Laurent Destailleur	6f29a574cf	CSS	2018-03-01 02:37:18 +01:00
Laurent Destailleur	f545d2a134	NEW Can add filter actiontype and notactiontype on event ical export	2018-02-28 20:06:28 +01:00
Laurent Destailleur	c8e6a8c014	Fix look and feel v7	2018-02-27 22:17:42 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Marc de Lima Lucio	7cd1b2caa9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-27 16:45:01 +01:00
Marc de Lima Lucio	9cf45266f5	NEW: supplier relative discounts	2018-02-27 16:30:39 +01:00
Laurent Destailleur	0cc84ab92f	FIX Missing restore_lastsearch_values	2018-02-26 21:21:28 +01:00
Laurent Destailleur	3c552cec15	FIX Missing restore_lastsearch_values	2018-02-26 21:16:40 +01:00
Marc de Lima Lucio	7ca5ac03cc	FIX: discount card: only display relevant discounts types (customer/supplier)	2018-02-26 17:40:31 +01:00
Regis Houssin	093ea49cc6	Fix: use "multidir_output" instead "dir_output"	2018-02-26 11:35:30 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	502f219f7f	Merge pull request #8231 from hregis/7.0_entity FIX missing object entity in fetch	2018-02-25 12:59:38 +01:00
Regis Houssin	703d976b3b	Fix: missing object entity in fetch	2018-02-24 16:21:16 +01:00
Regis Houssin	b216249214	Fix: missing hook parameters	2018-02-24 15:01:29 +01:00
Laurent Destailleur	0a79550f43	Fix oldcopy must be saved before update_extras	2018-02-23 16:11:00 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
John	bd0e8506f5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-02-21 11:53:16 +01:00
Laurent Destailleur	72c1357c9b	NEW Section of files generated by mass action not visible if empty	2018-02-21 11:02:45 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	809ef1bd00	FIX Trigger _MODIFY must be called when editing a property event extra. Clean duplicate trigggers "_CLONE"	2018-02-20 18:09:38 +01:00
John	09c5dc506a	Add html dom element and fix class	2018-02-20 17:46:32 +01:00
John	5624257a6d	add new dom html5 elements and class	2018-02-20 16:49:49 +01:00
Marc de Lima Lucio	95be155010	FIX: supplier credit notes: harmonize discount filters	2018-02-20 12:26:29 +01:00
Marc de Lima Lucio	f5ad93b272	NEW: supplier credit notes: handle Excess Paid + translation	2018-02-19 15:52:07 +01:00
Marc de Lima Lucio	fa0c65e37e	FIX: supplier credit notes: correctly handle discount split	2018-02-16 12:05:36 +01:00
Marc de Lima Lucio	e2b65b3755	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note	2018-02-16 09:14:53 +01:00
Laurent Destailleur	6b74c79798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang	2018-02-15 15:34:17 +01:00
Laurent Destailleur	f0855da0fb	Fix responsive	2018-02-15 12:57:04 +01:00
Laurent Destailleur	78697c1735	USe fk_product is better than ref	2018-02-14 21:14:24 +01:00
Marc de Lima Lucio	daca27b2ed	NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring	2018-02-14 18:02:40 +01:00
Laurent Destailleur	109c447171	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 03:21:37 +01:00
Romain DESCHAMPS	8e42ed5824	add missing links in cust. card boxes	2018-02-12 02:40:13 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Laurent Destailleur	9c954de081	Error management	2018-02-08 14:25:44 +01:00
Laurent Destailleur	475b89bac1	Merge branch 'develop' into new_order_min_amount	2018-02-08 14:20:53 +01:00
Laurent Destailleur	b364b2a4de	Fix selection of filter in agenda views	2018-02-06 01:16:51 +01:00
Laurent Destailleur	074f4a3b46	Fix class not found when selecting project ref in lists	2018-02-06 00:34:14 +01:00
Laurent Destailleur	b063c19084	Fix: object project not defined	2018-02-06 00:19:40 +01:00
Laurent Destailleur	2fbe4637ac	Fix bad filter link	2018-02-05 23:05:37 +01:00
Laurent Destailleur	0cc6654b06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php	2018-02-04 13:25:00 +01:00
Laurent Destailleur	0e3d5ea9e5	Fix missing translation	2018-02-04 11:44:39 +01:00
Laurent Destailleur	b3df7670e9	Merge pull request #7999 from frederic34/propalweight NEW display weight volume in propal	2018-02-03 16:58:58 +01:00
Laurent Destailleur	f51d6a2e50	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-02 10:07:16 +01:00
Laurent Destailleur	9c6b6f244c	Fix tooltip on invoice	2018-02-01 01:25:45 +01:00
Laurent Destailleur	7f9d6a5458	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/paybox/newpayment.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php htdocs/public/stripe/newpayment.php	2018-01-31 20:25:24 +01:00
Laurent Destailleur	de0a8ba71f	Fix extrafields	2018-01-31 14:01:58 +01:00
Laurent Destailleur	d6317a26d2	Fix for multicompany	2018-01-30 15:48:09 +01:00
Laurent Destailleur	c67e57836e	Code comment	2018-01-29 12:58:33 +01:00
Laurent Destailleur	0a11d52d53	Fix info on email sent	2018-01-29 12:46:07 +01:00
Laurent Destailleur	f2a3c83053	Better error messages	2018-01-27 18:46:52 +01:00
Laurent Destailleur	ba0a96c882	Missing param limit	2018-01-26 15:37:23 +01:00
Laurent Destailleur	c5307e5cac	Fix option MAILING_LIMIT_SENDBYWEB	2018-01-26 15:12:40 +01:00
Maxime Kohlhaas	6f248a6590	New allow to define order min amount	2018-01-20 20:17:56 +01:00
Laurent Destailleur	fd6f0a4494	Fix use constant for status	2018-01-20 13:03:18 +01:00
Jan Giebels	d01a8d0508	Added order status =1 or =2 for overview	2018-01-19 11:22:25 +01:00
Laurent Destailleur	59eefa46e6	Fix duplicate search field	2018-01-16 18:02:36 +01:00
Laurent Destailleur	1f2d275ef2	Fix conditions of some fields	2018-01-13 17:21:56 +01:00
Laurent Destailleur	53b36435d0	Fix on smartphone	2018-01-12 20:50:18 +01:00
Laurent Destailleur	a44363ce3d	Fix responsive	2018-01-12 14:41:57 +01:00
Laurent Destailleur	43d560830c	Fix on old php	2018-01-10 13:20:43 +01:00
Laurent Destailleur	9f79ad800b	Fix price per quantity	2018-01-09 14:20:47 +01:00
Laurent Destailleur	42e659e26c	Fix link for online payment	2018-01-08 13:21:04 +01:00
Laurent Destailleur	1e438b7ebd	Fix travis and return of api that change status	2018-01-05 02:01:57 +01:00
Laurent Destailleur	d7837f8800	Try fix for #7778	2018-01-05 01:43:51 +01:00
Laurent Destailleur	45ed5c20ea	Merge pull request #8011 from frederic34/patch-1 Update card.php	2018-01-04 23:57:53 +01:00
Laurent Destailleur	dd8e7d657f	Update card.php	2018-01-04 23:57:45 +01:00
Laurent Destailleur	f19fb90ab0	Merge #8008 manually	2018-01-04 23:36:14 +01:00
Laurent Destailleur	f6007045f5	Fix search filters	2018-01-04 00:23:08 +01:00
Laurent Destailleur	6bc8268dc5	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-01-03 23:35:15 +01:00
Frédéric FRANCE	aaff13a984	Update card.php	2018-01-02 14:28:52 +01:00
Frédéric FRANCE	33f6ba19da	display weight volume in propal	2017-12-28 16:20:08 +01:00
Laurent Destailleur	77be56ff74	Merge pull request #7991 from defrance/patch-103 Add project column on proposal list	2017-12-28 13:03:03 +01:00
Laurent Destailleur	af8ebc616b	Update list.php	2017-12-28 13:02:26 +01:00
Laurent Destailleur	9ac99caffe	Merge pull request #7995 from frederic34/patch-1 Update propal.class.php	2017-12-28 12:51:44 +01:00
Laurent Destailleur	b0fefffcf8	Fix standardize api code	2017-12-28 12:44:15 +01:00
Laurent Destailleur	6676178435	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contact/list.php htdocs/contrat/card.php	2017-12-28 09:56:40 +01:00
Laurent Destailleur	3ac413084f	Merge branch '6.0' into 6.0	2017-12-28 08:46:22 +01:00
Frédéric FRANCE	80618d56ac	Update propal.class.php	2017-12-26 16:12:28 +01:00
Ferran Marcet	1c7b99d3dc	Fix: Missing include for Project class	2017-12-26 12:13:35 +01:00
BENKE Charlene	df884e4080	Add project column on proposal list if project are not enabled we don't display it	2017-12-23 18:37:08 +01:00
Laurent Destailleur	aad0da2513	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +01:00
Laurent Destailleur	eab44f62b1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_builddoc.inc.php htdocs/core/class/html.form.class.php htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/core/tpl/admin_extrafields_edit.tpl.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/notes.tpl.php htdocs/main.inc.php htdocs/product/inventory/tpl/inventory.tpl.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2017-12-21 14:35:33 +01:00
Laurent Destailleur	6a62e13960	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 13:32:16 +01:00
Laurent Destailleur	4a5988accb	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 12:52:19 +01:00
Laurent Destailleur	b03d0134a7	Filter on date extrafield timestamp and datetime disabled (not possible yet)	2017-12-20 18:30:41 +01:00
Laurent Destailleur	3635e88396	Update api_proposals.class.php	2017-12-19 18:01:38 +01:00
Neil Orley	e90183f4ba	NEW Update end of validity date of proposal using the API Add the ability to update the end of validity date when modifying a proposal	2017-12-19 12:37:37 +01:00
Neil Orley	fe8fac9577	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-12-19 12:36:46 +01:00
Laurent Destailleur	1351a43a30	FIX Maxi debug of permission for users external or restricted to sales representatives	2017-12-18 16:13:05 +01:00
Neil Orley	d8dac909d6	NEW Add error message Returns the error message when the API can't add a new line in a proposal	2017-12-18 14:36:41 +01:00
Neil Orley	4c852d1b6f	NEW Set a proposal to draft Set a proposal to draft	2017-12-15 16:34:30 +01:00
Laurent Destailleur	247c380d18	Several fixes	2017-12-12 16:11:40 +01:00
Laurent Destailleur	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	1251807f54	Fix several pb in links to projects on create page	2017-12-12 10:37:51 +01:00
Laurent Destailleur	bb7c03906e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php htdocs/societe/list.php	2017-12-11 15:25:09 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large More complete template	2017-12-08 16:15:41 +01:00
Laurent Destailleur	09d3db145b	Merge	2017-12-08 13:10:13 +01:00
Regis Houssin	1b16eb731d	Fix: missing load product translation file	2017-12-08 11:00:23 +01:00
Regis Houssin	1bdffa961f	Fix: wrong translation if multilang activated	2017-12-08 10:41:14 +01:00
Laurent Destailleur	50150cf897	Merge pull request #7918 from atm-maxime/develop Fix scrutinizer	2017-12-08 10:35:24 +01:00
Maxime Kohlhaas	8a39e2a413	Fix : no need for action button on cards, link is now available	2017-12-07 00:36:23 +01:00
Maxime Kohlhaas	0fa77160d9	Fix scrutinizer	2017-12-06 23:21:58 +01:00
Laurent Destailleur	2e2ab54d19	Fix parameter in delete line	2017-12-03 20:51:26 +01:00
Laurent Destailleur	1f4a079f01	Fix bug reported by scrutinizers	2017-12-02 15:03:14 +01:00
Laurent Destailleur	e8327fd9a1	Fix the eatby/sellby date was not visible.	2017-12-02 10:43:01 +01:00
Laurent Destailleur	0a73daba01	Security: on target=_blank, we must have rel="noopener"	2017-12-02 03:04:52 +01:00
Laurent Destailleur	ce32da6217	Fix debugs APIs	2017-12-01 15:39:18 +01:00
Laurent Destailleur	670465fcd8	Fix responsive and search	2017-12-01 12:01:17 +01:00
Laurent Destailleur	c269dcc4d5	Fix scrutinizer	2017-11-29 17:58:13 +01:00
Laurent Destailleur	682afe8918	Fix scrutinizer	2017-11-29 16:25:12 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	0b9a3087ea	Fix bug reported by scrutinizer	2017-11-25 12:11:02 +01:00
Laurent Destailleur	944d666d1a	Fix bugs	2017-11-25 11:27:24 +01:00
Laurent Destailleur	4cff4c6935	Simplify and standardize code for agenda pages	2017-11-25 00:12:45 +01:00
Laurent Destailleur	c16a150a70	NEW Remove background on agenda view when event is a not busy event.	2017-11-24 20:02:46 +01:00
Laurent Destailleur	b052722cf1	Merge pull request #7861 from hregis/develop_member Fix: wrong table name and id field name	2017-11-24 16:36:22 +01:00
Laurent Destailleur	9c22b5f335	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Regis Houssin	2a7b04e795	Fix: wrong table name and id field name	2017-11-23 12:18:49 +01:00
Laurent Destailleur	5b77fe393e	Fix: contact not preselected	2017-11-23 00:59:43 +01:00
Laurent Destailleur	adce4b5b7b	Debug multi contact on event. Prepare also code to manage properties of attendees of event	2017-11-22 14:42:47 +01:00
Laurent Destailleur	fd5cb736ce	Merge pull request #6961 from atm-ph/new_event_with_multi_contact New multi contacts on actioncomm	2017-11-22 12:05:04 +01:00
Laurent Destailleur	46d1318a32	Merge pull request #7828 from papoteur-mga/develop Fix:[proposals]Allow lines to be added from REST API	2017-11-22 11:16:32 +01:00
Laurent Destailleur	ff9a62e519	Fix trackid from emailings	2017-11-21 11:15:33 +01:00
Papoteur	dfffd7497e	Correction of the previous commit. Place the convertion into object at the good place.	2017-11-19 11:46:34 +01:00
Papoteur	f3f182b5bc	[proposals]Allow lines to be added from REST API Prevously, only void lines was added. Need to convert array lines to object in this case.	2017-11-18 16:21:54 +01:00
atm-ph	fbc761cbac	Fix rename TContactId into socpeopleassigned	2017-11-18 12:36:03 +01:00
atm-ph	15a8f2037b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-11-18 11:54:21 +01:00
Laurent Destailleur	80bdb45be8	Look and feel v6 - Show status of thirdparty in dol_banner	2017-11-18 01:48:16 +01:00
Laurent Destailleur	481b810fd2	Merge pull request #7810 from frederic34/patch-1 fix trigger when module not enabled	2017-11-17 12:59:59 +01:00
Laurent Destailleur	4f25bc5e3b	NEW detection of edge browser	2017-11-16 14:44:55 +01:00
Frédéric FRANCE	0d79cc50b0	Merge remote-tracking branch 'upstream/develop' into patch-1	2017-11-16 13:41:24 +01:00
Laurent Destailleur	a7aa3ee438	Rename file	2017-11-16 12:21:21 +01:00
Laurent Destailleur	c527189088	Standardize page name	2017-11-16 12:18:25 +01:00
Laurent Destailleur	19d0283b63	Fix doxygen	2017-11-16 12:13:23 +01:00
Laurent Destailleur	f68b2bdeca	Use the confirmation when deleting from mass action everywhere.	2017-11-15 11:39:11 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
Laurent Destailleur	0e2f64af72	CSS	2017-11-14 12:18:02 +01:00
Laurent Destailleur	fa92c53ff6	Fix pb when showing dictionaries	2017-11-14 11:13:24 +01:00
Frédéric FRANCE	96031b0787	Update listactions.php	2017-11-14 11:05:58 +01:00
Laurent Destailleur	11cb9c0d81	Code simpler	2017-11-14 01:57:50 +01:00
Laurent Destailleur	d0d1d646fd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-14 01:35:16 +01:00
Laurent Destailleur	3dc06977af	Update listactions.php	2017-11-14 01:33:44 +01:00
Laurent Destailleur	a12186a0b8	Use HTTP response code 304 instead of 500 when nothing is done	2017-11-14 01:26:02 +01:00
Laurent Destailleur	b5196b7164	FIX A lot of several fix on local taxes and NPR tax	2017-11-13 14:24:40 +01:00
Laurent Destailleur	1a5bbef266	FIX Locatax were not propagated when cloning order or proposal	2017-11-13 13:07:31 +01:00
alexis Algoud	19a2c2fe06	Merge branch 'NEW_burger_menu_list_action' of github.com:atm-alexis/dolibarr into develop	2017-11-13 10:05:29 +01:00
Laurent Destailleur	9a8423ba5e	Start to show work on repeat events	2017-11-13 02:46:13 +01:00
Laurent Destailleur	90615a8682	Fix busy tag not set sometimes	2017-11-13 02:44:02 +01:00
Laurent Destailleur	186c8cdbf0	Fix selection of contact into creation of event	2017-11-12 13:40:05 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Alexis Algoud	7922fd0281	NEW add burger menu to list action comm	2017-11-11 18:41:35 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Laurent Destailleur	d938a56282	Clean code	2017-11-11 01:10:17 +01:00
Laurent Destailleur	ea5dd3eb3d	NEW Add REST API for supplier proposals	2017-11-06 11:06:31 +01:00
Laurent Destailleur	a329f7dc75	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: build/exe/doliwamp/doliwamp.iss htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/list.php	2017-11-05 18:50:14 +01:00
Laurent Destailleur	d3a0cff30a	Merge pull request #7755 from frederic34/currency default currency on propal create	2017-11-05 18:28:40 +01:00
Laurent Destailleur	bac6a434f4	Add link to make a direct download on card	2017-11-04 17:11:58 +01:00
Laurent Destailleur	048766bd24	Fix sql error	2017-11-03 17:24:14 +01:00
Laurent Destailleur	c479efa480	Fix encoding with select2	2017-11-03 16:29:23 +01:00
Frédéric FRANCE	b58df17545	default currency on propal create	2017-11-02 18:14:55 +01:00
gauthier	03544f783a	FIX : Wrong alias sql	2017-11-02 16:16:29 +01:00
Laurent Destailleur	310bf4bde4	Update peruser.php	2017-11-02 15:51:35 +01:00
Laurent Destailleur	ec3a07cd52	Try to restore compatibility when actioncode=CODE1,CODE2,...	2017-11-02 15:50:55 +01:00
Laurent Destailleur	63a363080e	Update index.php	2017-11-02 15:48:56 +01:00
Laurent Destailleur	323a0d7d0d	Update index.php	2017-11-02 15:48:24 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
gauthier	b7cf434ebd	FIX : Filter type on actioncomm with multiselect doesn't work	2017-11-02 14:58:33 +01:00
Laurent Destailleur	c226fc69d1	Update actioncomm.class.php	2017-11-02 10:45:27 +01:00
Laurent Destailleur	4220d02dd4	Debug module blocked log	2017-10-31 23:57:37 +01:00
Laurent Destailleur	9458c80c48	Work on reminders	2017-10-31 23:10:29 +01:00
Laurent Destailleur	b29f32171c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/comm/action/class/actioncomm.class.php htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/filefunc.inc.php	2017-10-30 18:22:26 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Laurent Destailleur	cd5e43483e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/expedition/card.php htdocs/projet/class/task.class.php	2017-10-28 22:08:16 +02:00
Laurent Destailleur	f02e731c67	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/lib/project.lib.php	2017-10-27 02:32:09 +02:00
Laurent Destailleur	708666349f	Minor fix	2017-10-26 18:35:32 +02:00
Laurent Destailleur	8058712d47	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/index.php htdocs/contrat/class/contrat.class.php htdocs/product/list.php	2017-10-26 17:06:11 +02:00
Laurent Destailleur	67208b111d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/facture.php htdocs/expedition/card.php htdocs/product/list.php	2017-10-26 17:02:40 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	f24204c79a	Error management after extrafield update	2017-10-24 19:04:40 +02:00
Laurent Destailleur	9f0f5eb5e8	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
Laurent Destailleur	c6e5115d34	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
Laurent Destailleur	fb843430bf	FIX #7671	2017-10-22 03:22:31 +02:00
Laurent Destailleur	728e36f70f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/api/index.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/api_invoices.class.php htdocs/core/actions_massactions.inc.php htdocs/core/actions_sendmails.inc.php	2017-10-22 01:43:33 +02:00
Juanjo Menent	75580f253e	FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart	2017-10-20 12:57:32 +02:00
Laurent Destailleur	f7556e7ad2	FIX make of link to other object during creation	2017-10-19 19:06:48 +02:00
TuxGasy	9c3805c0d5	Fix anchor after add line	2017-10-19 14:10:58 +02:00
Laurent Destailleur	93d16bf4d7	Fix several fixes in APIs	2017-10-19 12:30:36 +02:00
Laurent Destailleur	9c45e86a1c	Introduce main_doc into table of objects to know what is main doc. Work on option PROPOSAL_USE_ONLINE_SIGN	2017-10-19 11:40:40 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
Laurent Destailleur	74b401b70d	Fix bad perm to delete file	2017-10-18 17:40:47 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
Laurent Destailleur	66538c7c0f	Position of method	2017-10-18 11:34:49 +02:00
Laurent Destailleur	037b90f2f3	NEW The comment when closing a proposal is added to commercial proposal	2017-10-18 11:23:16 +02:00
Laurent Destailleur	b124c7f16d	Clean params	2017-10-18 11:15:54 +02:00
Laurent Destailleur	000c1bddb2	Fix we lose the private not when closing proposal	2017-10-18 11:12:59 +02:00
Laurent Destailleur	d40dda83cf	Add API "close" for proposals Standardize code	2017-10-18 11:10:08 +02:00
Laurent Destailleur	eb1fdca157	NEW Can create intervention from a proposal	2017-10-17 10:44:18 +02:00
Laurent Destailleur	082d59439f	Fix add missing seconds when adding event so sort order on date is ok	2017-10-17 10:43:37 +02:00
Laurent Destailleur	45ac8367bd	NEW Add API for contracts	2017-10-16 17:56:59 +02:00
Laurent Destailleur	4296df45af	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/projet/list.php htdocs/user/card.php	2017-10-13 22:01:56 +02:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	7c9993ef0e	Various fixes	2017-10-13 12:14:57 +02:00
Laurent Destailleur	2b55fb81b9	Standardize substition keys.	2017-10-13 10:35:21 +02:00
atm-ph	bab43b043e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-10-13 09:52:56 +02:00
Laurent Destailleur	558f261b60	FIX #7593	2017-10-13 01:03:33 +02:00
Laurent Destailleur	8c5cf9ea45	Fix date output	2017-10-12 18:04:47 +02:00
Laurent Destailleur	084dc7798d	Standardize use of function getCommonSubstitutionArray	2017-10-09 14:51:42 +02:00
Laurent Destailleur	af1d2bfffd	Standardize code	2017-10-07 14:11:01 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Laurent Destailleur	8d47969d29	Merge pull request #7578 from OPEN-DSI/fix_0002 NEW add a new notification for the signed closed event of a proposal.	2017-10-06 17:36:23 +02:00
KHELIFA	88ab3a9cab	Add a new notification for the event that has successfully closed a proposal.	2017-10-06 16:15:40 +02:00
Laurent Destailleur	43d85af5ae	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 15:23:10 +02:00
Laurent Destailleur	ed467aa74b	FIX Only modified values must be modified	2017-10-06 15:01:31 +02:00
Laurent Destailleur	8e0da9bfeb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/holiday/document.php	2017-10-04 13:32:53 +02:00
Laurent Destailleur	85606126a9	Standardize code for events	2017-10-04 12:58:13 +02:00
Laurent Destailleur	c22cd1cfe9	Fix test on entity must always be done using the "IN" instead of "="	2017-10-03 17:41:22 +02:00
Regis Houssin	09e71f1390	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-10-02 11:51:27 +02:00
Laurent Destailleur	3f3a5e0921	Merge pull request #7499 from atm-gauthier/NEW_custom_meteo New custom meteo	2017-10-02 00:48:52 +02:00
Laurent Destailleur	0e15aef44f	CSS	2017-09-30 00:30:58 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +02:00
Laurent Destailleur	f510f3062b	Clean param type	2017-09-28 17:41:18 +02:00
Laurent Destailleur	30a9e40f4e	Fix position of fields	2017-09-28 17:29:37 +02:00
Regis Houssin	9823d6622c	Fix: use default $shared value	2017-09-27 17:40:02 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
gauthier	1694737e0b	NEW : new param on load_board() function in ActionComm class to avoid duplicate code	2017-09-27 10:09:21 +02:00
Laurent Destailleur	36b199e78c	Merge pull request #7433 from tysauron/patch-11 For use ajax combobox for societe and contacts in action card create.	2017-09-26 20:13:52 +02:00
gauthier	7f938bc517	NEW : unexistant function load_state_board() on several objects	2017-09-26 12:32:58 +02:00
Laurent Destailleur	c9e9f60f8f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-25 19:55:52 +02:00
Regis Houssin	d592664150	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-09-25 06:48:26 +02:00
Laurent Destailleur	e3da4188e2	GETPOST must not clean data for text input.	2017-09-25 00:16:52 +02:00
Laurent Destailleur	adb3827d1e	FIX #7475	2017-09-24 22:55:27 +02:00
Laurent Destailleur	3a7aea48d7	FIX #7475	2017-09-24 22:38:18 +02:00
Laurent Destailleur	252f038468	Mutualize code of substitutions for emails	2017-09-22 14:34:31 +02:00
Laurent Destailleur	e56840b9ec	Clean deprecated code	2017-09-21 11:35:18 +02:00
Laurent Destailleur	d71916af7b	Merge pull request #7437 from tysauron/patch-12 Rename "->fk_action" in "->type_id"	2017-09-21 11:26:38 +02:00
Laurent Destailleur	8dfa87fcf6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-19 19:30:28 +02:00
tysauron	5643d4e867	Rename "->fk_action" in "->type_id" (is old name)	2017-09-19 17:26:18 +02:00
tysauron	0803e03ca9	For use ajax combobox for societe and contacts in action card create.	2017-09-19 14:53:34 +02:00
Laurent Destailleur	1e33495f42	Fix remove warnings	2017-09-19 00:31:51 +02:00
Laurent Destailleur	f936b17d68	FIX Protection to avoid to apply credit note discount > remain to pay	2017-09-19 00:24:52 +02:00
Regis Houssin	a03ef95eaa	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/tables/llx_c_payment_term.sql	2017-09-18 09:11:04 +02:00
Laurent Destailleur	fa18e788b5	Fix must use photo of user	2017-09-17 17:29:00 +02:00
Laurent Destailleur	ab5724e7ff	Mutualize code for forms to send emails. Remove thousand line of code.	2017-09-17 17:12:14 +02:00
Laurent Destailleur	e014ac6ea9	NEW Send by email available in bulk for expense report	2017-09-16 22:03:25 +02:00
Laurent Destailleur	0fec777d0e	NEW On bulk email from a list, can uncheck "Join main document". NEW Show direct preview link on contract	2017-09-16 18:31:30 +02:00
Laurent Destailleur	630dc92a13	NEW Mass PDF Merging is available on contracts	2017-09-16 15:39:52 +02:00
Laurent Destailleur	e56b41c1ae	Clean code	2017-09-16 13:28:13 +02:00
Laurent Destailleur	0cf67944fa	Clean code	2017-09-16 13:14:46 +02:00
Laurent Destailleur	bd7c4fe940	NEW Summary of last events on a card are sorted on decreasing date.	2017-09-16 10:12:44 +02:00
Laurent Destailleur	b13dbf1f06	Clean code. Make selection of template working even if public.	2017-09-16 00:49:46 +02:00
Laurent Destailleur	2fcedcad74	Merge pull request #7410 from atm-florian/dev_better_propal_singend_form NEW: confirm form style to accept or reject proposal	2017-09-15 18:58:25 +02:00
Laurent Destailleur	b63b0933e7	Update card.php	2017-09-15 18:57:39 +02:00
Regis Houssin	db17eb80ec	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/class/paymentterm.class.php	2017-09-15 16:45:49 +02:00
florian HENRY	c9df299418	NEW: confirm form style to accept or reject proposal	2017-09-15 16:06:25 +02:00
Laurent Destailleur	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	1a78e2a055	Mutualize/share code of all payments modes	2017-09-15 13:43:16 +02:00
florian HENRY	8b9b99ac40	fix : advance target emailing	2017-09-15 13:02:49 +02:00
Laurent Destailleur	e254554461	Code comment	2017-09-15 11:28:21 +02:00
Laurent Destailleur	1ffcb5d94e	FIX background color not visible in emailing view	2017-09-15 11:24:32 +02:00
Laurent Destailleur	0ade500535	Better support of text editor when no js available.	2017-09-15 11:19:56 +02:00
Laurent Destailleur	0873260b8a	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
Laurent Destailleur	3b40c95107	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/class/categorie.class.php	2017-09-14 21:57:14 +02:00
Laurent Destailleur	c52e593ea8	Fix this->db	2017-09-14 21:27:14 +02:00
Laurent Destailleur	ed9c401ca6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-14 12:20:26 +02:00
Laurent Destailleur	a38bbdcc05	Merge pull request #7382 from hregis/6.0_bug3 Fix: hide bank account field if module disabled	2017-09-14 12:14:45 +02:00
Regis Houssin	a494e01f00	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-14 12:07:19 +02:00
Laurent Destailleur	c44a5ede43	FIX Several problem with the last event box on project/tasks Conflicts: htdocs/core/lib/functions2.lib.php	2017-09-13 15:16:06 +02:00
Laurent Destailleur	7767ac2aa7	FIX Several problem with the last event box on project/tasks	2017-09-13 15:12:54 +02:00
Laurent Destailleur	149ab80b3a	The event array of an object is visible even if no event yet recorded.	2017-09-13 14:18:36 +02:00
Laurent Destailleur	939d33cce7	Fix bug reported by scrutinizer	2017-09-12 19:12:39 +02:00
Laurent Destailleur	47d2350ad4	Fix bugs reported by scrutinizer	2017-09-12 19:03:12 +02:00
Laurent Destailleur	71ce82b6b9	NEW Better autoselect customer or supplier fields to save clicks	2017-09-12 16:51:10 +02:00
Regis Houssin	cd888a2149	Fix: hide bank account field if module disabled	2017-09-12 15:13:12 +02:00
Laurent Destailleur	5dcbebbd46	NEW Add filters on month/year on the accountancy binding tools	2017-09-12 13:48:45 +02:00
Laurent Destailleur	1f56800a50	Merge pull request #7341 from atm-arnaud/NEW_task_discussion New task discussion	2017-09-11 15:20:13 +02:00
Regis Houssin	b5de8da3a6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/modFacture.class.php	2017-09-11 08:07:55 +02:00
Laurent Destailleur	2ae135baf1	NEW Add view of status of template invoice	2017-09-10 20:47:45 +02:00
Laurent Destailleur	e7abb39ee2	NEW Template invoices are visible on the customer tab	2017-09-10 19:28:20 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	03fe9d4e97	Escape all status	2017-09-08 13:23:12 +02:00
arnaud	8906c95eea	NEW comments system on task	2017-09-07 16:23:51 +02:00
Laurent Destailleur	bde293af22	Fix filter on extrafield with type sellist	2017-09-07 15:34:25 +02:00
Regis Houssin	66e548427c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/resultat/clientfourn.php htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-07 10:50:35 +02:00
Laurent Destailleur	c5567fafd4	Enhancement for smartphone	2017-09-04 09:25:53 +02:00
Laurent Destailleur	e549e6cde1	Error management	2017-09-03 04:16:43 +02:00
Laurent Destailleur	4b9f54e571	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql	2017-09-01 17:34:57 +02:00
Laurent Destailleur	61cf69f2bb	NEW Include a color syntaxed HTML editor for emailing edition.	2017-09-01 13:09:13 +02:00
atm-ph	8188abd4cd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-08-31 11:09:02 +02:00
Regis Houssin	8e8f94df11	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/class/facture-rec.class.php	2017-08-30 19:33:23 +02:00
Laurent Destailleur	d3c95e030b	Fix delete file not possible for external user even with permissions	2017-08-30 14:34:36 +02:00
Laurent Destailleur	7aa09d8b71	NEW Can create thirdparty from card proposal, order or invoice	2017-08-28 18:37:16 +02:00
Laurent Destailleur	a60cd49fb0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php	2017-08-28 12:53:02 +02:00
Laurent Destailleur	075a138e14	Fix substitution of __EMAIL__	2017-08-28 12:49:57 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	4052e15565	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/comm/action/card.php	2017-08-26 21:58:29 +02:00
Laurent Destailleur	54cc1ac800	Merge emailing target selectors.	2017-08-25 21:20:27 +02:00
Laurent Destailleur	d108d04add	NEW Can filter on the "other" column on emailing target list	2017-08-25 19:26:48 +02:00
Regis Houssin	1befd9c67f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-23 21:05:36 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	aae24c26a3	Some fixes with smartphones	2017-08-22 20:20:34 +02:00
Regis Houssin	2f537a1ade	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-22 18:49:40 +02:00
Regis Houssin	18ca96e285	Fix: file delete link doesn't work	2017-08-22 18:33:00 +02:00
Laurent Destailleur	2104ab9aed	Disable event reminder	2017-08-21 13:11:29 +02:00
Laurent Destailleur	8cd2235b4b	Start to introduce cron for email reminder.	2017-08-03 11:42:22 +02:00
Laurent Destailleur	fa752348c8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang	2017-08-02 17:56:09 +02:00
Laurent Destailleur	47ac770d93	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/expedition/card.php htdocs/expedition/list.php	2017-08-02 17:51:19 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
Laurent Destailleur	b6a7ce6822	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
Laurent Destailleur	ddee802324	Add second parameter in GETPOST	2017-08-01 10:22:09 +02:00
Regis Houssin	0dc0fe81fc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-31 07:40:01 +02:00
Laurent Destailleur	cfebbe3cc4	Fix css	2017-07-31 03:16:28 +02:00
Laurent Destailleur	80f096a9d8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-31 02:09:15 +02:00
Laurent Destailleur	837afa0e65	Fix better way to get info for contact/thirdparty on agenda	2017-07-29 04:07:46 +02:00
Laurent Destailleur	2a36166839	Fix error method on non object	2017-07-29 02:11:45 +02:00
Laurent Destailleur	cae21d3937	Fix in agenda output per user/type (reduce memory usage)	2017-07-29 01:59:26 +02:00
Laurent Destailleur	60493d0a47	Several fixes (permission, missing method or class) in REST APIs	2017-07-28 11:03:30 +02:00
Laurent Destailleur	ec27eb5b1e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contact/list.php htdocs/societe/list.php	2017-07-27 02:09:40 +02:00
Laurent Destailleur	bdfb0b7561	FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes	2017-07-26 21:22:53 +02:00
Regis Houssin	acd5780e32	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-26 08:58:56 +02:00
Laurent Destailleur	5b9ac2a7a9	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/index.php	2017-07-25 21:11:36 +02:00
Laurent Destailleur	dafe1194c4	Merge pull request #7100 from tuxgasy/develop_addmoresummary_hook Close: add new hook addMoreBoxStatsCustomer	2017-07-25 20:32:10 +02:00
Laurent Destailleur	f4857af7aa	Update card.php	2017-07-25 20:31:41 +02:00
Laurent Destailleur	cba898e2b9	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/compta/facture.php	2017-07-25 10:12:28 +02:00
Laurent Destailleur	25b107defb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/contrat/list.php htdocs/fichinter/list.php	2017-07-23 19:09:00 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Laurent Destailleur	d07741ada1	Merge branch 'develop' into patch-rib	2017-07-21 14:58:33 +02:00
phf	885fc3c5b7	Fix lost search value in list if come from thirdparty card	2017-07-17 11:04:48 +02:00
Regis Houssin	200f232164	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-16 07:51:20 +02:00
Laurent Destailleur	312b153005	Fix phpcs	2017-07-13 23:46:01 +02:00
Laurent Destailleur	4ee70e496e	Merge pull request #7143 from hregis/6.0_bug Fix: missing entity filter (multicompany)	2017-07-13 14:33:45 +02:00
Laurent Destailleur	bea3ced763	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-13 14:32:03 +02:00
Laurent Destailleur	58ce8eaf46	Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing Fix AdvtargetEmailing	2017-07-13 14:26:23 +02:00
Laurent Destailleur	743de4e586	FIX Option to classify proposal/order in workflow module must not set source object to billed if amount differs.	2017-07-13 12:42:32 +02:00
Laurent Destailleur	028f1f5133	Fix default currency in creation form.	2017-07-13 10:16:40 +02:00
Laurent Destailleur	2870798d07	Fix remove warnings	2017-07-13 00:35:10 +02:00
Laurent Destailleur	4b4dcf2e01	Fix overload with a protection for rare case with very high nb of event	2017-07-12 23:05:26 +02:00
florian HENRY	816283d1e5	fix SQL	2017-07-12 17:51:32 +02:00
florian HENRY	67664331e3	Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing	2017-07-12 17:49:44 +02:00
Regis Houssin	9430952561	Fix: missing entity filter (multicompany)	2017-07-12 11:00:18 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-11 19:10:22 +02:00
florian HENRY	c85bf18f0e	Fix AdvtargetEmailing	2017-07-11 14:47:37 +02:00
Laurent Destailleur	10cb7b2524	Fix remove warnings	2017-07-09 20:31:27 +02:00
Laurent Destailleur	e1ba69eee0	Fix edit of automatic event should keep its type.	2017-07-08 00:19:30 +02:00
Laurent Destailleur	34d0c79e32	Merge pull request #7124 from fappels/develop_updateline_notriggerflag New add trigger disable to updateline functions	2017-07-07 20:30:04 +02:00
Laurent Destailleur	640f66f017	Fix SQL syntax	2017-07-07 17:34:56 +02:00
Laurent Destailleur	de1a7042d4	Fix filter on list of actions	2017-07-07 10:55:42 +02:00
fappels	6effcb0829	New add trigger disable to updateline functions	2017-07-06 16:26:15 +02:00
TuxGasy	bec5bde363	Move addMoreBoxStatsCustomer after table tag	2017-07-06 12:18:54 +02:00
phf	49b8689f2d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-07-05 11:02:39 +02:00
TuxGasy	67f11103a3	fix indent	2017-07-04 21:56:47 +02:00
Laurent Destailleur	0ee93fb00c	Fix conflict between option login and logina and logint in agenda export	2017-07-04 10:29:38 +02:00
Regis Houssin	3f882cb33a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-03 09:24:05 +02:00
TuxGasy	1f9bd2538e	new addMoreBoxStatsCustomer hook	2017-07-02 22:20:07 +02:00
Laurent Destailleur	7ae52d843c	Look and feel v6	2017-07-01 14:23:24 +02:00
Regis Houssin	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-29 08:51:42 +02:00
Laurent Destailleur	b6002bd1f8	Fix bad link	2017-06-28 18:29:57 +02:00
Laurent Destailleur	6f82837b0f	Fix GETPOST of lang_id	2017-06-27 17:27:01 +02:00
Laurent Destailleur	08af9bf365	List before	2017-06-27 10:37:00 +02:00
Laurent Destailleur	34f3552dc7	Fix missing image of user	2017-06-27 04:31:29 +02:00
Laurent Destailleur	3fdfebf7ef	Fix position of top menu does not follow 'position' field.	2017-06-27 04:25:41 +02:00
Juan Bautista Mesa Roldán	0f5dc90bae	Fixing pages warning when value is null	2017-06-24 16:45:45 +02:00
Laurent Destailleur	4102403482	Look and feel v6	2017-06-21 11:37:34 +02:00
Regis Houssin	909826e24f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 06:25:35 +02:00
Laurent Destailleur	bb2d27280b	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00
Regis Houssin	544d051fe3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-19 07:06:57 +02:00
Laurent Destailleur	996ec4926b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/core/lib/files.lib.php htdocs/don/card.php	2017-06-18 22:16:34 +02:00
Laurent Destailleur	317ab64d7c	Fix escapement	2017-06-18 22:03:25 +02:00
Laurent Destailleur	f3a5975cf8	Fix sql injection	2017-06-18 21:58:56 +02:00
Laurent Destailleur	0ef507ae7f	Fix rename of file to remove .noexe extension.	2017-06-18 21:52:51 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Regis Houssin	a0299042e4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-17 12:05:33 +02:00
Laurent Destailleur	e813fd2dfa	Fix missing key import_key and extraparams	2017-06-16 12:57:30 +02:00
Laurent Destailleur	5a477bdd6d	Merge pull request #7018 from hregis/develop_bug_restapi Fix: missing _cleanObjectDatas function	2017-06-16 12:53:11 +02:00
Laurent Destailleur	492ee135ba	Merge pull request #7011 from hregis/develop_bug3 Fix: error when the project module not enabled	2017-06-16 12:51:28 +02:00
Regis Houssin	c2901ae8cd	Fix: add/remove unset unsused fields	2017-06-16 11:01:58 +02:00
Regis Houssin	c656856ec2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi	2017-06-16 10:52:43 +02:00
Laurent Destailleur	07b676792a	Fix do not show localtax info if not used.	2017-06-16 01:02:53 +02:00
Regis Houssin	9410466d72	Fix: better check and security	2017-06-15 21:51:31 +02:00
Regis Houssin	78d5520741	Fix: missing _cleanObjectDatas function	2017-06-15 21:23:35 +02:00
Regis Houssin	cd095e99c9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-14 12:16:10 +02:00
Regis Houssin	8eb3f3bc06	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug3	2017-06-14 12:13:23 +02:00
Laurent Destailleur	1b56e4a01c	Fix look and feel v6	2017-06-14 11:28:42 +02:00
Regis Houssin	50aa40da3b	Fix: error when the project module not enabled	2017-06-14 07:40:11 +02:00
Regis Houssin	773abff80e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-12 21:24:10 +02:00
Laurent Destailleur	ba3a74576c	Merge 5.0	2017-06-12 18:22:51 +02:00
florian HENRY	71afaaa360	fix : availibity refresh	2017-06-12 17:24:36 +02:00
Regis Houssin	d1233755f6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-11 11:41:02 +02:00
Laurent Destailleur	a96362e2f9	Fix #formmailbeforetitle not supported everywhere	2017-06-11 11:40:01 +02:00
Regis Houssin	cc75916599	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-11 11:26:24 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00
Regis Houssin	3445c9d329	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/lib/functions.lib.php	2017-06-11 06:27:49 +02:00
Laurent Destailleur	6ab47a845e	Fix look and feel v6	2017-06-10 13:54:43 +02:00
Laurent Destailleur	a8e16910c0	Fix look and feel v6	2017-06-10 13:44:20 +02:00
Laurent Destailleur	7c0de18ac1	Fix code comment	2017-06-10 12:56:28 +02:00
phf	0f80ee757f	Fix can not update extrafields values	2017-06-09 16:37:05 +02:00
Regis Houssin	fa58f0f3e8	Fix: add entity filter	2017-06-09 09:25:15 +02:00
Laurent Destailleur	b441c62e1d	Fix syntax error	2017-06-08 14:55:12 +02:00
Laurent Destailleur	b1f93ccb0c	Fix security	2017-06-08 14:33:46 +02:00
phf	d6d451b54a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-06-08 12:03:59 +02:00
phf	711f9696aa	New multi contacts on actioncomm	2017-06-08 12:02:39 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Regis Houssin	bfd6116e5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-06 15:03:36 +02:00
Laurent Destailleur	02b5d9e6f7	FIX #6945	2017-06-06 10:53:53 +02:00
Regis Houssin	2df33d1df3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-03 11:45:15 +02:00
Laurent Destailleur	7f18dfee0d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/build_class_from_table.php dev/skeletons/skeleton_card.php htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/projet/card.php	2017-06-03 01:55:05 +02:00
phf	31aa8bdf05	Fix week view link has wrong link	2017-06-01 16:26:32 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
David	d8c5ec2aef	FIX: REST API not possible to add agendaevents	2017-05-29 13:47:42 +02:00
Laurent Destailleur	dc246fa44c	Merge pull request #6887 from hregis/develop_new New: add REST api "dictionaryevents" for use with "agendaevents"	2017-05-29 10:16:35 +02:00
Laurent Destailleur	de1db57a9d	Merge pull request #6883 from dvasseur/develop FIX: REST API not possible to add agendaevents	2017-05-29 10:12:33 +02:00
Regis Houssin	ee2019ae37	Fix: limit to 100 by default to avoid freeze	2017-05-26 16:52:27 +02:00
David	3898cfe02f	FIX: REST API not possible to add agendaevents	2017-05-23 18:27:41 +02:00
Laurent Destailleur	2da50f1eca	Look and feel v6	2017-05-23 01:32:19 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Laurent Destailleur	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +02:00
Laurent Destailleur	807c77f754	Fix inconsistent options	2017-05-19 18:03:49 +02:00
Laurent Destailleur	bb2a9f9d0e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-19 17:24:31 +02:00
Laurent Destailleur	c30dcf78cb	Show info when link has been deleted	2017-05-19 17:24:15 +02:00
Laurent Destailleur	d1c4439a0f	Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option NEW Module Agenda: Add option - Show linked object into agenda view	2017-05-19 17:23:54 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
Laurent Destailleur	ef575166c0	FIX #6651	2017-05-18 19:10:05 +02:00
Laurent Destailleur	7dbe3b1da9	Merge pull request #6843 from aspangaro/6.0-multijournal Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-18 17:45:21 +02:00
KHELIFA	169859b708	Module Agenda: Add option - Show linked object into agenda view	2017-05-17 17:00:45 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Alexandre SPANGARO	93554b7e30	Typo searchpicto	2017-05-14 21:06:33 +02:00
Laurent Destailleur	553f5b990c	Fix scrutinizer errors	2017-05-13 18:50:55 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	0d11fce834	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-12 15:45:30 +02:00
Laurent Destailleur	b81de35703	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/adherents/class/adherent.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/facture.class.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/contrat/class/contrat.class.php	2017-05-12 15:44:09 +02:00
Laurent Destailleur	419c15ee8e	Fix escaping class	2017-05-12 15:28:10 +02:00
Laurent Destailleur	5581e5da72	FIX New vat code not correctly implemented if "1 price per customer".	2017-05-12 13:12:17 +02:00
Laurent Destailleur	2199c525bc	Merge pull request #6805 from grandoc/new_branch_06_05 Update code using new css class	2017-05-10 22:51:31 +02:00
Laurent Destailleur	5e54567558	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/skeleton_list.php	2017-05-10 13:30:35 +02:00
Laurent Destailleur	3e0fcf5ec2	Fix label "total for this page" on last page.	2017-05-10 11:57:59 +02:00
Laurent Destailleur	e5c898e0d6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/fichinter/list.php htdocs/product/list.php htdocs/projet/tasks/list.php	2017-05-10 00:48:27 +02:00
Laurent Destailleur	6d01bd712d	FIX Better sanitizing of search all parameter.	2017-05-09 19:36:10 +02:00
Laurent Destailleur	910a925167	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
philippe grand	55feea5d98	Update code using new css class	2017-05-06 10:54:28 +02:00
Laurent Destailleur	d53654e64f	Look and feel v6	2017-05-05 20:45:06 +02:00
Laurent Destailleur	d7e10085b8	Clean code. Using 2 different key for a param is not more allowed.	2017-05-05 18:42:11 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	0bffac6dc4	Use constant vor status.	2017-05-05 13:43:43 +02:00
Laurent Destailleur	8f5fa1d810	Merge pull request #6769 from atm-ph/fix_propal_without_fetch_lines Fix Propal class doesn't have fetch_lines method yet	2017-05-05 10:01:42 +02:00
Laurent Dinclaux	a1e9246794	Resolved merge conflict [2]	2017-05-05 10:34:38 +11:00
Laurent Dinclaux	24a2fb57ea	Resolved merge conflict	2017-05-05 10:22:46 +11:00
Laurent Destailleur	0c76db7973	FIX #6698 #6742	2017-05-04 13:41:37 +02:00
Laurent Destailleur	8318ebc109	Fix missing field into addline of proposals	2017-05-04 10:45:20 +02:00
David	270c3db32e	fix params order for tha addline() function please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function	2017-05-04 10:16:36 +02:00
Laurent Destailleur	322cca8032	Merge pull request #6731 from dvasseur/develop FIX: fix params order for the addline() function	2017-05-04 09:55:33 +02:00
Laurent Dinclaux	f63f28c7fe	Fix vat_src_code propagation between post types	2017-05-03 21:37:30 +11:00
Laurent Dinclaux	98b2e83bfb	Fix localtaxes type not retrieved in proposals. Fixes Dolibarr/dolibarr/#6786	2017-05-03 21:36:56 +11:00
Laurent Destailleur	3917bdfc79	Fix vat_src_code propagation.	2017-05-02 22:37:43 +02:00
Laurent Destailleur	865c8140d1	Clean code	2017-04-30 03:23:06 +02:00
phf	88515c306f	Fix Propal class doesn't have fetch_lines method yet	2017-04-28 14:33:06 +02:00
Laurent Destailleur	c722286bcb	Fix regressions	2017-04-28 13:37:36 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Laurent Destailleur	0080821dc5	Fix no invoice if not a customer	2017-04-23 16:05:54 +02:00
Philippe Grand	c18e7e8816	Merge branch 'develop' into testing	2017-04-19 11:27:36 +02:00
Philippe Grand	529ae1fa92	Update propal.class.php	2017-04-19 10:01:43 +02:00
David	8bb7f858d9	fix params order for tha addline() function please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function	2017-04-18 16:47:06 +02:00
Laurent Destailleur	3da0aea168	Prepare code to use different SMTP servers.	2017-04-18 01:39:06 +02:00
Laurent Destailleur	0994622bf8	NEW Can use translations into all substitutions (watermark, freetext...)	2017-04-17 23:54:09 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	846204bdb4	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	a6b05bb4da	Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0	2017-04-12 14:08:58 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
philippe grand	06c91cdaf2	ref column was missing for specimen and some update	2017-04-11 14:47:11 +02:00
Laurent Destailleur	6aa56ce0fa	NEW Add a tracking id into mass emailing Prepare code to use a dedicated SMTP server according to context.	2017-04-11 10:57:17 +02:00
Laurent Destailleur	9b45776941	Fix responsive	2017-04-10 17:25:53 +02:00
Laurent Destailleur	52c86cb3f5	NEW Bulk actions available on supplier orders	2017-04-09 13:12:25 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
Laurent Destailleur	60a54041c2	NEW Enable bulk actions delete on supplier invoices	2017-04-07 14:09:19 +02:00
Widee	89716a86a5	Avoid (DEPOSIT) (1) & (2) descriptions When splitting a rebate into two parts, the word "DEPOSIT" is no longer translated on the invoices.	2017-04-04 12:22:51 +02:00
Laurent Destailleur	d99b0461c7	Extrafields multilanguage support.	2017-04-03 10:56:28 +02:00
Laurent Destailleur	e221c48997	Css	2017-04-01 00:59:21 +02:00
Laurent Destailleur	7254b54a04	Work on 6.0 look and feel	2017-04-01 00:49:06 +02:00
Laurent Destailleur	93687997c9	Work on 6.0 look and feel	2017-03-31 18:40:53 +02:00
Laurent Destailleur	7056edf509	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-31 18:32:36 +02:00
Laurent Destailleur	6e0918dded	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-03-31 18:31:54 +02:00
Laurent Destailleur	911d5832c6	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-03-31 18:30:41 +02:00
Laurent Destailleur	b44143d24d	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-03-31 18:29:15 +02:00
Laurent Destailleur	01a74a8d23	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
Laurent Destailleur	da1427ef54	Work on 6.0 look and feel	2017-03-30 16:10:08 +02:00
Laurent Destailleur	54b03a3552	Work on 6.0 new look and feel	2017-03-29 11:03:13 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
Laurent Destailleur	3740137e31	Add tooltip on label of each open item.	2017-03-28 10:44:52 +02:00
Laurent Destailleur	f843f8a93d	Start to move search bar before table titles	2017-03-27 00:48:50 +02:00
BENKE Charlie	f4a7217f20	display total line for all total line	2017-03-26 01:49:48 +01:00
Laurent Destailleur	106d19a8af	FIX #6468 + Fix missing translation	2017-03-25 03:53:11 +01:00
Laurent Destailleur	aa9d991923	Fix css	2017-03-25 01:03:02 +01:00
BENKE Charlie	94a1fc19fa	display total line for all total line	2017-03-24 23:39:25 +01:00
Laurent Destailleur	38660418b4	Include preview of pdf into dol_banner	2017-03-23 22:27:44 +01:00
Laurent Destailleur	3adb43c6e5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-23 12:52:19 +01:00
Laurent Destailleur	7df9c25e60	Several fixes on multicurrency	2017-03-23 12:44:20 +01:00
Laurent Destailleur	b9a9997688	Page societe/soc.php and compta/facture.php was renamed into card.php to match page naming conventions.	2017-03-20 21:29:22 +01:00
Laurent Destailleur	888675016d	NEW Can use dol_fiche_end without showing bottom border.	2017-03-15 11:13:30 +01:00
Laurent Destailleur	7f8c4d7d0f	Fix CSS	2017-03-14 14:33:25 +01:00
hugome	38ccf7ffdd	Fix : Agenda getCalendarEvents hook Return of getCalendarEvents on agenda page : The array_merge change key of merged array.	2017-03-13 11:35:49 +01:00
Laurent Destailleur	4bf0e31299	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-11 02:40:42 +01:00
Laurent Destailleur	47dd53abbe	NEW The substitution keys available for emailing edition is now into a popup	2017-03-11 02:36:22 +01:00
Laurent Destailleur	30c2ac37d5	Fix missing separator	2017-03-11 02:35:01 +01:00
Laurent Destailleur	618c27d63c	Optimize space	2017-03-10 16:26:43 +01:00
Laurent Destailleur	184d52525a	PHP code to manage pair/impair is replaced by native CSS.	2017-03-07 22:45:22 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if there is several vat line with same rate.	2017-03-04 22:27:44 +01:00
Laurent Destailleur	832c91417a	Fix the default_vat_code was not correctly saved and shown on the product price.	2017-03-04 19:16:09 +01:00
Laurent Destailleur	4804cc47bd	Clean and uniformize code	2017-02-24 15:16:53 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Laurent Destailleur	e981e719a1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/comm/action/card.php	2017-02-23 02:54:40 +01:00
Laurent Destailleur	92d9eb3c5d	Several fix for a better management of #6424	2017-02-22 17:46:54 +01:00
Laurent Destailleur	19e60f03b9	Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms	2017-02-21 14:17:44 +01:00
Laurent Destailleur	eef3824f8c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang	2017-02-21 10:34:52 +01:00
jfefe	0a9ffa58c1	FIX : event status is not modified when assign an user	2017-02-20 09:54:20 +01:00
Laurent Destailleur	fd111cb1c6	NEW tooltip can be on hover or on click with textwithpicto function.	2017-02-17 17:11:14 +01:00
Laurent Destailleur	7f21c3f3f2	Fix css email topic	2017-02-17 13:16:29 +01:00
Laurent Destailleur	8d03f86f45	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 13:10:46 +01:00
Laurent Destailleur	37caae3466	Merge pull request #6427 from laudeco/fix/calendar_move_error allow the drag and drop of an event only for allowed users	2017-02-17 10:46:15 +01:00
Laurent Destailleur	498473715e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 01:48:43 +01:00
Laurent Destailleur	4c310964a9	Fix list of supplier proposals	2017-02-17 01:41:33 +01:00
De Coninck Laurent	979a5e70bf	allow the drag and drop of an event only for allowed users The drag and drop of the event didn't take into account the user rights.	2017-02-16 07:51:46 +01:00
fmarcet	c175dfe68b	Fix: Bad code makes don't work for external modules numeration model	2017-02-15 09:47:18 +01:00
fmarcet	e903bf2b5c	Fix: Bad code makes don't work for external modules numeration model	2017-02-14 18:55:39 +01:00
Laurent Destailleur	d72e5a3646	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-10 17:34:23 +01:00
Laurent Destailleur	ca67917e80	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/modules/modFacture.class.php	2017-02-10 17:33:32 +01:00
Laurent Destailleur	a4f2325902	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-02-10 17:28:49 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	b611c5ca53	Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received NEW Develop new reduc on excess received	2017-02-08 11:16:10 +01:00
fmarcet	d5978a5092	Fix: Wrong vat calculation when split discounts	2017-02-07 14:02:27 +01:00
Laurent Destailleur	ce067f9130	Merge branch 'new_link_weather_board' of https://github.com/atm-geoffrey/dolibarr into atm-geoffrey-new_link_weather_board Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/index.php	2017-02-06 20:51:46 +01:00
Marcos García de La Fuente	2dfced366e	NEW #2763 Go to document block after clicking in Generate document button Close #2763	2017-02-03 20:11:06 +01:00
Laurent Destailleur	bda915c63a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-03 15:34:59 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	40737eac2e	FIX #6361	2017-02-02 02:49:04 +01:00
Laurent Destailleur	c3fb559d3b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modProduct.class.php	2017-02-01 20:58:17 +01:00
Laurent Destailleur	45263c85ec	Fix in emailing	2017-01-29 20:33:08 +01:00
Laurent Destailleur	ff8b7e6e4d	Fix size of email	2017-01-29 18:35:56 +01:00
Laurent Destailleur	92e61e6707	Fix hide url if not defined	2017-01-29 18:29:37 +01:00
Laurent Destailleur	756919de2a	Fix deadlock feature: could not solve a situation where an emailing was validated by error.	2017-01-29 16:08:45 +01:00
Laurent Destailleur	b4b81d8dcb	Fix css and missing translation key	2017-01-29 15:07:18 +01:00
Laurent Destailleur	c48400331f	Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date NEW get multicurrency rate from document date (propal, order)	2017-01-27 01:32:52 +01:00
Laurent Destailleur	1878647d26	NEW Add statistics on supplier tab.	2017-01-23 20:54:52 +01:00
Laurent Destailleur	9a59fbada7	Fix missing info admin picto. Fix colspan.	2017-01-23 17:31:39 +01:00
Laurent Destailleur	7622d3b2fb	Fix missing info admin picto. Fix colspan.	2017-01-23 10:23:24 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	809e3ce4d5	Debug browser notification	2017-01-20 20:10:16 +01:00
Juanjo Menent	2374aa351e	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-20 15:55:51 +01:00
Laurent Destailleur	5b8ff63981	Fix bad value	2017-01-20 14:17:58 +01:00
Laurent Destailleur	6780b20968	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-20 14:11:55 +01:00
Laurent Destailleur	2f4ff66c43	Minor fixes	2017-01-20 14:10:57 +01:00
Laurent Destailleur	94249b7926	NEW Add statistics on tabs	2017-01-20 14:03:07 +01:00
Laurent Destailleur	b4733e043c	Fix tooltip when customer is closed	2017-01-20 12:17:10 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
Laurent Destailleur	9bb9d4d36e	Fix position of field and tooltip	2017-01-20 12:08:33 +01:00
Marcos García de La Fuente	e0cbcadd98	In case Model for document generation is not defined, the criteria to select the model is now: 1. Model for the object 2. Custom default module 3. Hardcoded default module	2017-01-16 21:16:05 +01:00
Laurent Destailleur	4ecd657f34	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:02:43 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Laurent Destailleur	6aa26e0f62	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/compta/paiement.php htdocs/product/stock/massstockmove.php htdocs/projet/info.php htdocs/projet/tasks/time.php htdocs/societe/class/societe.class.php	2017-01-13 16:49:18 +01:00
Juanjo Menent	6cc3ef0c99	NEW: Events notifications in browser	2017-01-13 16:08:49 +01:00
Laurent Destailleur	31818e8816	Fix missing translation	2017-01-13 15:32:20 +01:00
Laurent Destailleur	27c056d377	Avoid duplicate function error	2017-01-03 11:30:27 +01:00
Laurent Destailleur	b642a3a602	Prepare release 5.0	2016-12-31 16:35:56 +01:00
Marcos García de La Fuente	47a444b2ab	Merge branch 'develop' into prod-attr	2016-12-27 15:54:53 +01:00
Laurent Destailleur	82052450a6	Complete work on dol_banner	2016-12-26 18:21:18 +01:00
Laurent Destailleur	bbd3734a21	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/list.php htdocs/filefunc.inc.php	2016-12-26 12:42:23 +01:00
Laurent Destailleur	e297b64722	Several security fix in using mailings.	2016-12-26 12:35:10 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00

... 18 19 20 21 22 ...

6569 Commits