dolibarr

Author	SHA1	Message	Date
florian HENRY	b046bcc197	fix warning php	2019-07-20 15:19:25 +02:00
florian HENRY	d03d79222e	fix warning php	2019-07-20 15:15:48 +02:00
florian HENRY	d88fec52bf	fix warining message	2019-07-20 15:07:59 +02:00
Laurent Destailleur	865ebb9de2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/ticket/class/ticket.class.php	2019-07-20 13:29:10 +02:00
Laurent Destailleur	e5c3945ec3	FIX delete of links between objects	2019-07-19 18:10:45 +02:00
Regis Houssin	cbda42d146	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-07-19 09:37:34 +02:00
Laurent Destailleur	fc31a1182b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-18 18:54:50 +02:00
Laurent Destailleur	58428cefc0	Fix phpcs	2019-07-18 18:53:51 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	3cffd70ed3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/prelevement/create.php htdocs/core/class/commonobject.class.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/commande/dispatch.php htdocs/fourn/product/list.php htdocs/opensurvey/index.php htdocs/ticket/index.php htdocs/ticket/list.php	2019-07-18 18:09:37 +02:00
Laurent Destailleur	a20a121558	Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned FIX: socpeople assigned list in action com list	2019-07-18 17:20:41 +02:00
John Botella	b5d348356d	Fix socpeople assigned list in action com list	2019-07-17 16:49:41 +02:00
Marc de Lima Lucio	464bda996c	FIX: propal createFrom hook: undefined parameter attached	2019-07-16 13:59:00 +02:00
Laurent Destailleur	0a7d70829f	Translation of some comments	2019-07-05 21:37:25 +02:00
Laurent Destailleur	2fee41f712	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-04 12:27:00 +02:00
Laurent Destailleur	8e3620fce1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/facture/invoicetemplate_list.php	2019-07-04 12:26:17 +02:00
Laurent Destailleur	ee0a65e7fa	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/comm/action/card.php	2019-07-04 12:22:40 +02:00
Ferran Marcet	433835860c	FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized	2019-07-03 13:12:41 +02:00
Laurent Destailleur	adb3062a9f	Work on nblignes -> nblines	2019-06-29 16:38:14 +02:00
ptibogxiv	7f11077f1e	Update propal.class.php	2019-06-25 18:16:11 +02:00
ptibogxiv	df0d540ffb	Update propal.class.php	2019-06-25 15:47:16 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	5675e7c50e	Clean code of deprecated method	2019-06-22 18:19:40 +02:00
Laurent Destailleur	403d41ec30	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-22 11:55:33 +02:00
Laurent Destailleur	18348fea93	Fix sort on date on agenda list	2019-06-22 11:34:16 +02:00
Laurent Destailleur	a264a4766a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-20 03:45:04 +02:00
Laurent Destailleur	e99cf13ccf	Merge pull request #11225 from ATM-Nicolas/new_propal_list_column NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)	2019-06-20 03:27:45 +02:00
Nicolas ZABOURI	2e4db8c83c	Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook	2019-06-19 08:39:05 +02:00
ICstage	820c420ae5	FIX Missing hooks	2019-06-18 14:07:52 +02:00
Frédéric FRANCE	f1d64ad164	Update peruser.php	2019-06-17 23:02:54 +02:00
Laurent Destailleur	a74eaaff4d	Fix sort of linked elements	2019-06-17 15:54:54 +02:00
Regis Houssin	6597c9f60d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-17 06:45:08 +02:00
Laurent Destailleur	e8b139d1c6	Fix repeated logs and fetch	2019-06-13 22:48:31 +02:00
Laurent Destailleur	900e860f6d	Fix list of events for BOM module	2019-06-12 19:32:29 +02:00
Laurent Destailleur	2be5e9615d	Fix look and field v10	2019-06-12 19:03:22 +02:00
Laurent Destailleur	330842d67e	Update list.php	2019-06-12 13:14:44 +02:00
Laurent Destailleur	f6d8b46b40	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/action/card.php htdocs/fichinter/card.php	2019-06-07 22:58:58 +02:00
Frédéric FRANCE	ad95b66842	Warning: A non-numeric value encountered	2019-06-06 10:12:01 +02:00
Laurent Destailleur	21a1e0d7b3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/categories/index.php htdocs/comm/action/list.php htdocs/comm/action/rapport/index.php htdocs/compta/paiement.php htdocs/compta/sociales/document.php htdocs/compta/tva/document.php htdocs/core/actions_massactions.inc.php htdocs/core/class/commonobject.class.php htdocs/fourn/facture/paiement.php htdocs/loan/document.php htdocs/main.inc.php	2019-06-04 19:03:27 +02:00
Laurent Destailleur	ba68e3d7ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/website/class/website.class.php	2019-06-04 18:47:22 +02:00
Laurent Destailleur	36df2f1026	Fix css	2019-06-04 18:45:01 +02:00
Laurent Destailleur	7b3242693b	FIX default value for duration of validity can be set from generic feature.	2019-06-04 18:17:07 +02:00
Regis Houssin	fc83585574	FIX use setEntity() to move code in multicompany module	2019-06-03 11:37:04 +02:00
Regis Houssin	7b8b1a9052	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-06-03 11:04:28 +02:00
Laurent Destailleur	57cfb4b007	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php	2019-06-02 12:36:07 +02:00
Maxime Kohlhaas	6dd01e86e9	Fix : avoid warning and uniformize var use	2019-05-31 15:53:23 +02:00
Frédéric FRANCE	48d15032af	Update linkedobjectblock.tpl.php	2019-05-29 11:28:07 +02:00
Laurent Destailleur	2218994958	FIX Duplicate encoding on error message	2019-05-29 09:51:45 +02:00
Laurent Destailleur	15de8a9497	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/mailing/card.php	2019-05-27 19:25:53 +02:00
Laurent Destailleur	1c6ddd25c4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-05-27 19:23:54 +02:00
Laurent Destailleur	93c395fe10	FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL	2019-05-27 19:22:51 +02:00
Regis Houssin	4f2f23f522	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-22 08:45:31 +02:00
Laurent Destailleur	45e6c14594	Merge pull request #11226 from ATM-Nicolas/fix_icon_with_padding FIX : Padding on create project icon	2019-05-21 22:41:52 +02:00
Laurent Destailleur	a93cbd4320	FIX Look and feel v10	2019-05-21 21:47:25 +02:00
Laurent Destailleur	c3b9c08219	CSS	2019-05-21 21:36:48 +02:00
Laurent Destailleur	fdeb12a909	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/mailing/card.php	2019-05-21 21:18:40 +02:00
Laurent Destailleur	a7f5f3fb94	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-05-21 21:16:54 +02:00
Laurent Destailleur	dcf77520ea	FIX Error management when MAILING_NO_USING_PHPMAIL is set	2019-05-21 21:16:06 +02:00
Laurent Destailleur	22e897b1a1	Clean and prepare code to fix a SQL injection	2019-05-21 17:22:38 +02:00
Laurent Destailleur	eafc35b00f	Look and feel v10	2019-05-21 13:27:45 +02:00
Regis Houssin	2cf630c213	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu	2019-05-20 16:10:47 +02:00
ATM-Nicolas	5def839813	FIX : Padding on create project icon	2019-05-20 11:56:26 +02:00
ATM-Nicolas	d58603bd1e	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column	2019-05-20 09:13:37 +02:00
ATM-Nicolas	6be48e6952	NEW : Amount HT invoiced column in propal list	2019-05-20 08:59:44 +02:00
Laurent Destailleur	5f23cf7e2a	CSS	2019-05-19 13:51:47 +02:00
Laurent Destailleur	c6ccb92a51	Fix table shown when there is no perm Fix edit admin status of another admin	2019-05-19 01:41:42 +02:00
florian HENRY	ebe37df9db	scrunitizer	2019-05-18 16:19:44 +02:00
florian HENRY	47ae988b57	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-05-18 16:18:22 +02:00
florian HENRY	12a8008107	scrunitizer	2019-05-18 16:18:14 +02:00
Laurent Destailleur	11fea03074	Merge pull request #11026 from atm-john/new_look_and_feel_title_button NEW : look and feel title button	2019-05-18 16:04:47 +02:00
Regis Houssin	b73df2698d	FIX better compatibility with Multicompany	2019-05-12 14:25:41 +02:00
Laurent Destailleur	3def11d5c9	Standardize translation	2019-05-10 19:32:46 +02:00
Laurent Destailleur	aaeb7dc9d6	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/holiday.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/filefunc.inc.php htdocs/product/list.php	2019-05-10 17:45:33 +02:00
Laurent Destailleur	9de0e69456	FIX column project into list	2019-05-10 15:11:06 +02:00
Laurent Destailleur	22c548e80b	Fix sql	2019-05-10 14:46:43 +02:00
Laurent Destailleur	5625c94c44	Fix missing label on project tooltip	2019-05-10 14:40:15 +02:00
Laurent Destailleur	0e8184332e	Fix missing label on project tooltip	2019-05-10 14:39:05 +02:00
Laurent Destailleur	d8c1c24028	Fix syntax error	2019-05-09 19:46:10 +02:00
Laurent Destailleur	a5b1de4f6a	Fix tab that should not be visible	2019-05-09 17:52:55 +02:00
ATM-Nicolas	77d3f22163	NEW : Amount invoiced column in propal list	2019-05-07 14:39:16 +02:00
ATM-Nicolas	ab3ad77704	FIX : Sale representative column didn't increase nbfield variable on proposal list	2019-05-03 10:55:51 +02:00
Laurent Destailleur	4f9ea912ab	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/website.inc.php	2019-05-02 14:41:56 +02:00
Laurent Destailleur	79754eb326	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/comm/remx.php	2019-05-02 14:39:30 +02:00
Laurent Destailleur	90a1181dc5	Debug module Ticket	2019-05-01 20:41:03 +02:00
Frédéric FRANCE	d9a1c2b235	Fix do not delete all discount when splitting	2019-04-30 13:54:50 +02:00
Laurent Destailleur	ee5d50b905	css	2019-04-27 13:25:21 +02:00
Laurent Destailleur	091132de2f	Signatures of methods createFromClone() has been standardized. All methods requires the object User as first parameter.	2019-04-25 12:11:32 +02:00
Abbes Bahfir	dccc8b0be3	Fix:Same action in both cases	2019-04-24 08:48:36 +01:00
Laurent Destailleur	3b04d2fe9b	Fix warnings	2019-04-23 13:21:17 +02:00
Laurent Destailleur	7f4b09c482	Fix warnings	2019-04-23 13:20:44 +02:00
Laurent Destailleur	4d92d7731c	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/sendings.lib.php htdocs/langs/en_US/admin.lang htdocs/theme/eldy/style.css.php	2019-04-23 12:32:08 +02:00
Laurent Destailleur	84ec39f043	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-04-23 12:25:53 +02:00
Laurent Destailleur	bf7fcce1b2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-04-23 12:24:25 +02:00
florian HENRY	f412ce6a9c	fix #11023	2019-04-17 10:49:39 +02:00
Laurent Destailleur	e6ffaeefe5	CSS	2019-04-17 10:39:30 +02:00
Laurent Destailleur	212b058f46	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-04-17 01:18:46 +02:00
Laurent Destailleur	b5bf6830e9	Introduce method convertBackOfficeMediasLinksToPublicLinks so links to media added from filemanager in notes are visible by PDFs builder.	2019-04-17 01:13:59 +02:00
Laurent Destailleur	5c53044863	Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events FIX: actioncomm: sort events by date after external calendars and hook	2019-04-16 23:28:30 +02:00
Laurent Destailleur	c0defe3965	Update index.php	2019-04-16 23:27:45 +02:00
Marc de Lima Lucio	1669d497b4	FIX: actioncomm: sort events by date after external calendars and hook	2019-04-16 17:36:27 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
ATM john	29b31bd7ab	New title button first step	2019-04-11 00:38:44 +02:00
Laurent Destailleur	d7f980fda0	NEW Add picto of deletion on mass action combo lists	2019-04-09 01:22:59 +02:00
Laurent Destailleur	7b01e76d2b	Fix doxygen	2019-04-08 16:04:15 +02:00
Frédéric FRANCE	4d43cd4927	Update card.php	2019-04-05 14:46:31 +02:00
Laurent Destailleur	1b2826f476	Look and feel v10	2019-03-29 13:26:26 +01:00
Laurent Destailleur	661a984b8e	Merge pull request #10880 from altatof/condpay allow empty value for payment conditions like in orders	2019-03-26 20:53:20 +01:00
Laurent Destailleur	a34f4c2806	Merge pull request #10909 from IonAgorria/fix-line-dates FIX: Disallow line start date after end date	2019-03-26 19:43:11 +01:00
Laurent Destailleur	f27f65e8bf	Responsive	2019-03-25 10:09:02 +01:00
Ion	7bfa49b29c	FIX: Disallow line start date > end date	2019-03-24 14:30:00 +01:00
Laurent Destailleur	28fede950f	Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION	2019-03-22 13:00:48 +01:00
Laurent Destailleur	a7181750c6	Merge pull request #10879 from altatof/noconcatdesc NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-22 12:56:46 +01:00
Philippe GRAND	62d63e399e	translation	2019-03-22 09:41:22 +01:00
Laurent Destailleur	48a0c447b4	Fix test on draft status regression	2019-03-21 21:00:06 +01:00
Laurent Destailleur	930720decd	WIP Start to replace use of property ->brouillon	2019-03-21 18:13:51 +01:00
Laurent Destailleur	90df30e412	NEW Add trigget FICHINTER_UNVALIDATE Standardize code of setDraft.	2019-03-21 17:37:56 +01:00
Frédéric FRANCE	013e536f32	Update actioncomm.class.php	2019-03-19 12:49:54 +01:00
Laurent Destailleur	b10690ce88	Merge pull request #10874 from grandoc/translation translation	2019-03-19 11:14:40 +01:00
Christophe Battarel	bd542b6b22	allow empty value for payment conditions like in orders	2019-03-18 16:39:59 +01:00
Christophe Battarel	8b3fd2eacf	NEW : add constant NO_CONCAT_DESCRIPTION	2019-03-18 16:10:17 +01:00
Philippe GRAND	0f03b16313	translation	2019-03-18 12:46:32 +01:00
Philippe Grand	7942903548	Update actioncomm.class.php	2019-03-18 12:24:16 +01:00
Philippe GRAND	76a4792cd2	Merge remote-tracking branch 'upstream/develop' into new_branch_18_03_2019	2019-03-18 12:11:57 +01:00
Laurent Destailleur	de554750e4	Merge pull request #10802 from altatof/propindex Harmonize propal index pages	2019-03-18 10:56:10 +01:00
Laurent Destailleur	22d61cd44d	Update index.php	2019-03-18 10:55:44 +01:00
Laurent Destailleur	7adba419fc	Update index.php	2019-03-18 10:54:45 +01:00
Laurent Destailleur	d8c1a50291	Update index.php	2019-03-18 10:53:58 +01:00
Philippe GRAND	198cf4af2f	add comments	2019-03-18 10:06:22 +01:00
Laurent Destailleur	7cdfff7263	Fix syntax error	2019-03-15 20:42:49 +01:00
Laurent Destailleur	c0b6699b25	All methods set_draft() were renamed into setDraft()	2019-03-15 19:01:40 +01:00
Laurent Destailleur	0afbd70c2c	Merge pull request #10833 from grandoc/new_branch_14_03_2019 update with html5 compliant code	2019-03-14 18:04:06 +01:00
Laurent Destailleur	d4f2a16abf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/productaccount.php	2019-03-14 17:10:58 +01:00
Laurent Destailleur	cdf6e4b65a	Fix some PSR rules	2019-03-14 16:43:27 +01:00
John BOTELLA	31e588dbab	fix hookmanager global	2019-03-14 16:13:32 +01:00
John BOTELLA	8bc795c055	Fix missing hook for export agenda	2019-03-14 15:19:38 +01:00
Philippe GRAND	43b827aae7	update with html5 compliant code	2019-03-14 14:07:26 +01:00
Laurent Destailleur	e7cd8d690c	Remove warnings	2019-03-13 19:06:45 +01:00
Laurent Destailleur	eeafc3c630	Standardize translation of amount	2019-03-13 14:10:36 +01:00
Laurent Destailleur	98ca9bf17a	Reduce quantity of string to translates	2019-03-12 19:44:59 +01:00
Joan Louis	17647de4cc	Fix extrafields calls from cards for Dolibarr 8 See #10803	2019-03-12 11:24:54 +01:00
Christophe Battarel	2726cc335d	replace align by css align	2019-03-12 10:24:11 +01:00
Joan Louis	f326c75be7	Update call to extrafields from cards	2019-03-11 21:34:16 +01:00
Laurent Destailleur	e913f1919f	Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards Update call to extrafields from cards	2019-03-11 21:14:53 +01:00
Laurent Destailleur	abdc2aa21a	Fix phpcs	2019-03-11 21:03:23 +01:00
Laurent Destailleur	3559d600e2	Merge pull request #10770 from atm-john/theme_badge_status Add badge status css part1	2019-03-11 20:49:31 +01:00
Laurent Destailleur	052d29d946	Fix phpcs	2019-03-11 20:45:28 +01:00
Laurent Destailleur	6daa262779	Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming convention of extension .inc.php for files to be included.	2019-03-11 20:32:25 +01:00
John BOTELLA	57c6c60118	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-11 14:44:35 +01:00
Joan Louis	ee5753819e	Update call to extrafields from cards	2019-03-11 14:22:04 +01:00
Christophe Battarel	be612a1f6e	harmonize propal index pages	2019-03-11 12:58:03 +01:00
John BOTELLA	97544e0aea	add new dolGetStatus to LibStatut in common invoice class	2019-03-07 15:24:11 +01:00
Laurent Destailleur	a40a08bada	Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid Fix default contact id for update and clone actions in event card	2019-03-07 13:12:22 +01:00
John BOTELLA	5ea5d51247	Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status	2019-03-07 09:41:03 +01:00
Lionel VESSILLER	b56cd11f02	Fix default contact id for update and clone actions in event card	2019-03-06 12:00:55 +01:00
Frédéric FRANCE	2745f98644	PSR2.Classes.PropertyDeclaration.VarUsed	2019-03-05 22:10:46 +01:00
Frédéric FRANCE	0c2a77cb53	Merge remote-tracking branch 'upstream/develop' into patch-2	2019-03-05 18:14:15 +01:00
John BOTELLA	72d96d2ac3	prepare badges	2019-03-05 17:13:20 +01:00
Laurent Destailleur	b851911708	Dolibarize module ticket	2019-03-05 12:18:46 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Laurent Destailleur	66d8b8e7a1	Fix phpcs	2019-03-02 21:04:44 +01:00
Laurent Destailleur	8fce6e5e31	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php	2019-03-02 19:13:37 +01:00
Laurent Destailleur	40e923ec85	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/modules/modAgenda.class.php	2019-03-02 19:07:14 +01:00
Laurent Destailleur	4f9981063f	Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing	2019-03-02 18:26:50 +01:00
Laurent Destailleur	56d921ea52	CSS	2019-03-02 12:57:07 +01:00
Frédéric FRANCE	014f69850e	add visibility	2019-03-01 23:08:57 +01:00
Laurent Destailleur	855aaaffd8	Better fix for type of discount	2019-02-28 11:44:10 +01:00
florian HENRY	4ebf4780c2	fix relative discount for prospect and supplier	2019-02-28 09:09:06 +01:00
Frédéric FRANCE	9b165f6b3f	add visibility	2019-02-27 20:45:07 +01:00
Laurent Destailleur	2448d1deaa	fk_projet -> fk_project	2019-02-27 15:32:18 +01:00
Laurent Destailleur	3ec2338c2d	Look and feel v10	2019-02-26 19:37:32 +01:00
Frédéric FRANCE	894123fb06	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
Regis Houssin	36a7303049	FIX No space found after comma in function call	2019-02-19 10:28:17 +01:00
Laurent Destailleur	e4698fb6a5	Merge	2019-02-18 19:14:25 +01:00
Laurent Destailleur	75b875ae55	Fix origin currency not visible in absolute discount view	2019-02-18 17:38:15 +01:00
Laurent Destailleur	7a79637b88	Merge pull request #10616 from frederic34/patch-27 Update pertype.php	2019-02-15 15:31:03 +01:00
Frédéric FRANCE	c7cec4be34	Update peruser.php	2019-02-14 21:45:40 +01:00
Frédéric FRANCE	b65532c5d8	Update pertype.php	2019-02-14 21:43:46 +01:00
Frédéric FRANCE	7886b5900c	Update card.php	2019-02-14 20:40:03 +01:00
Laurent Destailleur	a7af1b1765	Remove deprecated code	2019-02-14 16:29:13 +01:00
ptibogxiv	1771ea8eaa	Update api_proposals.class.php	2019-02-14 00:27:53 +01:00
ptibogxiv	56a0a20bb3	Fix delete contact	2019-02-14 00:27:29 +01:00
Laurent Destailleur	b9467c10bf	Merge pull request #10561 from eoxia-jimmy/develop NEW: API Proposal, Orders, Invoices: Add contact details	2019-02-13 16:39:57 +01:00
Laurent Destailleur	c2ab85aaf8	Update api_proposals.class.php	2019-02-13 16:39:17 +01:00
Frédéric FRANCE	95212e9cc1	Update ical.class.php	2019-02-13 00:44:34 +01:00
Frédéric FRANCE	3de192364b	Update ical.class.php	2019-02-13 00:12:20 +01:00
Jimmy L	a172ea00a4	Rest API: Proposal, Orders, Invoices: Add contact details	2019-02-12 17:54:59 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
klemens	beb2791dde	spelling fixes	2019-02-10 12:59:09 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	0e42e8824b	Merge branch 'develop' into new_branch_04_02_2019	2019-02-08 09:42:18 +01:00
Laurent Destailleur	af92303319	Merge pull request #10487 from frederic34/psr2squizwhite psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-08 09:30:25 +01:00
Laurent Destailleur	88fb491441	Fix note output	2019-02-06 00:40:07 +01:00
Laurent Destailleur	58e6cfd635	Fix popup content	2019-02-06 00:36:11 +01:00
Philippe GRAND	577aef54e1	update with html5 compliant code	2019-02-04 10:37:51 +01:00
Philippe GRAND	1154f9a048	update with html5 compliant code	2019-02-04 10:35:53 +01:00
Philippe GRAND	eb25d12a1b	update with html5 compliant code	2019-02-04 10:32:33 +01:00
Philippe GRAND	7c8d84aa03	update with html5 compliant code	2019-02-04 10:27:26 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	efe5cd3dd8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 21:13:06 +01:00
Laurent Destailleur	72f78ecf3b	FIX #10460 compatibility with MariaDB 10.4	2019-02-03 20:02:05 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	9f7dfe2921	Merge pull request #10481 from frederic34/psr2forloop psr2 Squiz.ControlStructures.ForEachLoopDeclaration	2019-02-03 19:11:07 +01:00
Laurent Destailleur	e309261140	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-03 18:19:58 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Laurent Destailleur	ebe30f7a0e	FIX error report not returned	2019-02-01 19:19:23 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Philippe GRAND	1501ce2c9f	update with html5 compliant code	2019-01-31 13:34:32 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Laurent Destailleur	869159c09f	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:39 +01:00
Laurent Destailleur	1a292839ca	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:18 +01:00
Laurent Destailleur	17c3337c9b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 15:25:43 +01:00
Regis Houssin	39b696af02	FIX multicompany compatibility	2019-01-29 12:01:40 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	ff39491f15	wip	2019-01-27 23:31:37 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	f96d730943	Merge pull request #10391 from grandoc/new_branch_22_01_2019 update with html5 compliant code	2019-01-26 14:09:15 +01:00
Laurent Destailleur	adb7ec7015	Merge pull request #10399 from grandoc/new_branch_23_01_2019 update with html5 compliant code	2019-01-26 14:02:26 +01:00
Laurent Destailleur	e42fe4022a	Uniformize lenght of small list	2019-01-25 15:22:36 +01:00
Philippe GRAND	6625dac8d7	update with html5 compliant code	2019-01-23 17:28:02 +01:00
Philippe GRAND	34b6f5705e	update with html5 compliant code	2019-01-22 14:09:14 +01:00
Philippe GRAND	4668052f95	update with html5 compliant code	2019-01-22 14:04:33 +01:00
Laurent Destailleur	844643c37d	Merge pull request #10375 from grandoc/new_branch_19_01_2019 update with html5 compliant code	2019-01-20 19:48:32 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	55c90b0578	Fix #10359 cloning of proposal	2019-01-19 13:17:07 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Philippe GRAND	66e4bc4502	update with html5 compliant code	2019-01-19 12:27:26 +01:00
Laurent Destailleur	5130019003	css	2019-01-17 19:27:26 +01:00
Philippe GRAND	bd929c2d1e	update with html5 compliant code	2019-01-17 14:24:41 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
Marc de Lima Lucio	1cfd52e7e2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_actionlist_desc	2019-01-09 12:08:55 +01:00
Marc de Lima Lucio	de7dfd3423	NEW: actioncomm list: add description column (hidden by default)	2019-01-09 11:54:03 +01:00
Laurent Destailleur	d929d93376	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-08 14:19:35 +01:00
Laurent Destailleur	acc665a9f1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/class/html.form.class.php	2019-01-08 14:16:23 +01:00
Laurent Destailleur	1ee0d42408	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-08 14:08:22 +01:00
Marc de Lima Lucio	68802c659e	FIX: action list: add printFieldListSelect and printFieldListWhere hooks	2019-01-08 11:41:58 +01:00
ldestailleur	bc00fb177a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:15 +01:00
ldestailleur	3af418349a	FIX Can't empty the payment mode	2018-12-29 07:54:30 +01:00
ldestailleur	c0eef25b31	FIX Can set payment mode to empty on thirdparty page	2018-12-28 23:14:36 +01:00
ldestailleur	8ad06463e0	FIX Can set payment mode to empty on thirdparty page	2018-12-28 23:06:04 +01:00
Laurent Destailleur	a445e7597d	FIX Popup when having notes of events	2018-12-27 06:37:17 +01:00
Laurent Destailleur	fadc9983dc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-27 06:18:03 +01:00
Laurent Destailleur	cd53e22d64	FIX Edit description of event	2018-12-27 06:16:54 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	e069da69ba	Revert "Fix screen size fall" This reverts commit `abb6b41f91`.	2018-12-15 12:35:37 +01:00
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

... 13 14 15 16 17 ...

6569 Commits