dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	577d2d728c	Merge pull request #9238 from ptibogxiv/patch-35 Fix dolibarr_set_const	2018-08-13 23:39:42 +02:00
Laurent Destailleur	2cbbb6e622	Prepare 8.0.0 release	2018-08-13 23:04:58 +02:00
Laurent Destailleur	33f0172603	Fix select zip/town	2018-08-13 16:44:49 +02:00
Laurent Destailleur	f96dd391fa	Fix error in foreign key pointing to old table	2018-08-13 16:11:23 +02:00
Laurent Destailleur	df57bd176b	Fix translation	2018-08-13 14:53:04 +02:00
ptibogxiv	d0666a9583	Fix incorrect entity	2018-08-13 14:34:54 +02:00
Laurent Destailleur	b977c3a9f5	Fix translation	2018-08-13 14:04:10 +02:00
ptibogxiv	c6adeabb55	Fix dolibarr_set_const	2018-08-13 12:22:51 +02:00
Laurent Destailleur	d92096f74a	Fix menu payment not required if only module bank on	2018-08-13 02:04:38 +02:00
Laurent Destailleur	31c42c9a32	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/societe/canvas/actions_card_common.class.php	2018-08-13 01:23:03 +02:00
Laurent Destailleur	21555a7435	Fix firstname/lastname	2018-08-13 01:10:51 +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
Laurent Destailleur	2d571acc03	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php	2018-08-12 19:25:44 +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	234b0d3120	Merge pull request #9230 from ATM-Nicolas/fix_withdraw_pagination FIX : Pagination on withdraw request list	2018-08-12 19:18:57 +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
Jan	ddbfaf0788	wrong position of counter reset extrafields will work now ;) and not the first product gets the last extrafields values	2018-08-12 19:16:49 +02:00
Laurent Destailleur	b11d5c2f71	Merge pull request #9228 from atm-florian/8.0 fix : remove comment on commit	2018-08-12 19:13:07 +02:00
Laurent Destailleur	be7a764de7	Merge pull request #9202 from atm-florian/7.0 fix bad use of test_sql_and_script_inject return int not value tested	2018-08-12 18:24:54 +02:00
Laurent Destailleur	56d8935976	Merge pull request #9181 from ATM-Nicolas/fix_dolGetFirstLastname FIX : Wrong position of firstname lastname	2018-08-12 18:11:36 +02:00
Laurent Destailleur	6954ab00f9	Update functions.lib.php	2018-08-12 18:11:27 +02:00
Laurent Destailleur	8d03d58d54	Merge pull request #9209 from ptibogxiv/patch-34 Fix 3D secure	2018-08-12 17:42:42 +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
gauthier	391230babc	FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281)	2018-08-10 15:39:49 +02:00
ATM-Nicolas	d8d54d246c	FIX : Pagination on withdraw request list	2018-08-10 15:05:21 +02:00
Laurent Destailleur	39f4eae07e	Fix look and feel v8	2018-08-09 23:11:49 +02:00
Laurent Destailleur	1af9700a58	Fix responsive	2018-08-09 22:52:43 +02:00
Laurent Destailleur	2dbb6e258b	FIX Can filter on month in export of blockedlog FIX Fingerprint correct in popup	2018-08-09 22:29:02 +02:00
florian HENRY	f0a32a2dea	fix : remove comment on commit	2018-08-09 20:41:15 +02:00
Laurent Destailleur	9b50bc2197	Fix css	2018-08-09 19:29:48 +02:00
florian HENRY	06189f8153	Merge branch '6.0' into 6.0_fhe	2018-08-09 18:31:59 +02:00
florian HENRY	9024ed9e61	Merge branch '7.0' into 7.0_fhe	2018-08-09 17:47:21 +02:00
atm-greg	3d84adbd76	fix recurcivity	2018-08-09 12:21:48 +02:00
atm-greg	4e16f64af0	Fix project::delete to delete children tasks before parent tasks	2018-08-09 12:13:06 +02:00
Laurent Destailleur	8d54df4263	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: 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	2018-08-08 17:31:23 +02:00
Laurent Destailleur	63898b205e	Clean ckeditor menu	2018-08-08 17:09:51 +02:00
Laurent Destailleur	d79778a67e	Fix reponsive	2018-08-08 17:00:16 +02:00
Laurent Destailleur	de1386c83c	Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0	2018-08-08 16:49:09 +02:00
Juanjo Menent	e2499392a9	Merge pull request #9215 from fmarcet/7.0 Fix: Bad position when document have incoterms/notes	2018-08-08 11:10:47 +02:00
Juanjo Menent	b840152bcd	Merge pull request #9217 from ATM-Nicolas/fix_undefined_index_notnull FIX : PHP warning, undefined index notnull	2018-08-08 11:10:17 +02:00
Ferran Marcet	5ce31f65a4	Fix: Bad position when document have incoterms/notes	2018-08-07 11:40:11 +02:00
ATM-Nicolas	5b15e688af	FIX : PHP warning, undefined index notnull	2018-08-07 09:38:18 +02:00
ptibogxiv	e84018ac15	Fix 3D secure convett to dolibarr standard stripe payment metadata	2018-08-06 19:21:12 +02:00
florian HENRY	74d05da149	fix : display if error	2018-08-06 11:28:34 +02:00
florian HENRY	0d85eb52c5	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0	2018-08-03 17:10:26 +02:00
florian HENRY	615ed11534	fix bad use of test_sql_and_script_inject return int not value tested	2018-08-03 17:09:58 +02:00
atm-quentin	09dfcc6016	FIX exclude element of the select	2018-08-03 14:54:21 +02:00
Philippe	61e1f0508d	FIX : Search on Ref project on order list	2018-08-03 11:08:09 +02:00
ATM-Nicolas	70adfb135d	FIX : Missing behavior	2018-08-03 09:51:29 +02:00
Laurent Destailleur	6010d9de4b	Merge pull request #9158 from atm-gauthier/7.0_missing_hook FIX : missing hook to edit sql	2018-08-02 18:36:25 +02:00
Laurent Destailleur	51effef629	Reset pagination when current page too high	2018-08-02 18:22:08 +02:00
Laurent Destailleur	17ed19503c	Code comment	2018-08-02 17:51:04 +02:00
Laurent Destailleur	12fdbcce59	Fix trigger name	2018-08-02 17:49:05 +02:00
Laurent Destailleur	e85ec19018	Merge pull request #9093 from atm-gauthier/FIX_filters FIX : page must always be 0 when we search	2018-08-02 17:48:35 +02:00
Laurent Destailleur	b5a0e14ffe	Merge pull request #9185 from atm-john/fix_situation_total_calcul Important: fix situation line's total	2018-08-02 17:45:44 +02:00
ATM-Nicolas	f3090e4819	FIX : Wrong variable and trigger name	2018-08-02 16:05:54 +02:00
Juanjo Menent	5b3c6de06c	Merge pull request #9184 from atm-gauthier/7.0_fix_extrafieldkey FIX : extrafieldkey	2018-08-02 11:24:19 +02:00
Juanjo Menent	1fbbaf2895	Merge pull request #9180 from atm-florian/7.0 FIX: keep context filter on contact list on change column displayed	2018-08-02 11:20:25 +02:00
Juanjo Menent	ce49230d71	Merge pull request #9177 from ATM-Nicolas/fix_preselect_project FIX : Keep same project when creating shipping from order	2018-08-02 11:18:39 +02:00
florian HENRY	ceb85cfa45	fix : odt project and task extrafields management	2018-07-31 17:29:08 +02:00
gauthier	cadf931e8d	FIX : extrafieldkey	2018-07-31 15:02:51 +02:00
John BOTELLA	4ddca02bb9	fix situation line's total	2018-07-31 14:58:33 +02:00
ATM-Nicolas	b9a44fc76b	FIX : Wrong position of firstname lastname	2018-07-31 12:15:18 +02:00
florian HENRY	5d19361782	fix: keep context filter on contact list on change column displayed	2018-07-31 11:39:54 +02:00
ATM-Nicolas	1536bbc65e	FIX : Keep same project when creating shipping from order	2018-07-30 15:16:53 +02:00
tarrsalah	8278a9fa52	FIX filter supplier invoice list by societe name.	2018-07-29 13:18:05 +01:00
Frédéric FRANCE	7dada7ae8e	fix #8820	2018-07-29 09:15:42 +02:00
Regis Houssin	e1877625a0	FIX clean code	2018-07-27 13:42:44 +02:00
Laurent Destailleur	8ab03c469a	Fix migration	2018-07-27 13:42:32 +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
Laurent Destailleur	894f484de8	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-07-27 12:34:02 +02:00
Laurent Destailleur	83ae27d122	FIX Deletion of files in migration	2018-07-27 12:33:36 +02:00
gauthier	c95d6271a9	FIX : missing hook to edit sql	2018-07-25 11:15:13 +02:00
Philippe	d7f58d0087	FIX search on ref project on propal list	2018-07-24 20:28:49 +02:00
Laurent Destailleur	7821e21e5b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-24 19:23:51 +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	927727edf3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-07-24 19:22:12 +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
Laurent Destailleur	f672e8bf02	Fix trans	2018-07-24 19:12:35 +02:00
Laurent Destailleur	f50aa03187	Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish FIX: stock replenish with multientity	2018-07-24 18:10:00 +02:00
Laurent Destailleur	e9eb8da61b	Update replenish.php	2018-07-24 18:09:50 +02:00
Laurent Destailleur	77c121b15c	Merge pull request #9099 from ATM-Nicolas/7.0 NEW Set contactCivName substitution key	2018-07-24 18:02:21 +02:00
Laurent Destailleur	ece655a84a	Merge pull request #9128 from atm-john/fix_situation_invoice_status Fix situation invoice status	2018-07-24 17:49:53 +02:00
Laurent Destailleur	869a97c8d1	Update card.php	2018-07-24 17:49:10 +02:00
Laurent Destailleur	a469f841f7	Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation	2018-07-24 17:47:37 +02:00
Laurent Destailleur	bb9c53b41f	Merge pull request #9118 from bugness-chl/8.0 corr. "group by" for PostgreSQL	2018-07-24 17:43:36 +02:00
Laurent Destailleur	08a5b499fe	Merge pull request #9139 from bugness-chl/8.0-translation Translation: adding 'Enable' term in main	2018-07-24 17:41:53 +02:00
Laurent Destailleur	71deb9ea60	Merge pull request #9143 from hregis/8.0_dict FIX field is autoincrement but not "rowid"	2018-07-24 17:22:53 +02:00
Laurent Destailleur	68ad5d780c	Merge pull request #9142 from hregis/8.0_pg FIX missing drop old postgresql unique key	2018-07-24 17:16:55 +02:00
Laurent Destailleur	438cdfc004	FIX #9141	2018-07-24 17:16:21 +02:00
Frédéric FRANCE	bde30b85ad	use defaut currency for supplier order	2018-07-24 17:06:12 +02:00
Laurent Destailleur	3bdf7d411d	Merge pull request #9125 from atm-john/fix_php7_warning_mysql Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…	2018-07-24 16:56:10 +02:00
Laurent Destailleur	a65c4ebecd	Merge pull request #9130 from hregis/8.0_bug FIX disable/enable foreign key checking for avoid errors	2018-07-24 16:55:37 +02:00
Laurent Destailleur	8866b8eb1d	Merge pull request #9133 from frederic34/patch-12 __NEXT_MONTH __PREVIOUS_MONTH give day instead month	2018-07-24 16:54:04 +02:00
Regis Houssin	20a1ffe810	FIX field is autoincrement but not "rowid"	2018-07-24 12:15:54 +02:00
Regis Houssin	25c93de801	FIX missing drop old postgresql unique key	2018-07-24 11:23:44 +02:00
Laurent Destailleur	ccd7332647	Fix default value of joinfile when creating a new email template	2018-07-24 01:46:14 +02:00
Chl	0f115dafee	2 bugfix for PDF generated by Templates/Cron: DueDate and translation When launching Cron on a facturerec with auto_validate at 1, the generated PDF doesn't contain the DueDate, and some tokens like __INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not translated (tested with fr_FR).	2018-07-24 00:39:21 +02:00
Chl	4995a0feb1	Translation: adding 'Enable' term in main compta/facture/fiche-rec.php uses 'Enable' / 'Disable' in a button text but no translation is available for 'Enable'. Another option would be to change 'Enable' to 'Activate' in fiche-rec.php but I guess this word will probably be useful in other places.	2018-07-24 00:38:48 +02:00
Laurent Destailleur	18125d56e5	css	2018-07-23 14:10:59 +02:00
Laurent Destailleur	df7a3598a8	Trans	2018-07-23 10:56:28 +02:00
Frédéric FRANCE	4341e367d2	remove % in supplier order pdf	2018-07-23 10:30:28 +02:00
Frédéric FRANCE	d582f72bd9	__NEXT_MONTH __PREVIOUS_MONTH give day instead month	2018-07-22 17:27:02 +02:00
Laurent Destailleur	c4e207e8b7	Fix dol_string_onlythesehtmltags	2018-07-22 15:51:19 +02:00
Laurent Destailleur	1d8c42265c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/modules/modFacture.class.php	2018-07-21 20:26:19 +02:00
Laurent Destailleur	a1180f79bd	Fix missing customer code and ref customer	2018-07-21 12:56:18 +02:00
Regis Houssin	5cdc9db1f8	FIX add html comment	2018-07-20 18:45:52 +02:00
Regis Houssin	719db2574e	FIX check if "confirmed" mode	2018-07-20 18:39:18 +02:00
Regis Houssin	e9d9954380	FIX do not convert llx_const if mysql encrypt/decrypt is used	2018-07-20 18:33:14 +02:00
Regis Houssin	984a8e3720	FIX disable/enable foreign key checking for avoid errors	2018-07-20 17:28:32 +02:00
John BOTELLA	0c01f6e139	Fix situation invoice status	2018-07-20 15:53:32 +02:00
John BOTELLA	1e986bc39a	Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP)	2018-07-20 11:51:01 +02:00
Laurent Destailleur	445db58966	FIX website in inline edit mode	2018-07-19 16:06:48 +02:00
Laurent Destailleur	efa5cdeab1	More complete list of allowed html tags	2018-07-19 15:24:48 +02:00
Laurent Destailleur	5523312f87	Fix missing email	2018-07-18 15:36:07 +02:00
Laurent Destailleur	7273cb97b2	Fix trans	2018-07-18 14:32:51 +02:00
Laurent Destailleur	bef777e19d	Fix default order for bank entry list	2018-07-18 14:24:58 +02:00
Laurent Destailleur	33d67ea332	Fix ref on list	2018-07-18 14:09:44 +02:00
Laurent Destailleur	4beca8d989	Fix restore look and feel	2018-07-18 13:00:38 +02:00
Laurent Destailleur	6ad0cd37b0	Translation	2018-07-18 11:57:49 +02:00
Laurent Destailleur	66f9153490	Fix css	2018-07-18 11:33:53 +02:00
Chl	b306394c15	corr. group by pour PostgreSQL	2018-07-17 23:57:21 +02:00
Laurent Destailleur	cecb0f8829	Fix missing lib	2018-07-17 22:33:20 +02:00
Laurent Destailleur	969aea98e1	Fix label of copy must not be same	2018-07-17 22:31:28 +02:00
Laurent Destailleur	7662f8f25c	Fix balance	2018-07-17 21:39:41 +02:00
Laurent Destailleur	a7853211d6	Fix balance when sorting of value date desc	2018-07-17 21:20:38 +02:00
Laurent Destailleur	cbc4a04465	Fix nowrap on smartphone	2018-07-17 18:05:49 +02:00
Laurent Destailleur	7fcec5f6c3	Fix duplicate tab "contact" on thirdparty	2018-07-17 13:54:13 +02:00
Laurent Destailleur	8249179fb8	Fix duplicate tab "contact" on thirdparty	2018-07-17 13:50:26 +02:00
Laurent Destailleur	f747cefda3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/install/upgrade2.php	2018-07-16 15:44:44 +02:00
Laurent Destailleur	45a45b0dec	NEW Can enable a module, even external module, from command line Conflicts: htdocs/install/upgrade2.php	2018-07-16 15:35:00 +02:00
gauthier	33aa373362	FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing	2018-07-16 15:27:37 +02:00
Laurent Destailleur	8df834bd2a	Debug module ticket	2018-07-16 12:13:34 +02:00
Laurent Destailleur	37e16b5ff2	Trans	2018-07-16 11:55:59 +02:00
Laurent Destailleur	e92ab19a06	Fix var not defined	2018-07-16 11:26:23 +02:00
ATM-Nicolas	3c5998e697	FIX : Refactoring	2018-07-16 11:16:55 +02:00
Laurent Destailleur	d3cc2c81eb	Better detail for time elapsed	2018-07-16 11:14:39 +02:00
Laurent Destailleur	89cc048fff	FIX Init of contact in combo list when thirdparty not yet known	2018-07-16 10:46:10 +02:00
Laurent Destailleur	c94437c3cf	Fix file in wrong dir	2018-07-16 10:14:51 +02:00
Laurent Destailleur	35ed89a517	Fix scrutinizer	2018-07-16 10:11:52 +02:00
Laurent Destailleur	6846ff7d21	Fix problem in some vars as reported in #8955	2018-07-16 09:57:45 +02:00
ATM-Nicolas	9d60b0a8c6	Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0	2018-07-16 09:47:16 +02:00
Steve	2cf28e055b	more minor grammar corrections Conflicts: htdocs/langs/en_US/admin.lang htdocs/langs/en_US/companies.lang htdocs/langs/en_US/exports.lang htdocs/langs/en_US/mails.lang htdocs/langs/en_US/products.lang htdocs/langs/en_US/sms.lang	2018-07-16 09:43:19 +02:00
ATM-Nicolas	de8fd3d12c	NEW : Contact substitutions keys	2018-07-16 09:33:14 +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
Laurent Destailleur	e92052353d	Merge pull request #9026 from inoveaconseil/FixExtrafieldResource Fix extrafields resource	2018-07-15 20:13:24 +02:00
Laurent Destailleur	b690306b70	Merge pull request #9027 from hregis/7.0_price Fix: avoid a non numeric value !!	2018-07-15 20:11:50 +02:00
ATM-Nicolas	170a668b2b	FIX : Set contactCivName substitution key	2018-07-13 11:09:56 +02:00
Laurent Destailleur	c27dd8d301	Fix phpcs	2018-07-13 09:11:46 +02:00
Laurent Destailleur	1b33703cd8	Fix missing country code	2018-07-13 09:08:42 +02:00
Laurent Destailleur	872895c0b6	Code comment	2018-07-12 11:17:21 +02:00
atm-ph	0c252d9778	Fix user rights overrided by user group rights	2018-07-11 18:09:29 +02:00
gauthier	80ff7fa86f	FIX : case when we valid form with keyboard	2018-07-11 15:18:30 +02:00
Laurent Destailleur	b203421ac6	Fix log	2018-07-11 10:54:42 +02:00
Laurent Destailleur	2e36e5afa5	Some fix with dolistore api	2018-07-11 10:47:55 +02:00
Laurent Destailleur	6eb9f13ec2	Fix warning	2018-07-11 10:01:26 +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
Regis Houssin	f52187e829	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price	2018-07-11 08:22:13 +02:00
Laurent Destailleur	4c363d1d4f	Trans	2018-07-10 15:08:51 +02:00
Laurent Destailleur	f3de1af601	Finish webdav experimental module	2018-07-10 14:56:04 +02:00
Laurent Destailleur	44626a3a48	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/lib/functions.lib.php	2018-07-10 13:57:24 +02:00
Laurent Destailleur	aeb5f5e4f3	Fix phpcs	2018-07-10 13:56:03 +02:00
Laurent Destailleur	a55abb4da7	Fix version	2018-07-10 13:54:20 +02:00
Laurent Destailleur	cbc17d4658	Fix ecm when using multicompany	2018-07-10 12:03:51 +02:00
Laurent Destailleur	b6180fcb58	Fix fetch index in ecm when using multicompany	2018-07-10 12:00:09 +02:00
Laurent Destailleur	bda142d82d	Update commande.class.php	2018-07-10 11:10:55 +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
Laurent Destailleur	8e0a663b7c	Code comment	2018-07-10 10:53:59 +02:00
Laurent Destailleur	86ee37e885	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-09 20:16:42 +02:00
Laurent Destailleur	bd1e430a28	Synch transifex	2018-07-09 20:15:14 +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
Laurent Destailleur	3cda462faf	Merge pull request #9065 from aspangaro/9.0_a1 Add customer accountancy code on deposit slips export	2018-07-09 17:08:13 +02:00
Laurent Destailleur	19c652ce06	Merge pull request #9066 from hregis/8.0_product Fix: differentiate customer prices from supplier prices sharing with getEntity("productsupplierprice")	2018-07-09 17:05:36 +02:00
Laurent Destailleur	d5cb2fc4cd	Update productcustomerprice.class.php	2018-07-09 17:04:50 +02:00
Laurent Destailleur	551e2efe86	Update productcustomerprice.class.php	2018-07-09 17:03:55 +02:00
Laurent Destailleur	959a75c51e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-09 15:38:54 +02:00
Laurent Destailleur	f5d9403c7d	Fix permission to see HR tab on user. All HR on same tabs.	2018-07-09 15:38:00 +02:00
Laurent Destailleur	70114a8d7d	Merge pull request #9072 from hregis/8.0_multicompany FIX missing entity field	2018-07-09 15:31:22 +02:00
Laurent Destailleur	8184eff66c	Fix for #9079	2018-07-09 15:25:14 +02:00
Laurent Destailleur	c33aaa076d	FIX #8984 button create expense report	2018-07-09 14:35:22 +02:00
Laurent Destailleur	e427496ddf	FIX Injection	2018-07-09 14:13:01 +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
Laurent Destailleur	8ec9257302	Fix translation	2018-07-08 20:03:14 +02:00
Regis Houssin	3e5271967b	FIX missing entity field	2018-07-08 12:11:22 +02:00
Regis Houssin	e8afd7e833	Fix: use "supplier" instead "reseller"	2018-07-07 08:48:26 +02:00
Regis Houssin	1522a5b22d	Fix: differentiate customer prices from supplier prices sharing	2018-07-07 08:43:59 +02:00
Alexandre SPANGARO	655d55eae6	Add customer accountancy code on deposit slips export	2018-07-07 02:46:56 +02:00
Laurent Destailleur	4db7e04523	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/html.formactions.class.php htdocs/loan/index.php	2018-07-06 16:09:32 +02:00
Laurent Destailleur	997ae76899	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-06 16:06:27 +02:00
Laurent Destailleur	ed6ec8138d	Fix filter on invoice status	2018-07-06 16:06:15 +02:00
Laurent Destailleur	2a676b414a	Merge pull request #9024 from atm-maxime/fix_link_create_event Fix link to create event had no socid if from thirdparty card	2018-07-06 14:26:38 +02:00
Laurent Destailleur	2113965b57	Update html.formactions.class.php	2018-07-06 14:26:21 +02:00
Laurent Destailleur	67a831ad5f	Merge pull request #9045 from hregis/8.0_multicompany Fix: check if multicompany object exists	2018-07-06 14:23:59 +02:00
Laurent Destailleur	2cdd9adc6e	Merge pull request #9023 from atm-maxime/fix_stocklist Fix filters not saved when ordering	2018-07-06 14:23:10 +02:00
Laurent Destailleur	05ed721a8c	Fix name of constant for module TICKET	2018-07-06 13:09:07 +02:00
Laurent Destailleur	e61f0ef7e4	Merge pull request #9060 from atm-maxime/fix_mod_ticket Fix mod ticket	2018-07-06 13:05:42 +02:00
Laurent Destailleur	3b8ecb18ab	Merge pull request #9044 from hregis/7.0_loan Fix: missing "paid" field	2018-07-06 13:03:37 +02:00
Laurent Destailleur	6c5264fabb	Fix label	2018-07-06 12:45:20 +02:00
Laurent Destailleur	af3ab84ebb	Fix backward compatibility with old multicompany module	2018-07-05 22:15:55 +02:00
Laurent Destailleur	b369585e61	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/product/stats/commande.php htdocs/product/stats/commande_fournisseur.php htdocs/product/stats/contrat.php htdocs/product/stats/facture.php htdocs/product/stats/facture_fournisseur.php htdocs/product/stats/propal.php htdocs/product/stats/supplier_proposal.php	2018-07-05 15:57:27 +02:00
Laurent Destailleur	0587e73272	FIX Pagination on related item pages	2018-07-05 15:53:28 +02:00
Maxime Kohlhaas	badcbd78d8	Rename ticketsup public directory	2018-07-05 15:20:38 +02:00
Maxime Kohlhaas	39f890d84a	Fix TICKETSUP var name	2018-07-05 14:51:00 +02:00
Maxime Kohlhaas	74b9f87cab	Fix ticket : missing file for numbering	2018-07-05 14:35:12 +02:00
ATM-Nicolas	59220c05e4	FIX : Select first mail model by default	2018-07-05 11:18:28 +02:00
Inovea Conseil	d53f03b596	Update after comment	2018-07-05 09:14:36 +02:00
Laurent Destailleur	5883899bc7	Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS	2018-07-05 02:33:39 +02:00
Laurent Destailleur	9842978b85	Fix trim config values	2018-07-04 11:16:45 +02:00
Laurent Destailleur	64e778a78f	Fix pgsql migration	2018-07-04 10:26:25 +02:00
Laurent Destailleur	d4d9a8d75a	Fix 8.0 not 9.0	2018-07-03 20:13:30 +02:00
Laurent Destailleur	38cd5180d9	FIX for migration from old versions	2018-07-03 20:11:59 +02:00
Laurent Destailleur	50df452b9e	Fix status "Supplier" not always visible.	2018-07-03 17:37:23 +02:00
Regis Houssin	0bb7f84f87	Fix: check if multicompany object exists	2018-07-03 14:11:00 +02:00
Laurent Destailleur	f93f5bd6e0	Fix travis	2018-07-03 13:49:41 +02:00
Regis Houssin	875cee84c7	Fix: missing "paid" field	2018-07-03 13:47:53 +02:00
Laurent Destailleur	da7b433cd0	Trans	2018-07-03 12:46:22 +02:00
Laurent Destailleur	cfb41d4329	FIX: If module workflow disabled, we must disable autoclassification too	2018-07-03 11:43:50 +02:00
Laurent Destailleur	7ef6b16d31	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/install/step1.php	2018-07-03 10:04:25 +02:00
Laurent Destailleur	0138b0e0b7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/html.form.class.php	2018-07-03 10:01:30 +02:00
Laurent Destailleur	01e8f78c30	Trans	2018-07-03 09:58:36 +02:00
Laurent Destailleur	c2499f298c	Fix bad name of field	2018-07-02 18:08:55 +02:00
Laurent Destailleur	0f77e3c05c	Fix bad name of field	2018-07-02 17:57:32 +02:00
Laurent Destailleur	3c176adb38	Fix more complete fix for bad label in creating invoice from other obj	2018-07-02 16:46:30 +02:00
Laurent Destailleur	cae7cabe6d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-02 16:22:55 +02:00
Laurent Destailleur	b22754c60b	FIX label of source object	2018-07-02 16:22:40 +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	5138a09db3	Fix sql of time spent per day	2018-07-02 15:54:21 +02:00
Laurent Destailleur	7c5aa148d9	Fix fetch	2018-07-02 15:26:01 +02:00
Laurent Destailleur	9c5d34fc5f	Fix translation	2018-07-02 12:26:32 +02:00
Laurent Destailleur	a2c89d8110	Fix page code in pdf	2018-07-02 12:25:09 +02:00
Laurent Destailleur	7bf33b1bac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/hrm/index.php htdocs/install/mysql/tables/llx_website_account.key.sql htdocs/modulebuilder/template/myobject_card.php	2018-07-02 12:16:51 +02:00
Laurent Destailleur	af21222c30	Fix translation	2018-07-02 11:47:04 +02:00
Laurent Destailleur	e8b97b0be4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-07-02 11:33:49 +02:00
Laurent Destailleur	11021353da	Fix text in payment area of crabe pdf	2018-07-02 11:33:33 +02:00
Regis Houssin	9709207a4f	Fix: superadmin can show all users in master entity	2018-07-02 10:18:16 +02:00
Regis Houssin	df718cca5c	Fix: better sql request with multicompany transverse mode	2018-07-02 10:09:56 +02:00
Regis Houssin	233ad2945c	Fix: missing hook parameter	2018-07-01 20:03:08 +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	f13dd9c9bd	Fix: missing hook parameter	2018-07-01 18:22:18 +02:00
Regis Houssin	8f124efc15	Fix: wrong mysql resource name	2018-07-01 17:48:01 +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	80adac12c0	Fix: use object entity ID instead current entity	2018-07-01 16:01:30 +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
Regis Houssin	4925624ed9	Fix: avoid NULL value when "subprice" is 0	2018-06-30 10:38:30 +02:00
Regis Houssin	964f11491f	Revert "Fix: avoid a non numeric value !!" This reverts commit `2824afa75c`.	2018-06-30 10:26:50 +02:00
Laurent Destailleur	16b4d2aee7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-06-30 02:04:24 +02:00
Laurent Destailleur	400d400b32	Fix bad constructor	2018-06-30 01:59:54 +02:00
Laurent Destailleur	bc632c9ab7	Merge pull request #9019 from atm-gauthier/6.0_fix_getentity FIX : getEntity project and not projet	2018-06-30 01:15:23 +02:00
Laurent Destailleur	292d7967c3	Merge pull request #9021 from grandoc/8.0 Fix : Notice: A non well formed numeric value encountered line 509	2018-06-29 20:02:54 +02:00
Laurent Destailleur	9004a51880	Update conf.class.php	2018-06-29 20:02:40 +02:00
Laurent Destailleur	03306fa56e	Merge pull request #9022 from atm-maxime/7.0 Fix : division by 0 on homepage if nothing to do	2018-06-29 19:58:48 +02:00
Laurent Destailleur	4ace9dd12d	Merge pull request #9015 from hregis/8.0_bug Fix: remove unused and blocking field	2018-06-29 19:58:25 +02:00
Laurent Destailleur	a011140243	Merge pull request #9025 from atm-quentin/FIX_missing_type_element Fix missing type element	2018-06-29 19:57:16 +02:00
Laurent Destailleur	a6c6bbe16d	Merge pull request #9029 from hregis/6.0_multicompany Fix: broken feature with edit in place	2018-06-29 19:40:17 +02:00
Laurent Destailleur	3f2b3c0840	FIX #9032	2018-06-29 19:38:12 +02:00
Laurent Destailleur	c4143763be	Update step1.php	2018-06-29 19:23:17 +02:00
Laurent Destailleur	932ff0be18	Trans	2018-06-29 19:16:29 +02:00
Laurent Destailleur	ca8144c5ea	Fix error message	2018-06-29 19:08:35 +02:00
Laurent Destailleur	2175a012e1	Fix lang	2018-06-29 18:23:59 +02:00
Regis Houssin	41709f07d0	Fix: #9032 Vulnerability	2018-06-29 18:18:10 +02:00
Regis Houssin	2d13b5b59d	Fix: broken feature with edit in place	2018-06-29 15:57:34 +02:00
Regis Houssin	2824afa75c	Fix: avoid a non numeric value !!	2018-06-29 11:25:30 +02:00
Laurent Destailleur	346bf7bdd6	Fix param dol_invisible_topmenu Conflicts: htdocs/main.inc.php	2018-06-29 00:21:14 +02:00
Laurent Destailleur	5775dced37	Fix dol_invisible_topmenu must differs from dol_hide_topmenu	2018-06-29 00:08:46 +02:00
Laurent Destailleur	66f0ee9e18	Fix hack with hook to solve a problem to let a chance of external modules to be visible to android webview.	2018-06-28 22:59:53 +02:00
Inovea Conseil	c4513a755d	Fix extrafields resource	2018-06-28 16:39:37 +02:00
atm-quentin	9125586692	FIX need element type on select filter	2018-06-28 15:52:40 +02:00
Maxime Kohlhaas	5756955d55	Fix link to create event had no socid if from thirdparty card	2018-06-28 14:27:59 +02:00
Laurent Destailleur	5de650435a	Fix filter on country/zip	2018-06-28 14:06:23 +02:00
Maxime Kohlhaas	3babdb9798	Fix filters not saved when ordering	2018-06-28 13:45:30 +02:00
Maxime Kohlhaas	7ebf54fbea	Fix : division by 0 on homepage if nothing to do	2018-06-28 12:54:19 +02:00
Philippe GRAND	a4ccb47b78	Fix : Notice: A non well formed numeric value encountered line 509	2018-06-28 12:18:03 +02:00
Laurent Destailleur	da138db528	FIX combo into popup become crazy with IE10 Conflicts: htdocs/asset/card.php htdocs/modulebuilder/template/myobject_card.php	2018-06-28 12:16:12 +02:00
Laurent Destailleur	ed2ec78332	FIX combo of stock in popup are crazy in IE	2018-06-28 12:11:00 +02:00
Laurent Destailleur	055d818069	FIX dashboard with IE10 not supporting flex	2018-06-28 12:09:13 +02:00
Laurent Destailleur	3ea2d81279	FIX combo into popup become crazy with IE10	2018-06-28 12:05:02 +02:00
Laurent Destailleur	55d5d01cfe	FIX combo of stock in popup are crazy in IE	2018-06-28 11:53:52 +02:00
gauthier	d8ca9f2947	FIX : we must see number of all shared projects	2018-06-27 17:26:04 +02:00
gauthier	86a58def3b	FIX : getEntity project and not projet	2018-06-27 17:13:50 +02:00
Laurent Destailleur	6fc6a743c8	Fix template email message html/nohtml	2018-06-27 12:11:49 +02:00
Laurent Destailleur	9eaca045e4	Fix default message with online payment link must be hidden when no online payment mode exists.	2018-06-27 11:34:40 +02:00
Regis Houssin	48ad03c56d	Fix: remove unused and blocking field	2018-06-27 09:33:21 +02:00
Regis Houssin	775e11ce33	Fix: wrong table name	2018-06-27 09:33:09 +02:00
Laurent Destailleur	a076d4b461	Fix translation during install	2018-06-27 01:53:36 +02:00
Laurent Destailleur	f292c1c662	Option to solve autovalidation	2018-06-27 01:33:02 +02:00
Laurent Destailleur	ac758e02a9	Fix error message with old usage of childtables	2018-06-27 01:32:54 +02:00
Laurent Destailleur	ff6ffa4738	Fix data in tooltip	2018-06-27 00:38:42 +02:00
Laurent Destailleur	a30789e423	Fix table name	2018-06-27 00:34:45 +02:00
Laurent Destailleur	4170e754d6	Fix trad	2018-06-26 18:16:25 +02:00
Laurent Destailleur	aa37786596	Fix migration errors reported by Softaculous	2018-06-26 11:51:49 +02:00
Laurent Destailleur	8147152ec8	Fix look and feel v8	2018-06-26 11:25:28 +02:00
Laurent Destailleur	969b272576	Rename menu entries and report title for better understanding	2018-06-26 11:18:31 +02:00
Laurent Destailleur	cbe682582e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-26 01:25:24 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	7f8570f720	Fix lang loading	2018-06-26 00:48:43 +02:00
Laurent Destailleur	52eddbf809	Sync transifex	2018-06-26 00:29:50 +02:00
Laurent Destailleur	9f77ea0ece	Code comment	2018-06-25 17:05:15 +02:00
Laurent Destailleur	9b46ae50f0	Fix left join on expensereport lines	2018-06-25 16:25:37 +02:00
Laurent Destailleur	36402c22ee	FIX SQL Injections reported by mu shcor (ADLab of Venustech)	2018-06-25 14:06:09 +02:00
Laurent Destailleur	16ea078615	Merge pull request #9010 from grandoc/new_branch_24_06_2018 update and clean code	2018-06-25 12:28:00 +02:00
Laurent Destailleur	9f1cfbdb72	For better compatibility	2018-06-25 12:25:43 +02:00
Regis Houssin	a78ba20c9b	Fix: update price format	2018-06-25 12:20:08 +02:00
Regis Houssin	3d9b191806	Fix: restore and update example data	2018-06-25 12:16:02 +02:00
Laurent Destailleur	d9fc1e0b5d	Fix param to avoid to create holiday or expense report in wrong entity.	2018-06-25 10:09:01 +02:00
Laurent Destailleur	97976fbb43	Fix type of parameter must be string	2018-06-25 09:19:45 +02:00
Regis Houssin	a6729b0bd1	Fix: change field name and remove obsolete data	2018-06-25 09:10:24 +02:00
Laurent Destailleur	bc71685258	Fix migration error	2018-06-25 08:30:37 +02:00
Laurent Destailleur	2520ebcfae	Fix line	2018-06-24 18:56:49 +02:00
Laurent Destailleur	c664d0c2fd	Fix phpunit	2018-06-24 18:26:35 +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
Philippe GRAND	1bb91c7860	update and clean code	2018-06-24 16:20:27 +02:00
Laurent Destailleur	3615b7b45d	Fix missing translation	2018-06-24 15:44:13 +02:00
Laurent Destailleur	2649c136cf	Fix SYSLOG_FILE_ONEPERSESSION	2018-06-24 14:31:03 +02:00
Laurent Destailleur	638595fa59	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-24 13:59:56 +02:00
Laurent Destailleur	848c8cdc4b	Fix mode SYSLOG_FILE_ONEPERSESSION to work as expected	2018-06-24 13:59:37 +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	25b1d063ae	Fix length of hidden password	2018-06-24 11:45:10 +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	1b5c5cfafb	Fix select status	2018-06-24 10:42:07 +02:00
Laurent Destailleur	c405181393	Merge pull request #8987 from a-schild/develop Added mailing by thirdparty filtering by prospect type and status	2018-06-24 10:31:09 +02:00
Laurent Destailleur	a50b62d7e7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-24 10:26:24 +02:00
Laurent Destailleur	4f533be01a	For #9006	2018-06-24 10:26:08 +02:00
Laurent Destailleur	5829014218	Merge branch 'develop' into NEW_advance_targer_filter_everywhere	2018-06-24 10:24:26 +02:00
Laurent Destailleur	e9b4141dd9	Fix syntax error	2018-06-23 17:11:19 +02:00
Laurent Destailleur	3fa5649040	Fix bad test (dev journal visible when dev option on)	2018-06-23 15:22:39 +02:00
Laurent Destailleur	2db2ea3627	Fix colspan	2018-06-23 15:13:39 +02:00
Laurent Destailleur	00165871bd	CSS	2018-06-23 15:10:44 +02:00
Laurent Destailleur	16f940b637	Prepare 7.0.4	2018-06-23 14:55:33 +02:00
Laurent Destailleur	0170906524	Look and feel	2018-06-23 14:39:24 +02:00
Laurent Destailleur	6dba88ab6e	Several fixes in look and feel	2018-06-23 14:23:07 +02:00
Laurent Destailleur	dbb90e80a3	Fix syntax error	2018-06-23 12:57:41 +02:00
Laurent Destailleur	eb88f1e5c9	Fix look and feel v8	2018-06-23 12:41:03 +02:00
Laurent Destailleur	06342ff80c	FIX contextpage on contact list	2018-06-23 12:06:17 +02:00
Laurent Destailleur	4dcc74d08f	Fix the "back to list" link also restore the contextpage	2018-06-23 11:55:04 +02:00
Laurent Destailleur	f2ac5dab4a	Fix contextpage of some menu entries	2018-06-23 10:28:06 +02:00
Laurent Destailleur	604a5a3568	trans	2018-06-23 00:19:47 +02:00
Laurent Destailleur	c871e81a52	Trans	2018-06-23 00:15:57 +02:00
Laurent Destailleur	7daee6dc6b	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +02:00
Laurent Destailleur	83f4cf67e6	css	2018-06-22 23:21:16 +02:00
Laurent Destailleur	be2309c70f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-22 22:54:11 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Laurent Destailleur	ca04ffe420	Load lang	2018-06-22 17:07:49 +02:00
Philippe GRAND	afda5288a8	clean and update code	2018-06-22 16:27:11 +02:00
Laurent Destailleur	02fbe4a84c	Merge pull request #8991 from hregis/develop_product Fix: avoid Warning: A non-numeric value encountered	2018-06-22 15:52:05 +02:00
Laurent Destailleur	6f1101a2d6	Update card.php	2018-06-22 15:51:26 +02:00
Laurent Destailleur	d458b383ad	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-06-22 15:29:44 +02:00
Laurent Destailleur	533c19cc2c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/accountancy/customer/list.php htdocs/core/lib/functions.lib.php	2018-06-22 15:29:26 +02:00
Laurent Destailleur	8414ceaddb	Merge pull request #9000 from ATM-Marc/FIX_7.0_propal_contact_SHIPPING FIX: proposal: missing contact type translation key	2018-06-22 15:16:56 +02:00
Laurent Destailleur	1bf0432a72	Merge pull request #8997 from ptibogxiv/patch-29 add minute to duration services	2018-06-22 15:12:57 +02:00
Laurent Destailleur	1cef4c1563	Merge pull request #8995 from ATM-Marc/FIX_develop_PR8841 FIX PR #8841	2018-06-22 15:10:33 +02:00
Laurent Destailleur	ac19a6e211	Merge pull request #8993 from hregis/develop_pgsql Fix: wrong field name, use "type" instead "llx_c_type_fees"	2018-06-22 15:09:31 +02:00
Laurent Destailleur	bd7277431f	Merge pull request #8986 from atm-greg/fix_desired_stock FIX bad result on fetch ProductStockEntrepot	2018-06-22 15:01:19 +02:00
Laurent Destailleur	11d4241221	Merge pull request #9002 from grandoc/new_branch_21_06_2018 clean and update code	2018-06-22 14:55:11 +02:00
Laurent Destailleur	430dea917e	Merge pull request #9005 from dolibarr95/patch-47 FIX: Add rights check in shipping	2018-06-22 14:54:47 +02:00
Laurent Destailleur	0f80508be1	Fix canvas on list is a feature going in the wall so i clean this.	2018-06-22 14:51:47 +02:00
Laurent Destailleur	cfc8e8b0ef	Merge pull request #8972 from fmarcet/7.0 FIX Avoid converting into reduction twice and draft invoice	2018-06-22 14:35:26 +02:00
Laurent Destailleur	5bee324578	Update paiement.class.php	2018-06-22 14:34:59 +02:00
Laurent Destailleur	77e7b5793f	Fix translation	2018-06-22 14:31:45 +02:00
dolibarr95	45451f08b0	Add rights check Add rights check when edit parcel informations(weight, tracking...) of a shipping	2018-06-22 12:25:14 +02:00
atm-quentin	d8ebb5da8d	FIX trans	2018-06-22 11:02:20 +02:00
Laurent Destailleur	81497687e9	Fix missing oldcopy in trigger call	2018-06-22 10:55:36 +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
Laurent Destailleur	88d3bf0148	FIX creation of tasks must hide closed project	2018-06-21 18:47:02 +02:00
Philippe GRAND	da2f07c848	clean and update code	2018-06-21 15:01:45 +02:00
Laurent Destailleur	cfcedc1170	Fix remove old unique key constraint	2018-06-21 00:11:37 +02:00
Laurent Destailleur	1a8afeff2a	Fix error message	2018-06-20 23:50:50 +02:00
Laurent Destailleur	2d89d9634b	Fix search on extrafields	2018-06-20 23:16:06 +02:00
Laurent Destailleur	a3b9d4f01b	Fix tooltip on subsidiary list	2018-06-20 22:02:36 +02:00
Laurent Destailleur	07c514b85c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/class/fournisseur.product.class.php htdocs/projet/class/projectstats.class.php	2018-06-20 21:56:10 +02:00
Laurent Destailleur	828a9296b4	Fix stats on project	2018-06-20 21:52:06 +02:00
Laurent Destailleur	714057d435	Fix stats on project. Must use assignement on project as filter.	2018-06-20 21:31:37 +02:00
Laurent Destailleur	90b2314d98	Code comment	2018-06-20 21:24:57 +02:00
Laurent Destailleur	9f2437fa04	Fix missing field	2018-06-20 17:59:01 +02:00
Marc de Lima Lucio	2fab4d7f76	FIX: proposal: missing contact type translation key	2018-06-20 14:56:24 +02:00
ptibogxiv	a6151ee11e	add minute to duration services add minute for duration description (more compliant thant 0,166667h for billing services by minute	2018-06-20 12:10:25 +02:00
Marc de Lima Lucio	dc951029cd	Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm	2018-06-20 10:31:35 +02:00
Marc de Lima Lucio	babc99465c	FIX PR #8841	2018-06-20 10:22:43 +02:00
Marc de Lima Lucio	9fa9a716d5	FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts	2018-06-20 10:22:43 +02:00
Regis Houssin	8fc2f7441c	Fix: to avoid deleting line breaks	2018-06-20 09:06:16 +02:00
Regis Houssin	e1db5ab433	Fix: wrong field name, use "type" instead "llx_c_type_fees"	2018-06-19 19:56:39 +02:00
Laurent Destailleur	a73296e212	Fix reseller not saved	2018-06-19 19:34:23 +02:00
Regis Houssin	b9fe6f8624	Fix: avoid warning	2018-06-19 19:00:23 +02:00
Regis Houssin	2c927dba01	Fix: wrong var name "shownav"	2018-06-19 18:33:22 +02:00
Regis Houssin	b9893bde1d	Fix: avoid Warning: A non-numeric value encountered	2018-06-19 18:26:37 +02:00
Laurent Destailleur	19e40466b1	css	2018-06-19 13:26:30 +02:00
Laurent Destailleur	fb2e820329	Fix menu not visible on jmobile	2018-06-19 13:17:46 +02:00
Laurent Destailleur	b364412a4a	FIX Menu scheduled jobs not visible on jmobile conf	2018-06-19 13:10:13 +02:00
a-schild	baba0757d7	Added filtering by prospect type and status Added filtering by prospect type and status	2018-06-19 11:46:03 +02:00
a-schild	211bb87e46	Moved functionality to select by categories Moved functionality to select by categories	2018-06-19 11:45:27 +02:00
atm-greg	df056980b5	fix bad result on fetch ProductStockEntrepot	2018-06-19 10:46:07 +02:00
Laurent Destailleur	edd7499375	Fix clone with new architecture	2018-06-19 09:21:23 +02:00
Laurent Destailleur	e402f68593	Clean code	2018-06-19 08:51:25 +02:00
Laurent Destailleur	75dee7538b	Fix add protection to avoir fatal error 500	2018-06-19 01:15:37 +02:00
Laurent Destailleur	5d5083199f	FIX better text content for multipart email	2018-06-18 23:26:21 +02:00
Laurent Destailleur	f9f7d3655d	FIX better text content for multipart email	2018-06-18 23:24:31 +02:00
Laurent Destailleur	c3f64ed36e	FIX better text content for multipart email	2018-06-18 23:18:22 +02:00
Laurent Destailleur	da16805b00	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-18 16:27:36 +02:00
Laurent Destailleur	d81398e72d	Fix info on tooltip	2018-06-18 16:27:25 +02:00
Laurent Destailleur	62307b74e7	Merge pull request #8981 from grandoc/new_branch_18_06_2018 clean and upsdate code	2018-06-18 15:14:29 +02:00
Laurent Destailleur	b64b4abf07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-18 14:46:47 +02:00
Laurent Destailleur	4f877e7970	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/lines.php htdocs/accountancy/supplier/lines.php	2018-06-18 14:46:30 +02:00
Laurent Destailleur	31067b6250	FIX picto for type in product link in accountany list is wrong	2018-06-18 14:43:32 +02:00
Laurent Destailleur	ce5514bd68	Fix sql begin at wrong place	2018-06-18 14:37:16 +02:00
Laurent Destailleur	5b019eb985	Merge pull request #8982 from hregis/7.0_bug6 Fix: "libelle" is deprecated, use "label" instead	2018-06-18 14:32:35 +02:00
Laurent Destailleur	5d6d43d539	Merge pull request #8964 from atm-gauthier/6.0_accounting_entity FIX : need to filter on aa.entity for same accounting accounts available in several entities	2018-06-18 14:30:55 +02:00
Philippe GRAND	41a0175827	clean and upsdate code	2018-06-18 14:17:43 +02:00
Regis Houssin	54a333c374	Fix: use label instead libelle	2018-06-18 13:54:14 +02:00
Regis Houssin	494d6dcfef	Fix: libelle is deprecated, use label instead	2018-06-18 13:50:58 +02:00
Laurent Destailleur	ad2df304b4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/lines.php htdocs/fourn/commande/card.php htdocs/societe/class/societe.class.php	2018-06-18 13:31:29 +02:00
Laurent Destailleur	16fee19b6f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-06-18 13:20:11 +02:00
Laurent Destailleur	102f9aa84f	FIX Problems in accountancy module when using multicompany module.	2018-06-18 13:19:46 +02:00
Philippe GRAND	62586c7c5d	clean and upsdate code	2018-06-18 12:47:17 +02:00
a-schild	3e9bc75c9c	Added mailings to thirdparties Allows to select third parties as mailing targets, depending client/lead and active/inactive status	2018-06-18 12:23:27 +02:00
gauthier	fed61930d5	FIX : clause must not be there	2018-06-18 11:37:15 +02:00
Laurent Destailleur	cf0be86d0e	Merge pull request #8963 from ATM-Marc/NEW_supplierorderexport_reffourn NEW: supplier order/order lines export: add supplier product ref	2018-06-18 11:26:14 +02:00
Laurent Destailleur	5675c8fc01	Update modFournisseur.class.php	2018-06-18 11:26:03 +02:00
Laurent Destailleur	e993a41160	Update modFournisseur.class.php	2018-06-18 11:24:58 +02:00
Laurent Destailleur	5632228153	Update modFournisseur.class.php	2018-06-18 11:23:36 +02:00
Laurent Destailleur	8c6f311aa6	Merge pull request #8974 from atm-ph/fix_7.0_addMoreActionsButtons_on_usercard Fix missing hook on usercard (addMoreActionsButtons)	2018-06-18 11:18:12 +02:00
Laurent Destailleur	ca5f27636b	Merge pull request #8978 from grandoc/new_branch_17_06_2018 clean and update code	2018-06-18 11:16:00 +02:00
Laurent Destailleur	9d048281dc	Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument Fix missing params on generateDocument	2018-06-18 11:14:49 +02:00
Laurent Destailleur	9cfc4a8d28	Merge pull request #8971 from atm-ph/fix_7.0_hook_getnomurltooltip Fix can't add an attribute simply	2018-06-18 11:13:29 +02:00
Laurent Destailleur	95ee3325fc	Part of fix of #8972	2018-06-18 11:11:07 +02:00
Laurent Destailleur	95dfa1f7aa	Merge pull request #8973 from altatof/FIX_HTML_DETECTION Fix <br/> detection	2018-06-18 10:42:02 +02:00
Laurent Destailleur	5d56969bd9	Merge pull request #8977 from hythamsoliman81/dolibarr-fixes FIX: SQL syntax error at llx_website_page.sql	2018-06-18 10:41:45 +02:00
Laurent Destailleur	63fb82931c	Update functions.lib.php	2018-06-18 10:41:11 +02:00
Philippe GRAND	ddbf5e59e1	clean and update code	2018-06-18 10:12:19 +02:00
Philippe GRAND	4c08e2ebf3	clean and update code	2018-06-17 14:33:29 +02:00
Laurent Destailleur	7c7ee56832	Fix missing email Fix avoid warning	2018-06-17 01:50:10 +02:00
hythamsoliman81	f461ab5f96	SQL synatx error at llx_website_page.sql	2018-06-17 00:12:06 +02:00
Laurent Destailleur	dcd43b715a	Fix look and feel v8	2018-06-16 23:51:30 +02:00
Laurent Destailleur	187127ce6f	Fix CSS	2018-06-16 21:19:50 +02:00
Laurent Destailleur	8c748505db	Use parent instead of parents	2018-06-16 17:25:16 +02:00
Laurent Destailleur	7ad086bbdf	FIX Duplicate select2 when we split a supplier order receipt item	2018-06-16 17:18:17 +02:00
Laurent Destailleur	5524784421	FIX prefilled date of order must have hours too	2018-06-16 15:24:31 +02:00
Laurent Destailleur	186f08e67b	Fix preview of PDF for supplier objects	2018-06-16 15:08:13 +02:00
Laurent Destailleur	7981bd08b7	Fix price+sql error when adding product when no supplier price defined	2018-06-16 14:47:33 +02:00
Laurent Destailleur	4898f10fa2	FIX Adding a product with no supplier price defined yet	2018-06-16 13:49:28 +02:00
Laurent Destailleur	92952aea28	Trans	2018-06-16 13:23:58 +02:00
Laurent Destailleur	5908fc1471	Trans	2018-06-16 13:15:24 +02:00
Laurent Destailleur	c0d4715bdb	Clean code	2018-06-15 16:29:26 +02:00
atm-ph	3c80ce501b	Fix missing hook on usercard (addMoreActionsButtons)	2018-06-15 16:05:50 +02:00
altatof	5d6cd381b9	Fix <br/> detection	2018-06-15 15:59:14 +02:00
Laurent Destailleur	79cbdf7fd1	Code comment	2018-06-15 15:29:19 +02:00
Ferran Marcet	a21e138c70	Fix: Avoid converting into reduction twice and draft invoice	2018-06-15 11:19:04 +02:00
atm-ph	cb3704b67e	Fix can't add an attribute simply	2018-06-15 11:02:46 +02:00
Inovea Conseil	d5a3e63e05	Fix missing paramater for generateDocument	2018-06-15 09:47:28 +02:00
Laurent Destailleur	df28be443b	Add syslog module in list of module reloaded in last migration step	2018-06-14 23:00:42 +02:00
Laurent Destailleur	f5c08c4b9f	Doc website	2018-06-14 16:38:20 +02:00
Laurent Destailleur	25d656025a	Fix use of alternative aliases is ok now	2018-06-14 16:33:11 +02:00
Laurent Destailleur	b37f7a6953	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-14 16:15:34 +02:00
Laurent Destailleur	e28aca6244	Fix workaround against p insertion by ckeditor	2018-06-14 16:15:06 +02:00
Regis Houssin	f9a86ba43f	Fix: MEMBER_MODIFY trigger not called if i change only extrafields	2018-06-14 14:01:05 +02:00
Laurent Destailleur	9717a32a2e	Merge pull request #8960 from grandoc/new_branch_13_06_2018 clean code	2018-06-14 12:01:19 +02:00
gauthier	e9d65ea751	FIX : need to filter on aa.entity for same accounting accounts available in several entities	2018-06-14 11:56:22 +02:00
Laurent Destailleur	f79466d483	Trans	2018-06-14 11:41:14 +02:00
Marc de Lima Lucio	a5898b830b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into 7.0	2018-06-14 10:48:09 +02:00
Marc de Lima Lucio	a80e1c601c	NEW: supplier order/order lines export: add supplier product ref	2018-06-14 10:43:01 +02:00
Marc de Lima Lucio	1dec4c4320	FIX: supplier order: product supplier ref not saved on addline	2018-06-14 10:37:40 +02:00
Laurent Destailleur	4900f1f1f1	Fix sql coding style	2018-06-13 23:10:29 +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	a15cfd23f0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-13 22:57:51 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Philippe GRAND	a937d9e657	clean code	2018-06-13 22:52:24 +02:00
Laurent Destailleur	c5887c1ec7	Merge pull request #8399 from ptibogxiv/patch-23 FIX lang for support more type of stripeconnect account	2018-06-13 22:13:43 +02:00
Laurent Destailleur	094b31a563	Complete migration	2018-06-13 21:46:55 +02:00
Laurent Destailleur	ed41731a50	Merge pull request #8954 from mwelters/develop German Accounting Plan SKR03 and SKR04 (mysql/data)	2018-06-13 21:45:02 +02:00
Laurent Destailleur	c09e69aeb6	Update llx_accounting_abc.sql	2018-06-13 21:44:43 +02:00
Laurent Destailleur	8d1456fb7f	Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal add product units management in supplier proposal documents	2018-06-13 21:41:39 +02:00
Laurent Destailleur	aaa6565014	Merge pull request #8938 from HackLo/develop FIX: Link does not work when there is spaces in SIREN	2018-06-13 21:39:54 +02:00
Laurent Destailleur	6881fda744	Merge pull request #8934 from grandoc/new_branch_08_06_2018 New branch 08 06 2018	2018-06-13 21:38:46 +02:00
Laurent Destailleur	074ada10e6	Merge pull request #8940 from aspangaro/8.0-b33 Fix : Migration for Romanian chart of accounts	2018-06-13 21:37:50 +02:00
Laurent Destailleur	09c92b7cc8	Merge pull request #8936 from atm-gauthier/6.0_fix_dont_remove_all_fourn_rights FIX : If we enable 3 steps for supplier order approbation, we must no…	2018-06-13 21:36:01 +02:00
Laurent Destailleur	bc0080b945	Merge pull request #8945 from bafbes/abb7009 Fix: Do not activate module if errors found on execution of module SQL queries	2018-06-13 21:28:04 +02:00
Laurent Destailleur	98ae8e18df	Update modMyModule.class.php	2018-06-13 21:27:57 +02:00
Laurent Destailleur	c586f2ecf7	Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise	2018-06-13 21:20:42 +02:00
Laurent Destailleur	4b84b7ccf2	Merge pull request #8926 from fappels/develop_fix_setvaluefrom FIX commonobject setValueFrom trigger	2018-06-13 20:50:26 +02:00
Laurent Destailleur	916424943e	Merge pull request #8942 from grandoc/new_branch_10_06_2018 New branch 10 06 2018	2018-06-13 20:48:22 +02:00
Laurent Destailleur	e69b0102a5	Merge pull request #8935 from inoveaconseil/modulebuilder Fix include for older version	2018-06-13 20:43:38 +02:00
Laurent Destailleur	4be069a3b5	Update setup.php	2018-06-13 20:43:02 +02:00
Laurent Destailleur	e983566422	Merge pull request #8947 from glu000/develop Fix for Bug #8946	2018-06-13 20:41:54 +02:00
Laurent Destailleur	dd8e39195d	Merge pull request #8932 from grandoc/new_branch_07_06_2018 New branch 07 06 2018	2018-06-13 20:40:48 +02:00
Laurent Destailleur	3703a7c4b0	Merge pull request #8952 from papoteur-mga/patch-1 Fix: In list of bank accounts, display the balance in formatted price	2018-06-13 20:40:27 +02:00
Laurent Destailleur	4acde4e0a9	Merge pull request #8950 from ATM-Marc/FIX_develop_sortfield FIX: handle sortorder on multiple columns + potential SQL field mismatch	2018-06-13 20:36:08 +02:00
Laurent Destailleur	b5cd722eb1	Merge pull request #8917 from atm-gauthier/6.0_fix_apply_reduc FIX : sometimes amounts are identical but php find them different.	2018-06-13 20:34:59 +02:00
Laurent Destailleur	76ee88f0b1	Merge pull request #8951 from fappels/7.0_fix_ErrorProductAlreadyExists Fix Wrong error for duplicate ref if barcode enabled but not set.	2018-06-13 20:19:55 +02:00
Laurent Destailleur	b8e927d347	Merge pull request #8915 from grandoc/new_branch_04_06_2018 clean and update code	2018-06-13 20:16:19 +02:00
Laurent Destailleur	3ec6b88ece	Merge pull request #8958 from frederic34/listfax FIX add fax to thirdparty list	2018-06-13 20:10:10 +02:00
Laurent Destailleur	eabb3e9cd3	Merge pull request #8930 from hregis/7.0_non-numeric FIX wrong var name $search_month_lim	2018-06-13 20:09:13 +02:00
Laurent Destailleur	5fcfad5966	Merge pull request #8918 from atm-gauthier/6.0_fix_entity_select_prod_fourn_prices FIX : entity test must be on product_fourn_price table and not product table	2018-06-13 20:08:25 +02:00
Laurent Destailleur	49d749a4b9	Merge pull request #8920 from grandoc/new_branch_05_06_2018 clean and update code	2018-06-13 20:04:41 +02:00
Laurent Destailleur	887c9e0495	Merge pull request #8922 from aspangaro/8.0-b31 NEW Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)	2018-06-13 20:04:16 +02:00
Laurent Destailleur	3f7f77ce95	Merge pull request #8923 from atm-florian/7.0 fix error display	2018-06-13 20:02:45 +02:00
Laurent Destailleur	fdc90da408	Update card.php	2018-06-13 20:02:38 +02:00
Laurent Destailleur	1e488a6f7f	Merge pull request #8924 from dtix/patch-1 Romania vat rate changed	2018-06-13 20:01:48 +02:00
Laurent Destailleur	4c1bb9d28f	Merge pull request #8948 from glu000/7.0 Fix #8946	2018-06-13 20:01:29 +02:00
Laurent Destailleur	f07408c6c3	Merge pull request #8929 from ATM-Marc/FIX_7.0_extrafields_intervention FIX: intervention: extrafield error when calling insertExtrafields	2018-06-13 20:00:48 +02:00
Laurent Destailleur	6fbdcea356	Code comment	2018-06-13 19:22:50 +02:00
Frédéric FRANCE	345fb1f2af	add fax to thirdparty list	2018-06-13 17:57:15 +02:00
Laurent Destailleur	03b6bec8b8	Fix email template for test	2018-06-13 17:03:46 +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	cfa69fe93f	FIX popup confirmation deos not accept value with special chars	2018-06-13 14:51:20 +02:00
Laurent Destailleur	50aa674ebc	Fix support of 'help' field property. Fix bad td closing.	2018-06-13 13:36:40 +02:00
Laurent Destailleur	f4bef82bfa	Fix td not closed and js code duplicated (at wrong place)	2018-06-13 13:00:08 +02:00
Laurent Destailleur	ff002a45e0	Missing trans	2018-06-13 11:50:06 +02:00
Markus Welters	885904132c	Update llx_accounting_abc.sql	2018-06-13 09:37:12 +02:00
Papoteur	6567365086	In list of bank accounts, display the balance in formatted price [Problem to solve] in compta/bank/list.php, the balance can be displayed witht decimal or not. This is not fine. [Solution] Change a parameter in the price function to format the balance with the required number of decimals.	2018-06-13 08:39:26 +02:00
Laurent Destailleur	b1986a8d2e	Fix trans	2018-06-12 19:22:28 +02:00
fappels	a86c90fed1	Fix Wrong error for duplicate ref if barcode enabled but not set.	2018-06-12 16:38:42 +02:00
Marc de Lima Lucio	e992187f4c	FIX: handle sortorder on multiple columns + potential SQL field mismatch	2018-06-12 16:00:16 +02:00
atm-greg	d14f40f722	add product units management in supplier proposal documents	2018-06-12 14:36:32 +02:00
Laurent Destailleur	4313e41580	Start to fix pb with 3DS	2018-06-12 13:47:28 +02:00
Günter Lukas	fcbf50467e	Update user.class.php	2018-06-12 09:52:55 +02:00
Günter Lukas	3c42a282f5	Fix for Bug #8946 Add element fields to class user	2018-06-12 09:48:03 +02:00
Abbes Bahfir	2f759e0c18	Fix: Do not activate module if errors on module SQL queries execution	2018-06-12 00:43:01 +01:00
Laurent Destailleur	94919d6e99	Translation	2018-06-11 15:17:05 +02:00
Laurent Destailleur	5ae1395acd	Fix js when no data	2018-06-11 14:22:01 +02:00
Laurent Destailleur	1d7d16649a	Code comment	2018-06-11 12:31:26 +02:00
Laurent Destailleur	d6a84b0685	FIX Sync third party change to Stripe only if we change Stripe data	2018-06-11 11:47:10 +02:00
Laurent Destailleur	eb8d67483b	Fix message error	2018-06-11 10:40:57 +02:00
Laurent Destailleur	b5586af56e	Fix js error	2018-06-11 10:38:04 +02:00
Laurent Destailleur	ab93909402	Fix url test	2018-06-11 10:36:50 +02:00
Laurent Destailleur	8978208080	Check url	2018-06-11 10:34:54 +02:00
Laurent Destailleur	f0446d2a3b	Fix for content editable sites	2018-06-11 10:25:22 +02:00
Laurent Destailleur	557db7661c	Fix for content editable sites	2018-06-11 10:19:42 +02:00
Laurent Destailleur	7562c13fad	The about page is now a README.md file	2018-06-11 09:32:41 +02:00
Laurent Destailleur	ab5ed6a3b5	Fix rename of ticket language file	2018-06-11 09:31:31 +02:00
Laurent Destailleur	b67a86843b	Fix sql error	2018-06-11 09:22:50 +02:00
Laurent Destailleur	64537ba9bf	Fix missing field in install	2018-06-11 09:20:26 +02:00
Philippe GRAND	5021c7a556	clean and update code	2018-06-10 18:29:04 +02:00
Philippe GRAND	f1f56ca5e9	Merge remote-tracking branch 'upstream/develop' into develop	2018-06-10 18:09:24 +02:00
Alexandre SPANGARO	c7e6ee3a1b	Fix : Migration for Romanian chart of accounts	2018-06-10 04:02:35 +02:00
markus	f3a7e2205b	fix typo	2018-06-09 19:07:33 +02:00
markus	9ce10ccef7	Adding SKR03 and SKR04	2018-06-09 19:00:24 +02:00
Laurent Destailleur	31eeaf9914	Trans	2018-06-09 13:46:42 +02:00
Loïc Barouty	945b71d6af	FIX: Link does not work when there is spaces in SIREN (like in the main format)	2018-06-08 23:38:44 +02:00
Laurent Destailleur	758e5a51a5	Fix contextpage was not saved in forms	2018-06-08 19:35:53 +02:00
Laurent Destailleur	eb9321f2b8	css	2018-06-08 17:53:13 +02:00
gauthier	baf9d4a806	FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def.	2018-06-08 17:11:59 +02:00
Laurent Destailleur	95d5a1088b	Fix error on sql error (field does not exists)	2018-06-08 16:49:14 +02:00
Inovea Conseil	75bb5c1624	Fix include for older version	2018-06-08 16:01:09 +02:00
Laurent Destailleur	485dc9a57a	Clean code	2018-06-08 15:37:25 +02:00
Philippe GRAND	8f777a513b	clean and update code	2018-06-08 10:33:52 +02:00
Philippe GRAND	4dc42f65da	Merge remote-tracking branch 'upstream/develop' into develop	2018-06-08 09:49:03 +02:00
Laurent Destailleur	fb8dd2f32b	FIX TCPDF is generated PDF 1.7 but TCPDI was setting version to 1.3	2018-06-08 09:37:26 +02:00
Laurent Destailleur	8142a672a7	PDF compatibility. Use hidden option to force PDF1/A instead of PDF-1.3	2018-06-07 21:12:30 +02:00
Laurent Destailleur	df7e9fccdd	Autofill alias	2018-06-07 19:12:18 +02:00
Philippe GRAND	9a44a433b8	clean code	2018-06-07 18:32:00 +02:00
Philippe GRAND	4fd2468b6f	clean code	2018-06-07 18:13:00 +02:00
Regis Houssin	7ce2ebf1a9	Fix: wrong var name	2018-06-07 16:25:47 +02:00
Marc de Lima Lucio	d69fae72c7	FIX: intervention: extrafield regression in commit `b5f37301a5`	2018-06-07 15:17:22 +02:00
Laurent Destailleur	8aa7956b4f	Fix missing extraparams field in insert action	2018-06-07 12:53:06 +02:00
Laurent Destailleur	186df884fa	Trans	2018-06-07 09:37:12 +02:00
Laurent Destailleur	929a44d7ca	Fix dir of contract for multicompany	2018-06-06 23:56:59 +02:00
Laurent Destailleur	d10c9cf565	FIX dir for modules must not have s at end (fix contracts into contract)	2018-06-06 23:47:48 +02:00
Laurent Destailleur	76f0236bb6	Fix empty page	2018-06-06 23:13:49 +02:00
fappels	a9f60bcdac	fix travis	2018-06-06 22:04:12 +02:00
Laurent Destailleur	a7b38db31f	Fix bug reported by scrutinizer	2018-06-06 18:55:50 +02:00
Laurent Destailleur	b57f3a3f36	Fix bug reported by scrutinizer	2018-06-06 18:41:35 +02:00
Laurent Destailleur	6b24d81afc	Fix bug reported by scrutinizer	2018-06-06 18:40:56 +02:00
Laurent Destailleur	a8e06abc4f	Fix bug reported by scrutinizer	2018-06-06 18:35:11 +02:00
Laurent Destailleur	f9a24c53c0	Fix bug reported by scrutinizer	2018-06-06 18:20:31 +02:00
Laurent Destailleur	6e62727c37	Fix scrutinizer bug	2018-06-06 18:18:50 +02:00
Laurent Destailleur	bb97119233	Fix duplicate function name	2018-06-06 18:07:32 +02:00
fappels	141d19571c	Add modify trigger to barcode modify.	2018-06-06 17:11:34 +02:00
fappels	81ef355b65	Fix trigger on setValueFrom Load updated values into object for trigger.	2018-06-06 17:10:46 +02:00
Laurent Destailleur	002181190c	Fix option not used	2018-06-06 15:28:50 +02:00
dtix	e6da000ae8	Romania vat rate changed	2018-06-06 14:48:11 +03:00
Laurent Destailleur	74890ce656	Sync transifex	2018-06-06 12:02:33 +02:00
Laurent Destailleur	ac721b46bc	Trans	2018-06-06 11:16:42 +02:00
Laurent Destailleur	35ed49e575	Trans	2018-06-06 10:42:41 +02:00
Laurent Destailleur	5ea1890f0c	Fix payments on contract line	2018-06-06 10:28:53 +02:00
florian HENRY	75305e095d	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0	2018-06-05 20:39:53 +02:00
florian HENRY	8031ef49f2	fix error return	2018-06-05 20:38:55 +02:00
Alexandre SPANGARO	f2c04c5653	Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)	2018-06-05 20:37:39 +02:00
Laurent Destailleur	30b04c0d3d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/lib/files.lib.php	2018-06-05 18:16:32 +02:00
Laurent Destailleur	4c21ad4e4e	FIX: dol_delete_file must work in a context without db handler loaded Conflicts: htdocs/core/lib/files.lib.php	2018-06-05 18:12:14 +02:00
Laurent Destailleur	1671c8b6cc	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-05 18:06:30 +02:00
Laurent Destailleur	9c32e49bd3	FIX: dol_delete_file must work in a context without db handler loaded	2018-06-05 18:05:33 +02:00
Laurent Destailleur	f28a6e59c8	Look and feel v8	2018-06-05 16:30:16 +02:00
Philippe GRAND	82bb1c8806	clean and update code	2018-06-05 14:29:25 +02:00
gauthier	45ecb0258b	FIX : entity test must be on product_fourn_price table and not product table	2018-06-05 12:41:38 +02:00
gauthier	77e7932671	FIX : sometimes amounts are identical but php find them different.	2018-06-05 11:33:58 +02:00
Laurent Destailleur	8d62c06653	css	2018-06-05 11:25:41 +02:00
Laurent Destailleur	b6955692b4	Fix autofill of password	2018-06-05 11:22:00 +02:00
Laurent Destailleur	9730138845	Code comment	2018-06-05 11:06:44 +02:00
Laurent Destailleur	7cb66e8e0c	Fix reset of filters	2018-06-05 10:04:57 +02:00
Laurent Destailleur	e7f6a5112c	Bad picto	2018-06-05 09:02:50 +02:00
Laurent Destailleur	7c82c74b6b	Fix install check	2018-06-05 08:57:04 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
Philippe GRAND	909fa496e5	clean and update code	2018-06-04 17:37:17 +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	3368e35502	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-06-04 14:09:34 +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	69dd11f7c6	Fix: Must use a standard (internationnal) date format.	2018-06-04 14:05:47 +02:00
Laurent Destailleur	eca66492ce	Merge pull request #8913 from aspangaro/8.0-a26 NEW : Accountancy Add import on general ledger	2018-06-04 14:02:34 +02:00
Laurent Destailleur	840330deea	Merge pull request #8905 from atm-greg/Add_supplier_proposals_in_suppliers_linkedObjects Add supplier proposal in linkedObjects type select of the suppliers	2018-06-04 13:46:36 +02:00
Laurent Destailleur	40ab046bd1	Merge pull request #8904 from Mavyre/develop FIX Errors on synchronize rates when accessing Dolibarr from HTTPS	2018-06-04 13:46:03 +02:00
Laurent Destailleur	5f4932c0b0	Merge pull request #8902 from bgenere/develop FIX extrafield template for list and resource list with extrafields	2018-06-04 13:44:14 +02:00
Laurent Destailleur	54023d1029	Update list.php	2018-06-04 13:42:30 +02:00
Laurent Destailleur	af974430f5	Merge pull request #8901 from defrance/patch-119 Add Hook on getNomUrl	2018-06-04 13:36:46 +02:00
Laurent Destailleur	61946446b2	Update fichinter.class.php	2018-06-04 13:36:38 +02:00
Laurent Destailleur	da44ea858c	Trans	2018-06-04 13:35:30 +02:00
Laurent Destailleur	eaee252a5d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-04 12:56:12 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
Laurent Destailleur	60ce5fb87e	Merge pull request #8911 from fappels/develop_fix_properties_for_trigger FIX stock movement trigger is missing some data	2018-06-04 12:20:47 +02:00
Laurent Destailleur	536e8297c2	Merge pull request #8897 from areaeuro/patch-3 FIX Delete thirdparty logo	2018-06-04 12:19:41 +02:00
Alexandre SPANGARO	a3030e4057	Update works	2018-06-03 22:35:39 +02:00
fappels	e0f9605483	Fix add missing properties for trigger	2018-06-03 11:05:02 +02:00
Laurent Destailleur	a6104d18a9	CSS	2018-06-02 16:36:05 +02:00
Laurent Destailleur	034ce7e55d	CSS	2018-06-02 10:36:22 +02:00
Laurent Destailleur	5ff3398048	Try to fix evil Google Chrome autopopulate bug	2018-06-01 18:27:17 +02:00
Laurent Destailleur	be2c49d490	Fix log	2018-06-01 17:39:07 +02:00
Laurent Destailleur	b094ae953e	Better log	2018-06-01 17:20:49 +02:00
Laurent Destailleur	3f6d11cf26	Fix log	2018-06-01 16:23:42 +02:00
Laurent Destailleur	7c0afbe025	Clean code	2018-05-31 17:12:08 +02:00
atm-greg	0785029fe0	Add supplier proposal in linkedObjects type select of the suppliers	2018-05-31 10:46:50 +02:00
Laurent Destailleur	0503373e31	Avoid error on screen	2018-05-31 09:49:46 +02:00
Mavyre	6b86e1c3bb	FIX Bookkeeping report wrong display	2018-05-30 21:38:57 +02:00
Mavyre	ace57859e4	Use curl to get rates from CurrecyLayer API	2018-05-30 21:14:51 +02:00
Mavyre	e59a91bdae	Stopped using AJAX for the synchro	2018-05-30 21:12:28 +02:00
bgenere	67830a7d04	FIX extrafields display properly in list for Resource module	2018-05-30 17:09:24 +02:00
bgenere	89d9fe3919	FIX Issue for extra fields date display in template. Template is now consistent with the extrafiels_view template	2018-05-30 17:08:01 +02:00
BENKE Charlene	0ce3b2b431	Add Hook on getNomUrl	2018-05-30 14:19:30 +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
areaeuro	475297b98b	Update card.php Line 714 - conditional to delete thirdparty logos $object->photo does not exits, and should read $object->logo This appears to be an oversight, as it is correct in the rest of the file	2018-05-30 12:29:02 +02:00
Laurent Destailleur	d8d4d15b4b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-30 12:13:40 +02:00
Laurent Destailleur	de59892438	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:13:18 +02:00
Laurent Destailleur	0412264418	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 12:05:54 +02:00
Laurent Destailleur	60321aabd8	Fix regression	2018-05-30 11:59:23 +02:00
Laurent Destailleur	c1f5c6becf	Merge pull request #8877 from frederic34/longlines soft limit length of lines to 500 chars	2018-05-30 11:19:29 +02:00
Laurent Destailleur	ec36f24046	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-30 11:17:21 +02:00
Laurent Destailleur	a6e323fae8	Fix bad usage of "for" loop	2018-05-30 11:16:06 +02:00
Laurent Destailleur	3733169120	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/recap-compta.php htdocs/fourn/class/fournisseur.commande.class.php	2018-05-30 11:09:53 +02:00
Laurent Destailleur	2df2071bae	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-30 11:05:12 +02:00
Laurent Destailleur	02da9b6992	FIX #8893 to get formatted price as substitution vars	2018-05-30 11:04:44 +02:00
Laurent Destailleur	e8d7c54716	Merge pull request #8890 from inoveaconseil/patch-3 Fix missing substitution	2018-05-30 10:52:35 +02:00
Laurent Destailleur	7590df85e6	Merge pull request #8887 from atm-florian/6.0 add hook on balence pages	2018-05-30 10:47:59 +02:00
Laurent Destailleur	e57ceab5de	Update fournisseur.commande.class.php	2018-05-30 10:45:06 +02:00
ATM-Nicolas	48a315f6cd	FIX : Bad substitution key used for default send proposal email	2018-05-30 10:14:34 +02:00
Inovea Conseil	fc7b88e5e6	Fix missing substitution Missing substitution for object	2018-05-29 23:04:35 +02:00
Mavyre	6ba6258d14	Fixed Classify abandonned not displaying	2018-05-29 17:36:24 +02:00
florian HENRY	b65b545e0f	add hook on balence pages	2018-05-29 16:29:14 +02:00
Laurent Destailleur	ee83b9a7b2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-29 12:48:01 +02:00
Laurent Destailleur	57664c5a26	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/list.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php	2018-05-29 12:47:42 +02:00
ATM-Nicolas	6b0b975ffd	FIX : Keep supplier proposal price for supplier order	2018-05-29 11:21:30 +02:00
Laurent Destailleur	51b5f63ce8	Merge pull request #8880 from wdammak/patch-14 Add movement generateDocument function (mode dev)	2018-05-29 11:15:00 +02:00
Laurent Destailleur	2ae9591d0d	Fix english name	2018-05-29 11:10:21 +02:00
Laurent Destailleur	8a6207efda	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-29 11:09:30 +02:00
Laurent Destailleur	99ccc50d91	Merge pull request #8876 from frederic34/patch-17 Delete config	2018-05-29 10:58:10 +02:00
Laurent Destailleur	0520c7efec	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-29 10:57:28 +02:00
Laurent Destailleur	4d60fb3468	Fix size of popup	2018-05-29 10:57:14 +02:00
Laurent Destailleur	aa159f7b76	Merge pull request #8875 from frederic34/patch-16 fix asset admin	2018-05-29 10:56:54 +02:00
Laurent Destailleur	cf5f7bf06d	Update price.php	2018-05-29 10:52:55 +02:00
Laurent Destailleur	f473607249	Merge branch 'develop' into patch-15	2018-05-29 10:49:28 +02:00
Laurent Destailleur	1e5276f420	Merge pull request #8871 from el00ruobuob/patch-1 Update main.inc.php with charset	2018-05-29 10:48:54 +02:00
Laurent Destailleur	4b58158588	Update 7.0.0-8.0.0.sql	2018-05-29 10:47:14 +02:00
Laurent Destailleur	18898558e4	Merge branch 'develop' into patch-13	2018-05-29 10:46:28 +02:00
Laurent Destailleur	bf480b27f0	Merge pull request #8865 from frederic34/patch-11 Update admin.php for variant	2018-05-29 10:44:56 +02:00
Laurent Destailleur	b3cfed3d04	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-29 10:22:04 +02:00
Laurent Destailleur	01c8b33483	FIX 8870	2018-05-29 10:18:45 +02:00
Laurent Destailleur	7b824e3c48	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-29 10:13:48 +02:00
Laurent Destailleur	7eea70ebc8	FIX #8858 #8860 Backport better compatibility fix	2018-05-29 10:13:34 +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
Laurent Destailleur	b9682660d6	Merge pull request #8834 from Oeris/develop NEW : adds billing contacts ids to REST API returns	2018-05-29 10:01:42 +02:00
Laurent Destailleur	0f50b0ffb1	Code comment	2018-05-29 10:00:08 +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
wdammak	9ec6387a63	Add movement generateDocument function (mode dev)	2018-05-28 05:21:53 +01:00
Frédéric FRANCE	055508f343	remove one warning	2018-05-27 20:56:45 +02:00
Laurent Destailleur	5da89e1cad	Remove log	2018-05-27 19:33:46 +02:00
Laurent Destailleur	f3f252e88b	Fix duplicate record before creating primary key	2018-05-27 19:31:03 +02:00
Frédéric FRANCE	5c8f966898	Merge remote-tracking branch 'upstream/develop' into loadlangs	2018-05-27 18:41:17 +02:00
Laurent Destailleur	3f489ee3c6	Fix look and feel v7 for popup on ref of social contributions payments	2018-05-27 17:58:32 +02:00
Frédéric FRANCE	7eabc612e2	limit length of lines to 500 chars	2018-05-27 15:53:18 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
Frédéric FRANCE	a0055174c4	loadlangs	2018-05-27 09:58:23 +02:00
Frédéric FRANCE	84f2b31d46	loadlangs	2018-05-27 09:40:17 +02:00
Frédéric FRANCE	4d5c28b597	loadlangs	2018-05-27 09:27:09 +02:00
Frédéric FRANCE	ca9749eecc	Delete config	2018-05-27 00:32:41 +02:00
Frédéric FRANCE	753ba7ee17	Update assets_extrafields.php	2018-05-27 00:16:44 +02:00
Frédéric FRANCE	ec7516728d	Update assets_type_extrafields.php	2018-05-27 00:15:46 +02:00
Frédéric FRANCE	03bfb9a941	Update setup.php	2018-05-27 00:14:43 +02:00
Frédéric FRANCE	022d457284	loadlangs	2018-05-27 00:06:49 +02:00
Frédéric FRANCE	d986909109	loadlangs	2018-05-26 23:52:52 +02:00
Frédéric FRANCE	622c394283	loadlangs	2018-05-26 21:11:25 +02:00
Frédéric FRANCE	f5605bdd7d	loadlangs	2018-05-26 20:51:17 +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
Frédéric FRANCE	67e0abdd66	loadlangs	2018-05-26 18:52:14 +02:00
Frédéric FRANCE	f53f7bbf40	loadlangs	2018-05-26 18:41:16 +02:00
Frédéric FRANCE	58e5715ac3	loadlangs	2018-05-26 17:57:30 +02:00
Frédéric FRANCE	812b182680	loadlangs	2018-05-26 17:04:23 +02:00
Frédéric FRANCE	e87ff4d9b0	loadlangs	2018-05-26 16:24:54 +02:00
Frédéric FRANCE	9cd7bb3f58	loadlangs	2018-05-26 16:03:19 +02:00
Frédéric FRANCE	0a90f2d690	loadlangs	2018-05-26 15:50:03 +02:00
Frédéric FRANCE	cbed5c8349	loadlangs	2018-05-26 15:41:32 +02:00
Frédéric FRANCE	a487cf6806	Update price.php	2018-05-26 15:15:38 +02:00
el00ruobuob	667e4c30d6	Update main.inc.php charset missing, causing display issues.	2018-05-26 12:05:39 +02:00
Frédéric FRANCE	d67bed57d9	Update 7.0.0-8.0.0.sql	2018-05-26 11:26:20 +02:00
Frédéric FRANCE	af73e6cd4d	Update llx_paiementfourn.sql	2018-05-26 11:23:49 +02:00
Frédéric FRANCE	091fb81368	Update list.php	2018-05-26 09:49:13 +02:00
Frédéric FRANCE	455f809968	Update admin.php	2018-05-26 09:40:00 +02:00
Laurent Destailleur	894f16c5ee	Fix navifation	2018-05-25 18:11:24 +02:00
Laurent Destailleur	b44717e706	Fix navifation	2018-05-25 18:06:13 +02:00
Laurent Destailleur	c78b1f1154	Fix navigation into page containers	2018-05-25 17:59:58 +02:00
Laurent Destailleur	d41b395a6d	Fix edition of type of container	2018-05-25 17:52:24 +02:00
Laurent Destailleur	bfa9850211	NEW Add arrows to navigate into containers in website module	2018-05-25 17:47:03 +02:00
Laurent Destailleur	bf81b755f9	Fix state code for payment from indonesia	2018-05-25 16:21:13 +02:00
Laurent Destailleur	37dcfe4a46	FIX button to pay still visible when amount null used	2018-05-25 16:00:23 +02:00
Laurent Destailleur	4c9d3d9679	Code comment	2018-05-25 15:58:45 +02:00
Laurent Destailleur	4a58ae59ed	Fix missing drop of old constraint on old table	2018-05-25 15:54:59 +02:00
Laurent Destailleur	10281169e6	Empty page first	2018-05-25 15:43:08 +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	b246034670	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-25 14:57:43 +02:00
Laurent Destailleur	ba6193cff7	Add indonesia provinces	2018-05-25 14:57:30 +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	bcbe28d802	Code comment	2018-05-25 12:48:33 +02:00
Laurent Destailleur	fa252d5cbd	Merge branch 'develop' into FIX_6.0_pdf_note_incoterm	2018-05-25 11:59:22 +02:00
Laurent Destailleur	1a1f0fbc62	Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch FIX : Fetch shipping will now fetch project id	2018-05-25 11:46:06 +02:00
Laurent Destailleur	aa65b3f9ba	Merge pull request #8830 from wdammak/patch-8 Add liste_modeles to warehouse module	2018-05-25 11:43:48 +02:00
Laurent Destailleur	9d407cdc03	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-25 11:27:04 +02:00
Laurent Destailleur	0e6aa3def3	Fix duplicate deprecated file	2018-05-25 11:26:50 +02:00
Laurent Destailleur	3d71ce8297	Update html.formfile.class.php	2018-05-25 11:19:38 +02:00
Laurent Destailleur	520ce99e56	Merge pull request #8828 from bgenere/develop FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php	2018-05-25 11:17:45 +02:00
Laurent Destailleur	a3bea8d298	Update commonobject.class.php	2018-05-25 11:17:01 +02:00
Laurent Destailleur	131ddd6984	Merge pull request #8827 from ATM-Marc/FIX_shipment_fk_project FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods	2018-05-25 11:12:39 +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	cbe54e596b	Merge pull request #8817 from wdammak/patch-5 Add generateDocument function to entrepot class	2018-05-25 11:08:43 +02:00
Laurent Destailleur	c36187b46b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-25 11:08:19 +02:00
Laurent Destailleur	3d97fa36d1	CSS	2018-05-25 11:08:05 +02:00
Laurent Destailleur	22b1f2574e	Merge pull request #8851 from atm-florian/develop fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined	2018-05-25 11:07:18 +02:00
Laurent Destailleur	ac0570f6b2	Update translate.class.php	2018-05-25 11:07:11 +02:00
Laurent Destailleur	001b94698a	Merge pull request #8832 from dtix/develop NEW Add romanian chart of accounts	2018-05-25 11:05:59 +02:00
Laurent Destailleur	b25c7e44d3	Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice FIX : test is_erasable() must be done before call function delete()	2018-05-25 11:05:20 +02:00
Laurent Destailleur	0a581e48d4	Update card.php	2018-05-25 11:04:04 +02:00
Laurent Destailleur	8303dc1e6f	Merge pull request #8815 from atm-florian/develop_fixproject NEW: add filter on project task list	2018-05-25 10:56:10 +02:00
Laurent Destailleur	034752dc0b	Update tasks.php	2018-05-25 10:54:17 +02:00
Laurent Destailleur	e7cfad0e60	Update tasks.php	2018-05-25 10:52:24 +02:00
Laurent Destailleur	c56ef86bc3	Update project.lib.php	2018-05-25 10:50:16 +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
Laurent Destailleur	fbcaf8872b	Merge pull request #8808 from atm-john/Add_table_thead_and_tbody Add table thead and tbody for object lines	2018-05-25 10:42:26 +02:00
Laurent Destailleur	04586fab66	Merge pull request #8824 from ggg44473/7.0 Fix sql error accounting account	2018-05-25 10:41:16 +02:00
Laurent Destailleur	02803f9284	Merge pull request #8821 from aspangaro/8.0-b26 Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems	2018-05-25 10:36:46 +02:00
Laurent Destailleur	205732e240	Merge pull request #8822 from aspangaro/8.0-b27 Salaries : Move to LoadLangs	2018-05-25 10:34:36 +02:00
Laurent Destailleur	f416f9629e	Merge pull request #8840 from all3kcis/patch-9 Add oldcopy on productlot::update()	2018-05-25 10:22:18 +02:00
Laurent Destailleur	5d5638d906	Merge pull request #8848 from frederic34/typo typo	2018-05-25 10:14:41 +02:00
Laurent Destailleur	923fcfb36e	Merge pull request #8854 from glu000/develop FIX: It's not possible to remove a contact which is assigned to an event #8852	2018-05-25 10:14:05 +02:00
Laurent Destailleur	76b34a5a60	Merge pull request #8857 from aspangaro/8.0-b28 FIX : Replace feature level 2 by a constant on accountancy journal	2018-05-25 10:13:20 +02:00
Laurent Destailleur	b9fbf13eba	Fix look and feel v8	2018-05-25 09:36:49 +02:00
Laurent Destailleur	9f2f8ca7e0	Fix scrutinizer	2018-05-25 09:31:16 +02:00
Alexandre SPANGARO	46a251a2b3	FIX : Replace feature level 2 by a constant on accountancy journal	2018-05-24 21:13:48 +02:00
Alexandre SPANGARO	d1e1d64b42	Add some information in bank_journal	2018-05-24 20:26:38 +02:00
Alexandre SPANGARO	7d2d818679	Fix link	2018-05-24 20:25:06 +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	23e2bb20d9	Look and feel v8	2018-05-24 12:32:04 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
Frédéric FRANCE	0623ff7667	fix logic	2018-05-24 11:56:19 +02:00
Laurent Destailleur	de447d88d7	Fix translation	2018-05-24 11:51:32 +02:00
florian HENRY	436a1001b3	fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined	2018-05-24 10:56:01 +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
Laurent Destailleur	3f24f5ef78	Fix css	2018-05-23 18:19:59 +02:00
Laurent Destailleur	488c0c030e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modProduct.class.php	2018-05-23 18:09:25 +02:00
Laurent Destailleur	4967c678b8	Fix translation	2018-05-23 18:05:19 +02:00
Laurent Destailleur	3a06918b16	FIX Missing extrafields in export of stock or products	2018-05-23 18:00:27 +02:00
Laurent Destailleur	d1d8494666	FIX Missing extrafields in export	2018-05-23 17:48:18 +02:00
Frédéric FRANCE	1b69c2357f	typo	2018-05-23 17:16:58 +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
Marc de Lima Lucio	111f3a9649	FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts	2018-05-23 11:11:33 +02:00
All3kcis	4bfd8b5539	Add oldcopy on productlot::update()	2018-05-23 10:38:24 +02:00
ATM-Nicolas	734ecbc9b5	FIX : Fetch shipping will now fetch project id	2018-05-23 09:47:29 +02:00
Laurent Destailleur	f58e0d3bcf	Fix scrutinizer errors	2018-05-23 08:24:20 +02:00
Laurent Destailleur	a1c799507a	Fix $contactobject not always defined	2018-05-23 08:16:24 +02:00
Laurent Destailleur	d072c2eb5d	Fix turnover invoiced by vat rate and country. Use fiscal month start.	2018-05-22 23:09:27 +02:00
Laurent Destailleur	354198b31e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/societe/contact.php	2018-05-22 20:26:09 +02:00
Laurent Destailleur	f074daae48	Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT	2018-05-22 20:17:31 +02:00
Laurent Destailleur	2a579b707a	FIX javascript showempty error FIX Contact tab not visible when using canvas	2018-05-22 19:43:28 +02:00
Laurent Destailleur	be21405d21	Fix missing error message	2018-05-22 19:24:56 +02:00
ATM-Nicolas	a455f60c42	FIX : Add calls to fetchComments function	2018-05-22 16:07:32 +02:00
ATM-Nicolas	d875553648	FIX : Remove fetchComments from project and task fetch function	2018-05-22 16:03:03 +02:00
ATM-Nicolas	f46d514586	Merge branch '7.0' of github.com:Dolibarr/dolibarr into fix_comments_on_tasks	2018-05-22 15:12:24 +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
dtix	cca1d26943	Romanian chart of account added	2018-05-22 11:23:59 +03:00
dtix	63e056064e	Create llx_accounting_account_ro.sql	2018-05-22 11:22:04 +03:00

... 14 15 16 17 18 ...

60032 Commits