dolibarr

mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00

Author	SHA1	Message	Date
ldestailleur	dbbfdd984a	Fix emailcollector can't be used without syntax rules	2019-01-03 11:47:27 +01:00
Laurent Destailleur	8c1d362e8d	Merge pull request #10286 from ptibogxiv/patch-103 New Use ajax switch into on socialnetworks.php	2019-01-02 20:00:44 +01:00
Laurent Destailleur	d613041703	Merge pull request #10282 from ptibogxiv/patch-99 NEW: Use ajax swith button on setup of multi-currency module	2019-01-02 19:58:20 +01:00
Laurent Destailleur	422e18ee8e	Merge pull request #10268 from hregis/develop_upgrade FIX remove old unused and deprecated function "getStaticMember"	2019-01-02 19:37:49 +01:00
ptibogxiv	511579a24b	FIX: Ajax on socialnetworks.php	2018-12-30 19:48:04 +01:00
ptibogxiv	82d597ade2	FIX: ajax on stock.php	2018-12-30 19:07:21 +01:00
ptibogxiv	b9baaafe19	Update multicurrency.php	2018-12-30 17:15:11 +01:00
ptibogxiv	8adecf0689	Update multicurrency.php	2018-12-30 17:09:38 +01:00
ptibogxiv	dec4e1f6a6	New option use currency on document + toggle - change with toogle - new option use currency on document for online payment	2018-12-30 16:49:54 +01:00
Laurent Destailleur	5c516fdae2	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2018-12-26 19:43:01 +01:00
Regis Houssin	1a15698f96	FIX replace deprecated "print_titre" with "load_fiche_titre" Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2018-12-25 08:36:42 +01:00
Regis Houssin	8f4c452075	FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2018-12-25 08:34:26 +01:00
Laurent Destailleur	7b61fc8fd1	Fix setup of dav module	2018-12-23 14:03:19 +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	27f8096afa	Merge branch 'develop' into PR_NEW_reception	2018-12-15 12:50:31 +01:00
Laurent Destailleur	59bc15377d	CSS	2018-12-14 18:58:55 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	b0941967f0	Fix sort of email templates	2018-12-13 12:13:28 +01:00
Laurent Destailleur	4882615c8a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-12 11:53:06 +01:00
Laurent Destailleur	13f5476678	Responsive	2018-12-12 11:50:10 +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	3213b3be07	Standardize code: Move jabberid into social network module	2018-12-11 09:17:02 +01:00
Laurent Destailleur	bdb4295379	Fix menu editor	2018-12-10 18:24:05 +01:00
Laurent Destailleur	b35a9c0e64	FIX Edition of menu fails (mainmenu required for top menu)	2018-12-10 17:50:58 +01:00
Laurent Destailleur	f755457236	Test imap available	2018-12-07 14:54:25 +01:00
Laurent Destailleur	cf00519e90	Test imap available	2018-12-06 21:40:51 +01:00
Laurent Destailleur	1d9c0f6b77	Fix look and feel	2018-12-04 13:26:19 +01:00
Laurent Destailleur	d9bb39970f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/barcode.php	2018-12-04 13:20:40 +01:00
Laurent Destailleur	5061a9b0c2	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/install/mysql/tables/llx_paiementfourn.sql	2018-12-04 13:17:25 +01:00
Laurent Destailleur	275eeca135	Trans	2018-12-04 13:09:58 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Philippe GRAND	8ec2bac36a	FIX #3234	2018-12-02 10:02:05 +01:00
Frédéric FRANCE	d2d623b0b6	GETPOSTISSET has only one param	2018-12-02 09:26:24 +01:00
Philippe GRAND	3800fde225	fix typo error	2018-11-26 14:29:25 +01:00
Laurent Destailleur	1d4c756783	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-22 11:44:37 +01:00
Laurent Destailleur	b6dac7da20	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-21 15:40:15 +01:00
Laurent Destailleur	93929a652b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-21 15:35:15 +01:00
Laurent Destailleur	084516b885	Fix ip detection of geoip	2018-11-21 15:11:57 +01:00
Laurent Destailleur	0ea6f2778b	Fix examples	2018-11-20 22:01:38 +01:00
Laurent Destailleur	c891f6ed10	Disable javascript feature with no javascript	2018-11-20 21:26:22 +01:00
Laurent Destailleur	f455e32bef	FIX Some modules templates were visible when it should not	2018-11-20 16:22:16 +01:00
Laurent Destailleur	4b82538941	Better module position	2018-11-20 14:56:14 +01:00
Laurent Destailleur	1e1ccd4c88	Fix pagination in action/event list	2018-11-19 14:25:34 +01:00
Regis Houssin	7cba680f38	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-18 17:07:03 +01:00
Laurent Destailleur	7f33403d43	Fix translation	2018-11-17 22:55:13 +01:00
Laurent Destailleur	028be21070	Debug	2018-11-16 16:55:53 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Laurent Destailleur	6d640ab83c	Fix feature to drag and drop rows of table (not generic)	2018-11-15 19:58:06 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Laurent Destailleur	c04fcf170b	Work on emailcollector	2018-11-15 16:23:07 +01:00
Laurent Destailleur	e94b545cb6	Fix field not required	2018-11-14 18:38:09 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Laurent Destailleur	01e7b5747d	FIX user param is null not 0 when not defined FIX properties email_xx were not set	2018-11-12 15:27:59 +01:00
Regis Houssin	ce317e6110	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_project Conflicts: htdocs/admin/limits.php	2018-11-12 08:37:21 +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	0b57faa7b4	Fix help	2018-11-11 14:42:11 +01:00
Laurent Destailleur	de259e9db6	Code comment	2018-11-11 14:36:35 +01:00
Regis Houssin	854bb99cc0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_project	2018-11-11 08:52:20 +01:00
Laurent Destailleur	e86e3ec7ac	Work on email collector	2018-11-09 19:30:44 +01:00
Laurent Destailleur	f1287578f3	Work on emailcollector	2018-11-09 18:18:17 +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	773e2da4cc	Fix example of number for holiday	2018-11-09 11:41:27 +01:00
Laurent Destailleur	193b153fbf	Work on email collector	2018-11-07 18:02:08 +01:00
Laurent Destailleur	6ba78b2bb3	Work on email collector	2018-11-07 16:33:06 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	c4db549f94	Work on emailcollector	2018-11-06 19:49:52 +01:00
Laurent Destailleur	a976dd74db	Fix Report error if file size too large	2018-11-06 18:44:51 +01:00
Laurent Destailleur	e0070bd348	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php	2018-11-06 18:30:57 +01:00
Laurent Destailleur	7e33af6677	Fix max size	2018-11-06 17:40:59 +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	dd70f1bf08	Debug emailcollector	2018-11-05 16:59:40 +01:00
Laurent Destailleur	eb9defcf1d	Debug emailcollector	2018-11-05 16:42:29 +01:00
Laurent Destailleur	0c7f33e1ba	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-05 09:58:19 +01:00
Laurent Destailleur	2900947019	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 09:56:57 +01:00
Maxime Kohlhaas	d1133916e0	Fix tracking field in dictionnary should not be mandatory	2018-11-01 15:33:14 +01:00
Laurent Destailleur	970f501147	Debug modulebuilder	2018-10-31 20:10:20 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Regis Houssin	6e77067638	FIX better check	2018-10-30 17:59:14 +01:00
Regis Houssin	26b00dc5ca	NEW possibility to defined rounding rules by currency	2018-10-30 17:40:05 +01:00
Laurent Destailleur	d309f22e55	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 13:54:25 +01:00
Laurent Destailleur	d4fd55c4cf	FIX #9907	2018-10-30 13:54:11 +01:00
Laurent Destailleur	4611b96da8	Fix phpcs	2018-10-28 20:18:09 +01:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	35ab3c9aad	Update holiday.php	2018-10-26 18:24:04 +02:00
Laurent Destailleur	0e464ea4f5	Merge pull request #9866 from frederic34/emptylines Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-26 15:31:24 +02:00
Laurent Destailleur	8b601bd7fd	Fix numbering of holidays	2018-10-25 18:50:53 +02:00
Laurent Destailleur	1ba716b82c	Fix do not allow use of second or third tax without using 1st one.	2018-10-25 14:39:54 +02:00
Laurent Destailleur	25a374bd9a	NEW Notification module support expense report+holiday validation and approval event.	2018-10-25 12:45:13 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
atm-quentin	04eb9ca167	fix dont change num version	2018-10-23 17:06:21 +02:00
atm-quentin	96d0bb8f2e	FIX adapt develop	2018-10-23 14:31:58 +02:00
atm-quentin	8442b405b2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception	2018-10-23 10:27:46 +02:00
Laurent Destailleur	550a66d338	Merge pull request #9772 from ptibogxiv/patch-76 NEW move ticket dictionary in API /setup	2018-10-16 21:39:30 +02:00
Laurent Destailleur	97429aeb7a	Merge pull request #9721 from grandoc/new_branch_10_10_2018 Standardize and update code	2018-10-16 19:30:19 +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
Philippe GRAND	729ff0b9bb	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-16 14:20:11 +02:00
Maxime Kohlhaas	c66823d72f	Fix numbering of supplier credit notes (issue #9624 )	2018-10-14 17:07:38 +02:00
Laurent Destailleur	abf8867061	Merge pull request #8207 from atm-john/New_invoice_default_documents NEW hidden option to define an invoice template for each invoice type	2018-10-14 16:36:37 +02:00
Philippe GRAND	9551cb12f5	Standardize and update code	2018-10-13 09:59:33 +02:00
atm-quentin	4b23b46e48	NEW workflow set reception billed on validate supplier bill	2018-10-11 14:49:19 +02:00
jfefe	8fc4e2066f	FIX : position 0 for emails templates Closes #9548 #8737 #9478	2018-10-10 18:18:02 +02:00
atm-greg	2d395b23c4	fix for travis	2018-10-10 14:35:25 +02:00
atm-greg	6eeb860514	delete useless code	2018-10-10 14:09:38 +02:00
atm-greg	24988f075c	Add archive generation for documents directory	2018-10-10 14:01:20 +02:00
atm-quentin	489ccc3c49	NEW list and fix conf	2018-10-10 12:19:57 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Laurent Destailleur	df7f218d01	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-07 21:47:32 +02:00
Laurent Destailleur	d4b6429ccd	Fix regression into backup feature	2018-10-07 21:45:20 +02:00
Laurent Destailleur	b61f3b4313	Look and feel v8	2018-10-07 17:31:35 +02:00
Philippe GRAND	5583211246	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-06 12:00:24 +02:00
Laurent Destailleur	e24117e75b	Fix position of modules is string on 2 digits	2018-10-06 11:57:53 +02:00
Philippe GRAND	c7c3780400	clean code	2018-10-05 15:34:32 +02:00
Laurent Destailleur	31916c94f0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-04 17:57:20 +02:00
Laurent Destailleur	b3b2305651	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/pdf.lib.php	2018-10-04 17:56:56 +02:00
Laurent Destailleur	16aef0e9fc	Merge pull request #9651 from frederic34/patch-9 fix td filecheck	2018-10-04 17:09:46 +02:00
Laurent Destailleur	111d589474	NEW Can mix offset before and after with rules for due date of invoices	2018-10-04 16:06:26 +02:00
Laurent Destailleur	75c968b4ae	FIX Backup of database without mysqladmin available from cron.	2018-10-04 13:10:48 +02:00
atm-quentin	00f532c436	validation modèle de données	2018-10-04 09:50:39 +02:00
Laurent Destailleur	fd859d3162	Add a component to select lang into a web site	2018-10-03 18:40:54 +02:00
atm-quentin	52717dbb65	NEW debut rename stock conf	2018-10-03 18:05:22 +02:00
atm-quentin	41d8cb87a3	debut reception setup page	2018-10-03 12:22:41 +02:00
John BOTELLA	af66a8971a	NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT	2018-10-02 15:51:17 +02:00
Frédéric FRANCE	96139d88a4	fix td filecheck	2018-10-01 13:45:17 +02:00
Alexandre SPANGARO	14627abb27	FIX Title problem on admin RSS module	2018-10-01 01:14:43 +02:00
Alexandre SPANGARO	825f774b53	FIX Title problem on admin RSS module	2018-09-29 15:28:03 +02:00
Laurent Destailleur	851fd4cc18	NEW Can set the default focus of each page. NEW Can set if a field is mandatory on form level.	2018-09-28 00:52:15 +02:00
Laurent Destailleur	a623d80830	Work on mandatory form fields	2018-09-27 16:38:18 +02:00
Laurent Destailleur	62b31df069	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/rssparser.class.php htdocs/langs/en_US/boxes.lang	2018-09-27 12:55:25 +02:00
Laurent Destailleur	96c1814793	FIX XSS vulnerability reported by Mary Princy E	2018-09-27 11:33:28 +02:00
Laurent Destailleur	df64961c6b	FIX nb of session in title	2018-09-24 21:56:57 +02:00
Laurent Destailleur	8aa22f2c33	NEW Add option to swap sender/recipient address on PDF	2018-09-23 14:57:44 +02:00
Laurent Destailleur	a078951a94	Add an help for user to avoid bad configuration	2018-09-21 11:12:08 +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	b421c29ea7	FIX #9510	2018-09-20 19:20:15 +02:00
Laurent Destailleur	d35687c8b3	Work on module social network	2018-09-19 01:45:56 +02:00
Laurent Destailleur	99d214abd5	Fix family of module Payment of employee salaries	2018-09-18 16:38:51 +02:00
Laurent Destailleur	e2e3354807	Clean code	2018-09-18 16:35:38 +02:00
Laurent Destailleur	1a1219ee2a	Trans	2018-09-18 14:52:50 +02:00
Laurent Destailleur	e07ce644e8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/admin.lib.php htdocs/langs/en_US/admin.lang	2018-09-18 11:49:35 +02:00
Laurent Destailleur	98f26bfcfb	NEW Can set 2 url in url field of thirdparty	2018-09-17 14:31:30 +02:00
Laurent Destailleur	f3ce7cb5a5	Quick hack to provide help to fix pb of undesirable files	2018-09-17 10:40:42 +02:00
Laurent Destailleur	75f3dd94c6	Merge pull request #9506 from frederic34/printing printing remove no camelcaps function	2018-09-15 17:29:21 +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	5862a5e2ee	printing remove no camelcaps function	2018-09-13 11:13:32 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Laurent Destailleur	963d5eeddf	Merge pull request #9387 from frederic34/camelCaps2 start changing phpcs:ignore	2018-09-12 21:14:34 +02:00
Laurent Destailleur	9d9e2bc3e3	Merge pull request #9405 from fmarcet/develop NEW: Highlight lines on lists when they are checked	2018-09-12 20:50:42 +02:00
Frédéric FRANCE	ce76a2e714	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 20:21:35 +02:00
Laurent Destailleur	7d726f9734	Merge pull request #9457 from frederic34/selectbarcodetype Selectbarcodetype	2018-09-12 19:02: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	3bf296c9cf	Merge pull request #9448 from frederic34/loadfichetitre remove deprecated	2018-09-12 18:23:24 +02:00
Laurent Destailleur	da37302dc2	Merge pull request #9437 from grandoc/new_branch_08_09_2018 New branch 08 09 2018	2018-09-12 17:29:33 +02:00
Frédéric FRANCE	312a606345	deprecate formbarcode:select_barcode_type	2018-09-10 23:50:48 +02:00
Frédéric FRANCE	0e0db9d1ee	remove deprecated	2018-09-09 15:52:55 +02:00
Frédéric FRANCE	7e0b1055db	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-09 13:36:53 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Laurent Destailleur	700e3b9748	Standardize code for modulepart=mycompany like others modulepart.	2018-09-09 12:53:30 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	863886a621	Update salaries.php	2018-09-08 23:19:56 +02:00
Philippe GRAND	a6b25093e7	Standardize and update code	2018-09-08 12:57:11 +02:00
Philippe GRAND	c65505fdca	Standardize clean and update code	2018-09-08 12:24:10 +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	572eb35167	Standardize and update code	2018-09-08 10:30:10 +02:00
Philippe GRAND	035b2be2eb	Standardize and update call to langs	2018-09-07 14:58:22 +02:00
Frédéric FRANCE	ab4ae0f7bb	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-06 21:28:30 +02:00
Laurent Destailleur	c5695db3e4	NEW Can disable meteo on smartphone only	2018-09-06 11:09:51 +02:00
Ferran Marcet	b658626e21	NEW: Highlight lines on lists when they are checked	2018-09-04 11:54:13 +02:00
Frédéric FRANCE	e13a8ec572	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-02 18:19:45 +02:00
Laurent Destailleur	887a40cf1d	Remove TODO	2018-09-02 16:46:01 +02:00
Frédéric FRANCE	2a5c994009	move phpcs:ignore	2018-09-02 14:01:37 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Laurent Destailleur	bcee0ef0ae	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/dispatch.php htdocs/societe/class/societe.class.php htdocs/stripe/config.php	2018-09-01 14:16:57 +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
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing function Comment Missing	2018-09-01 12:59:32 +02:00
Frédéric FRANCE	945eede4a5	doxygen fixs	2018-08-31 23:12:55 +02:00
Frédéric FRANCE	ebcf43ec73	function Comment Missing	2018-08-31 21:39:23 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	6ca9854a34	Fix to avoid fetch when no accounting account defined	2018-08-29 21:07:00 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Frédéric FRANCE	d8bf4a0ecf	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-25 09:07:04 +02:00
Laurent Destailleur	7a35b560a6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-23 19:51:52 +02:00
Laurent Destailleur	de2cdfc70f	FIX Language selection lost if error during creation of email template	2018-08-22 13:23:46 +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	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	1b1258b2ef	Fix url in tooltip	2018-08-16 11:19:22 +02:00
Laurent Destailleur	71c1d2275b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-16 11:18:18 +02:00
Laurent Destailleur	bbd19010d0	Fix url in tooltip	2018-08-16 11:18:03 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	5146ab9177	trim	2018-08-14 15:34:44 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Frédéric FRANCE	1b27cca91c	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-13 08:53:07 +02:00
Laurent Destailleur	6a8ed56c3d	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-13 01:23:43 +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
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
John BOTELLA	d6d8f98f38	add retained warranty cond field and add forms	2018-08-10 15:06:00 +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
John BOTELLA	06be98c638	add date field	2018-08-08 17:36:39 +02:00
Laurent Destailleur	d79778a67e	Fix reponsive	2018-08-08 17:00:16 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
John BOTELLA	3036c94198	Add new situation retained warranty field	2018-08-07 15:18:42 +02:00
Philippe GRAND	42fe2b78de	clean and update code	2018-08-07 10:44:26 +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
Philippe GRAND	892174cbf8	standardize	2018-07-29 10:29:12 +02:00
Philippe GRAND	36ea20b7d4	standardize	2018-07-28 18:03:14 +02:00
Philippe GRAND	9cc40fcb21	standardize	2018-07-28 17:26:56 +02:00
Philippe GRAND	f17275845d	standardize	2018-07-28 14:29:28 +02:00
Frédéric FRANCE	8312d95174	trim trailing	2018-07-26 18:22:16 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +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
Regis Houssin	20a1ffe810	FIX field is autoincrement but not "rowid"	2018-07-24 12:15:54 +02:00
Laurent Destailleur	ccd7332647	Fix default value of joinfile when creating a new email template	2018-07-24 01:46:14 +02:00
Philippe GRAND	3297554102	clean and update code	2018-07-23 17:45:38 +02:00
Laurent Destailleur	e9fccec055	Fix website deletion	2018-07-22 16:56:11 +02:00
Laurent Destailleur	41605ed4a7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2018-07-16 11:29:47 +02:00
Laurent Destailleur	35ed89a517	Fix scrutinizer	2018-07-16 10:11:52 +02:00
Laurent Destailleur	1e775ffa6e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-13 09:12:01 +02:00
Laurent Destailleur	c27dd8d301	Fix phpcs	2018-07-13 09:11:46 +02:00
Laurent Destailleur	e4be3ab954	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-13 09:09:51 +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	f3de1af601	Finish webdav experimental module	2018-07-10 14:56:04 +02:00
Laurent Destailleur	5f52dfa873	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-10 14:02:40 +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	8184eff66c	Fix for #9079	2018-07-09 15:25:14 +02:00
Laurent Destailleur	45d1a14c8e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 16:10:37 +02:00
Laurent Destailleur	05ed721a8c	Fix name of constant for module TICKET	2018-07-06 13:09:07 +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	cfb41d4329	FIX: If module workflow disabled, we must disable autoclassification too	2018-07-03 11:43:50 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Laurent Destailleur	df96c5ca81	Merge pull request #8796 from defrance/patch-113 introduce serial and document for holiday module	2018-06-30 02:09:28 +02:00
Laurent Destailleur	f6774de773	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-30 02:00:46 +02:00
Laurent Destailleur	1ff8788ff7	Merge pull request #9016 from yolocodefrench/develop ajout de la gestion des comptes bancaires des tiers via l'api	2018-06-30 01:26:08 +02:00
Laurent Destailleur	e4388e63fa	Merge pull request #8891 from inoveaconseil/develop NEW: ADD url to see the last version of a external module	2018-06-30 01:17:10 +02:00
Laurent Destailleur	fba9caab5d	Merge pull request #8944 from bafbes/abb7008 New: Option to see line numbers in modules page	2018-06-29 20:05:19 +02:00
Laurent Destailleur	75e9f1bf9a	Update modules.php	2018-06-29 20:05:12 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	19eaa3df66	ajout de la modification dans la base de données	2018-06-27 11:29:46 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	a94eeaa500	adding the possibility to personnalize ent_to_end and ustrd of a bank levy	2018-06-27 10:53:45 +02:00
Regis Houssin	48ad03c56d	Fix: remove unused and blocking field	2018-06-27 09:33:21 +02:00
Laurent Destailleur	9f1cfbdb72	For better compatibility	2018-06-25 12:25:43 +02:00
Regis Houssin	a6729b0bd1	Fix: change field name and remove obsolete data	2018-06-25 09:10:24 +02:00
Laurent Destailleur	2520ebcfae	Fix line	2018-06-24 18:56:49 +02:00
Philippe GRAND	41a0175827	clean and upsdate code	2018-06-18 14:17:43 +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	03b6bec8b8	Fix email template for test	2018-06-13 17:03:46 +02:00
Abbes Bahfir	74d92dd91f	New: Optiopn to see line numbers in modules page	2018-06-11 23:10:40 +01: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	f28a6e59c8	Look and feel v8	2018-06-05 16:30:16 +02:00
Laurent Destailleur	7cb66e8e0c	Fix reset of filters	2018-06-05 10:04:57 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
Inovea Conseil	0f9fa09d3f	Fix after the comment	2018-05-31 09:13:18 +02:00
Mavyre	e59a91bdae	Stopped using AJAX for the synchro	2018-05-30 21:12:28 +02:00
Inovea Conseil	e0c1e33012	NEW: ADD url to see the last version of a external module	2018-05-30 00:20:31 +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
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	de84f0e687	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/actions_massactions.inc.php htdocs/filefunc.inc.php	2018-05-21 23:35:09 +02:00
Laurent Destailleur	afa57fd66d	Fix syntax error	2018-05-21 23:33:20 +02:00
Laurent Destailleur	69141c9493	Fix PSR True->true and GETPOST file name for local checksum check	2018-05-21 22:24:27 +02:00
Laurent Destailleur	c141c3ecfd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-21 19:35:26 +02:00
Laurent Destailleur	05c2f206ff	Fix missing lang	2018-05-21 19:35:12 +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	f211cfaf0c	Merge pull request #8777 from grandoc/new_branch_11_05_2018 clean and update code	2018-05-18 12:20:22 +02:00
John	05bb98f4c0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-05-16 11:49:37 +02:00
Laurent Destailleur	d52305cef8	NEW Add entry for the GDPR contact	2018-05-15 11:50:42 +02:00
Laurent Destailleur	94ccb44673	Fix bad url wor external subscription page	2018-05-12 11:02:44 +02:00
Philippe GRAND	edbe32ea0c	clean and update code	2018-05-11 22:31:17 +02:00
Philippe GRAND	e5d8dec2f9	clean and update code	2018-05-11 12:18:45 +02:00
BENKE Charlene	e3963c3518	Create holiday.php	2018-05-07 22:48:43 +02:00
Laurent Destailleur	95bd249ec6	Merge pull request #8740 from grandoc/new_branch_04_05_2018 Clean and update code	2018-05-05 13:49:54 +02:00
Laurent Destailleur	e9008e9461	Merge pull request #8734 from grandoc/new_branch_03_05_2018 clean and update code	2018-05-05 13:28:47 +02:00
Laurent Destailleur	634e58b7c9	Look and feel v8	2018-05-04 18:24:00 +02:00
Philippe GRAND	b5f222f45a	Clean and update code	2018-05-04 14:14:04 +02:00
Philippe GRAND	f3a70a40d7	clean and update code	2018-05-03 21:27:52 +02:00
Laurent Destailleur	24518803fc	Clean code	2018-05-02 19:15:16 +02:00
Laurent Destailleur	dfe6e4bfc1	Doxygen	2018-05-02 19:08:59 +02:00
Laurent Destailleur	2f2d17926d	Sort list	2018-05-01 20:52:25 +02:00
Laurent Destailleur	c3b5664fb5	Fix sort order of email templates	2018-05-01 16:24:40 +02:00
Laurent Destailleur	55f982e504	Removed deprecated FPDI option and reorganise PDF setup page	2018-04-30 09:28:24 +02:00
Laurent Destailleur	e168240ab0	Debug module DAV	2018-04-29 18:32:15 +02:00
Laurent Destailleur	c376cc5779	Merge pull request #8686 from grandoc/new_branch_26_04_2018 clean code	2018-04-27 11:39:32 +02:00
Laurent Destailleur	cee4df9b27	Merge pull request #8667 from grandoc/new_branch_23_04_2018 clean code	2018-04-27 09:46:55 +02:00
Laurent Destailleur	69db960a92	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/activity/perweek.php	2018-04-26 18:33:02 +02:00
Philippe GRAND	966419254d	clean code	2018-04-26 15:44:15 +02:00
Philippe GRAND	502c837e04	Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018	2018-04-26 15:36:15 +02:00
Laurent Destailleur	83b762b681	FIX CVE-2018-9019	2018-04-25 16:01:06 +02:00
Laurent Destailleur	ae412f228d	NEW Experimental DAV module provides a public and private directory	2018-04-25 12:22:02 +02:00
Philippe GRAND	458dc42692	clean and update code	2018-04-25 11:50:58 +02:00
Philippe GRAND	c22ef109ac	clean and add new code	2018-04-24 17:42:13 +02:00
Philippe GRAND	bf1e5bc618	Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018	2018-04-24 17:31: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
Philippe GRAND	9e9d52a662	clean and update code	2018-04-23 16:23:30 +02:00
Philippe GRAND	bcf5c5d78a	clean code	2018-04-23 16:04:52 +02:00
Laurent Destailleur	32511422ab	Fix PSR2	2018-04-22 20:08:29 +02:00
Laurent Destailleur	ac89951acd	Merge pull request #8647 from fmarcet/develop New: Add same parameters on 'printFieldListTitle' hooks	2018-04-22 19:35:09 +02:00
Laurent Destailleur	68a0b45141	Merge pull request #8648 from grandoc/new_branch_20_04_2018 clean and update code	2018-04-22 19:31:46 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	769a1f507b	Debug asset module	2018-04-22 11:26:59 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Philippe GRAND	410d1ee07d	Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018	2018-04-21 12:05:50 +02:00
Laurent Destailleur	cef9782179	Clean defined constant at begin of pages	2018-04-21 12:00:55 +02:00
Philippe GRAND	53efccd98e	Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018	2018-04-20 16:46:53 +02:00
Laurent Destailleur	38d200d8a6	Fix left menu	2018-04-20 13:23:34 +02:00
Philippe GRAND	1ebdcae538	clean and update code	2018-04-20 11:30:40 +02:00
Philippe GRAND	33505411a7	clean and update code	2018-04-20 11:17:45 +02:00
Ferran Marcet	6ced1a3264	New: Add same parameters on 'printFieldListTitle' hooks	2018-04-20 10:38:16 +02:00
Laurent Destailleur	788fd62205	Merge pull request #8636 from hregis/develop_pgsql Fix: avoid Warning: A non-numeric value encountered + wrong var name	2018-04-20 01:20:19 +02:00
Laurent Destailleur	16e27a445b	Sort type of email template combo list	2018-04-19 20:42:03 +02:00
Laurent Destailleur	17dd96ef31	Fix filter on email template	2018-04-19 20:17:54 +02:00
Laurent Destailleur	1389ce9e48	FIX Template of modules not enabled must not be visible	2018-04-19 20:12:43 +02:00
Laurent Destailleur	8acc752195	Debug ticket module	2018-04-19 14:44:21 +02:00
Laurent Destailleur	8aab183567	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-19 14:00:18 +02:00
Laurent Destailleur	6b3e5e2085	FIX sanitize setup params	2018-04-18 12:19:23 +02:00
Laurent Destailleur	5d121b2d3a	FIX CVE-2018-10092	2018-04-18 11:58:36 +02:00
Regis Houssin	eaecf7190a	Fix: avoid Warning: A non-numeric value encountered + wrong var name	2018-04-18 08:34:48 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	72de21537c	Clean code	2018-04-15 20:09:09 +02:00
Laurent Destailleur	77b686500c	css	2018-04-14 21:07:20 +02:00
Laurent Destailleur	ecfabc6633	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/functions.lib.php	2018-04-13 23:18:39 +02:00
Laurent Destailleur	32ff8ae132	Fix link	2018-04-13 18:02:25 +02:00
Laurent Destailleur	ace55ba569	Debug usage of extrafields for ticket module	2018-04-12 23:17:46 +02:00
Laurent Destailleur	698f5c165a	Merge pull request #8430 from atm-florian/dev_mailtouser NEW : Can select from the user list into send form email (For field to and CC)	2018-04-11 17:55:40 +02:00
Laurent Destailleur	ea35a445a1	Merge branch 'develop' into 8.0-a15	2018-04-11 13:17:12 +02:00
John	24bf8cb162	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-04-09 16:21:37 +02:00
Laurent Destailleur	aa01afc0d5	Fix direct link on transifex using new search url	2018-04-09 13:57:09 +02:00
Laurent Destailleur	0475cb8018	FIX Permission for bookkeeper	2018-04-09 10:51:58 +02:00
Laurent Destailleur	6529043182	Clean code	2018-04-08 10:49:59 +02:00
Laurent Destailleur	98b9f6bb47	DAV module	2018-04-07 19:12:41 +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
Alexandre SPANGARO	741a14993a	NEW Add file number in accountant card and update export filename	2018-04-07 06:21:49 +02:00
Laurent Destailleur	1a321e19c8	FIX XSS in company setup page	2018-04-06 19:12:13 +02:00
Laurent Destailleur	b412f0b76b	Better interaction to setup email	2018-04-06 16:38:47 +02:00
Laurent Destailleur	85d4f7115b	Better position of the substitution tooltip for emails	2018-04-06 16:16:08 +02:00
Laurent Destailleur	6c409b2670	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-05 18:08:19 +02:00
Laurent Destailleur	b59d8a6473	Merge pull request #8501 from ATM-Consulting/develop_atm NEW: send mails from project card	2018-04-05 16:39:06 +02:00
Laurent Destailleur	ab27b105c0	Merge pull request #8490 from hregis/7.0_bug6 FIX limit access of email template page to internal users	2018-04-05 16:11:04 +02:00
Laurent Destailleur	eeb2d5a4da	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/cron/list.php	2018-04-05 13:24:36 +02:00
Laurent Destailleur	1b1a8f7e81	Fix trigger name	2018-04-05 13:21:00 +02:00
florian HENRY	cc0fb830b8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-04-05 10:53:17 +02:00
Laurent Destailleur	8595d7621b	Fix POST mut use method POST no GET	2018-04-02 23:30:23 +02:00
Laurent Destailleur	fba40575f7	Remove dead code	2018-04-02 16:39:48 +02:00
Regis Houssin	c720345e6d	Fix: better test	2018-04-01 11:47:10 +02:00
Regis Houssin	20e80a58a8	Fix: limit access to internal users	2018-04-01 11:43:39 +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	3aff363998	NEW: mail templates for projects	2018-03-28 17:08:26 +02:00
Laurent Destailleur	8102ae6705	Work on setup for vat of product payments	2018-03-25 18:25:52 +02:00
Laurent Destailleur	8a3e6a0750	More logical setup behavior	2018-03-25 17:53:32 +02:00
florian HENRY	ffbeb17ec2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-03-25 17:19:27 +02:00
Laurent Destailleur	7363ae17ee	Move setup of email for module module into email templates	2018-03-23 16:09:46 +01:00
florian HENRY	e2e1fae5e6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-03-21 22:58:33 +01:00
Laurent Destailleur	517301f014	Work on subscription reminder	2018-03-21 16:40:09 +01:00
florian HENRY	dc6f4c1f4d	NEW : option to send email to salaries	2018-03-21 11:48:30 +01:00
Laurent Destailleur	7272ee806e	Fix field not mandatory	2018-03-19 12:55:13 +01:00
Laurent Destailleur	ae17ce6f9a	NEW Add a tab to specify accountant/auditor of the company	2018-03-19 12:52:09 +01:00
Alexandre SPANGARO	93b087dbe0	NEW Add a tab to specify accountant/auditor of the company	2018-03-18 06:09:50 +01:00
Laurent Destailleur	ba47b6d051	NEW Add tab contact on supplier proposals	2018-03-16 10:21:53 +01:00
Laurent Destailleur	852bf8dab7	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php htdocs/societe/class/societe.class.php	2018-03-15 01:57:35 +01:00
Laurent Destailleur	4957ea9178	Fix SQLi reported by op7ica	2018-03-15 01:55:16 +01:00
Laurent Destailleur	cc9a6ee6e0	Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE	2018-03-14 10:49:54 +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	ae82d045f8	Dolibarrize module ticket	2018-03-11 23:56:17 +01:00
Laurent Destailleur	51c94fadfa	Look and feel v7	2018-03-11 21:31:34 +01:00
Frédéric FRANCE	ad05ddfe5c	Update ticketsup_extrafields.php	2018-03-11 20:42:39 +01:00
Frédéric FRANCE	111bbd98ce	Update ticketsup.php	2018-03-11 20:36:52 +01:00
Regis Houssin	ecb44e2f53	Fix: wrong copy/paste	2018-03-11 18:57:36 +01:00
Regis Houssin	7c3984c9db	Fix: dolibarrizzzz	2018-03-11 18:54:38 +01:00
Regis Houssin	741d69fabe	Fix: dolibarrize	2018-03-11 18:23:02 +01:00
florian HENRY	cfdaa7c88d	ticket sup make it work	2018-03-11 16:07:13 +01:00
jfefe	79acb79ae0	Begin integration of module « Ticketsup » Related to #4948	2018-03-11 09:44:58 +01:00
Laurent Destailleur	b2677c35e2	Merge pull request #8317 from frederic34/swifmailer Add dkim signing with Swiftmailer	2018-03-10 18:48:08 +01:00
Laurent Destailleur	cc7ac2a0da	Merge pull request #8313 from atm-florian/7.0_fix8241 7.0 fix8241	2018-03-09 22:47:43 +01:00
Laurent Destailleur	40d04482b0	Fix set time	2018-03-09 22:45:16 +01:00
Frédéric FRANCE	27bf5419d6	Merge branch 'develop' into swifmailer	2018-03-09 22:44:57 +01:00
Laurent Destailleur	4d885310c7	Merge pull request #8311 from inoveaconseil/patch-1 Fix set time limit to 0	2018-03-09 22:41:15 +01:00
florian HENRY	bb8525614c	better fix	2018-03-09 19:37:39 +01:00
Inovea Conseil	d763bfcbf1	Fix set time limit to 0 If the dolibarr was installed on a pc and not on server or in the doliwamp.	2018-03-09 17:56:49 +01:00
Marc de Lima Lucio	d6b4bc14e4	NEW: syslog file autoclean	2018-03-09 16:52:06 +01:00
Laurent Destailleur	235db1f405	Enhance OAuth module to store the stripe account in llx_oauth_token	2018-03-08 19:51:18 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Laurent Destailleur	c1c6720edc	Fix look and feel v7	2018-03-07 12:27:31 +01:00
Laurent Destailleur	f597e08d06	Merge branch 'develop' into 8.0-a6_vat	2018-03-07 12:23:43 +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	fab007ad83	Remove deprecated option dolibarr_pdf_force_fpdf Fix view of dolibarr setup config file	2018-03-07 09:41:27 +01:00
Laurent Destailleur	1e6a55745c	CSS	2018-03-06 11:54:05 +01:00
Laurent Destailleur	a086bd0137	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_linkedfiles.inc.php htdocs/core/class/utils.class.php	2018-03-06 09:20:45 +01:00
Alexandre SPANGARO	4a46ffc5d8	Add information in VAT admin page	2018-03-06 05:02:09 +01:00
Laurent Destailleur	951babae6d	Merge pull request #8272 from aspangaro/7.0 Fix : Missing language file	2018-03-05 20:44:34 +01:00
Laurent Destailleur	f35679fb2a	Fix description of field of table	2018-03-05 13:11:07 +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
Alexandre SPANGARO	c0664474e4	Fix : Missing language file	2018-03-04 06:32:55 +01:00
Laurent Destailleur	eac1b2efe9	FIX Infinite loop on deletion of temp file when there is symbolic links	2018-03-03 11:23:23 +01:00
Laurent Destailleur	f0c9cd3acc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-03 11:22:31 +01:00
Laurent Destailleur	d6b782e5ef	FIX Infinite loop on deletion of temp file when there is symbolic links	2018-03-03 11:22:15 +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
Laurent Destailleur	f545d2a134	NEW Can add filter actiontype and notactiontype on event ical export	2018-02-28 20:06:28 +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
Laurent Destailleur	7e48db2869	Clean code	2018-02-26 15:03:09 +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	029ef534d0	Clean deprecated code (property "special" removed from mod descriptor)	2018-02-25 10:55:02 +01:00
Laurent Destailleur	f7ecac8734	Fix look and feel v7	2018-02-23 11:40:56 +01:00
Laurent Destailleur	b3d968d4a1	Fix look and feel v7	2018-02-23 11:40:20 +01:00
John	d0ef8fe75a	fix travis errors	2018-02-22 09:54:36 +01:00
John	629b8e618e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents	2018-02-21 11:45:23 +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
John	46b235c139	add auto select model when select type on create invoice	2018-02-20 15:08:57 +01:00
Laurent Destailleur	1ee128ff13	NEW Add type of website container/page into dictionary	2018-02-19 19:48:53 +01:00
Laurent Destailleur	60fe1fa503	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/mails.php	2018-02-17 01:19:17 +01:00
Laurent Destailleur	5c5d2cbefa	Fix smtp warning message	2018-02-16 23:49:08 +01:00
Laurent Destailleur	9bed2ce8e2	Fix ignore file integrity check on filefunc.inc.php for deb/rpm package	2018-02-16 22:03:13 +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	5eee292663	FIX #8189	2018-02-15 13:40:17 +01:00
Laurent Destailleur	e25bd56e22	Add option WEBSITE_USE_WEBSITE_ACCOUNTS	2018-02-10 12:16:06 +01:00
Laurent Destailleur	ec66bde3c9	Add option WEBSITE_USE_WEBSITE_ACCOUNTS	2018-02-10 12:15:24 +01:00
Rui Strecht	fd594f7e74	Fixed wrong global	2018-02-07 16:57:43 +00:00
Rui Strecht	f52beef3eb	Added translation to company.php if MAIN_SHOW_REGION_IN_STATE_SELECT is activated	2018-02-07 16:54:21 +00:00
Rui Strecht	8c732a1443	Trying to not include sql request into method setMysoc	2018-02-06 12:01:54 +00:00
Rui Strecht	31372f8948	Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE # Conflicts: # htdocs/core/class/commonobject.class.php	2018-02-06 10:26:38 +00:00
Laurent Destailleur	d24d401f3a	Fix translation	2018-02-04 10:55:09 +01:00
Laurent Destailleur	7c6c893657	Merge pull request #7996 from atm-maxime/new_force_mailto NEW Option to force all emails recipient	2018-02-03 19:15:11 +01:00
Laurent Destailleur	5c6dd0b061	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-03 19:00:04 +01:00
Laurent Destailleur	a41847d084	Fix: date of modificaiton in ledger not visible. Fix: show hours in date of creation in ledger. Fix: label in export. Fix: label in export of draft journal is same than on screen. Fix: missing line desc in csv export of draft bank journal.	2018-02-02 14:27:07 +01:00
Rui Strecht	b387c3fdf8	Forgot to update other files to same PR changes	2018-01-31 11:45:30 +00:00
Rui Strecht	75b9caf744	Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2018-01-31 11:19:39 +00:00
Laurent Destailleur	8d983717a3	Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user NEW export filter models can be share or not by user	2018-01-29 21:19:50 +01:00
Laurent Destailleur	a639308601	Fix css	2018-01-27 19:40:16 +01:00
Laurent Destailleur	28417a6c24	Fix css	2018-01-26 23:54:45 +01:00
Frédéric FRANCE	0568461a7b	swiftmailer	2018-01-25 22:03:51 +01:00
Laurent Destailleur	8d7f6843a4	Must be able to export lockedlog for a dedicated year. Fix date are nto humanly readable.	2018-01-25 12:57:36 +01:00
Laurent Destailleur	dfc7d47747	Fix message	2018-01-21 15:32:10 +01:00
atm-quentin	c2ee92d4f1	fix trans	2018-01-18 13:59:05 +01:00
atm-quentin	ce29331c05	NEW Filter export model by user	2018-01-18 12:34:22 +01:00
Laurent Destailleur	cc5dcde9e1	Fix protection to avoid errors	2018-01-14 18:55:55 +01:00
Laurent Destailleur	95d2a9f88d	Responsive and css	2018-01-12 01:10:03 +01:00
Laurent Destailleur	90ddfc3f7f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/translation.php	2018-01-11 01:14:20 +01:00
Laurent Destailleur	9827358002	Merge pull request #8040 from atm-florian/dev_fixsecu fix #7963	2018-01-11 00:44:45 +01:00
florian HENRY	0bd45dc64b	fix: search translation into external module files also	2018-01-10 20:34:32 +01:00
Laurent Destailleur	bc9fc2828a	Fix missing class	2018-01-10 10:42:36 +01:00
florian HENRY	fdedd6f75b	fix 7963	2018-01-08 20:54:40 +01:00
Laurent Destailleur	da4417dfc8	Fix website in multicompany mode	2018-01-07 18:33:20 +01:00
Maxime Kohlhaas	a9c7dc48ab	New option to force e-mail recipient, helpful for test purposes	2017-12-24 17:31:31 +01:00
Laurent Destailleur	e839c72109	Fix css	2017-12-22 14:05:49 +01:00
Laurent Destailleur	d20062df73	Fix jquery css theme	2017-12-20 20:18:41 +01:00
Laurent Destailleur	89a62103ca	Debug module website	2017-12-19 11:40:29 +01:00
Laurent Destailleur	98b82d712a	NEW Revenue stamp can be a percent FIX Revenue stamp not visible on the transfer payment page	2017-12-18 12:43:03 +01:00
Laurent Destailleur	9f2a42b67d	NEW Can filter on user on unalterable log	2017-12-16 21:50:58 +01:00
Laurent Destailleur	2163db446b	NEW Can test signature of a version from API	2017-12-16 17:24:23 +01:00
Laurent Destailleur	1a3fbc092d	Fix method not found	2017-12-15 17:07:32 +01:00
Laurent Destailleur	5af153550d	Debug blockedlog: - Add a track into log when we disable/enable module - Add a protection to avoid disable of module when recording was started - Better compatibility with multicompany - Can filter on ref and amount - Add a permission to read the blockedlog - Add more information on payments/invoice/thirdparty into log - Reset of module data after a migration from v6 (not compatible)	2017-12-15 16:56:08 +01:00
Laurent Destailleur	fb0169cbb8	Back link to module page	2017-12-15 10:46:11 +01:00
Laurent Destailleur	2eea3a1afa	Fix backlink of module setup pages	2017-12-15 10:36:35 +01:00
Laurent Destailleur	dbefb93e0f	Error management	2017-12-11 18:25:23 +01:00
Laurent Destailleur	bb7c03906e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php htdocs/societe/list.php	2017-12-11 15:25:09 +01:00
Laurent Destailleur	f2e429e28f	Fix file integrity checker (exclude files excluded from package)	2017-12-11 15:03:34 +01:00
Laurent Destailleur	4443c0f0a0	Fix style	2017-12-10 15:24:47 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large More complete template	2017-12-08 16:15:41 +01:00
alexis Algoud	62cd77d999	NEW automatic activation of external module on country set	2017-12-08 10:13:03 +01:00
alexis Algoud	a2df87ab15	NEW warning on module blocked log reset if country code is FR fix wrong paste click	2017-12-05 11:40:42 +01:00
Laurent Destailleur	081d31a56e	Debug php backup for new mysql version	2017-12-03 11:45:34 +01:00
Laurent Destailleur	0a73daba01	Security: on target=_blank, we must have rel="noopener"	2017-12-02 03:04:52 +01:00
Laurent Destailleur	39fdd1b37d	Use correct link to changelog	2017-11-30 11:16:28 +01:00
Laurent Destailleur	c1e6d35ca5	Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search factorization of extrafields into list	2017-11-28 12:14:47 +01:00
Laurent Destailleur	8954d52e32	Fix edit dictionary	2017-11-27 16:07:48 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Scrutinizer Auto-Fixer	aab2799981	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-11-27 13:48:36 +00:00
Laurent Destailleur	69725fe62f	Fix setup of direct print with google docs driver	2017-11-27 13:55:27 +01:00
Laurent Destailleur	a48fe55832	Fix language file of external module not visible in trans tool	2017-11-25 22:53:58 +01:00
Laurent Destailleur	5935ad868a	Fix the from robot must be visible only on test page	2017-11-25 19:23:27 +01:00
Laurent Destailleur	3d48e509bd	Clean code	2017-11-25 19:16:15 +01:00
Laurent Destailleur	2fc5d9fefb	The form to test email can now use all sending profiles.	2017-11-25 18:52:47 +01:00
Laurent Destailleur	a529725c5c	Fix lang code must be null if not defined	2017-11-25 17:42:46 +01:00
Laurent Destailleur	88841ccbae	FIX #7590	2017-11-25 01:58:11 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Laurent Destailleur	657d1137c0	Disable field if overwrite transaction is off	2017-11-23 09:49:15 +01:00
Laurent Destailleur	304819a726	Work on module builder	2017-11-19 16:26:39 +01:00
Laurent Destailleur	4938a0ba2a	Add param forcenowrap on tooltip function	2017-11-19 12:41:37 +01:00
Laurent Destailleur	07c0b5d616	Code comment	2017-11-15 13:15:08 +01:00
Laurent Destailleur	f68b2bdeca	Use the confirmation when deleting from mass action everywhere.	2017-11-15 11:39:11 +01:00
Laurent Destailleur	fa92c53ff6	Fix pb when showing dictionaries	2017-11-14 11:13:24 +01:00
Laurent Destailleur	31e152274c	NEW Add 2 new automatic classification in workflow module	2017-11-14 01:00:57 +01:00
Laurent Destailleur	15fc8ce33b	Fix responsive on agenda setup page	2017-11-12 14:02:27 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	2fe831db63	Merge pull request #7779 from atm-maxime/new_dict_filter_country New dictionnaries are now pre-filtered on company country	2017-11-11 17:30:26 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Laurent Destailleur	9d3cf8f217	Fix can use tooltip with popup even for column titles	2017-11-09 18:50:15 +01:00
Maxime Kohlhaas	82ea46c740	New dictionnaries are now pre-filtered on company country	2017-11-07 10:49:04 +01:00
Philippe GRAND	acc69b1f80	fix : Warning: A non-numeric value encountered	2017-11-03 19:52:02 +01:00
Laurent Destailleur	5f5c7a9126	NEW Show user id of web process in system info - web server	2017-11-03 11:42:24 +01:00
Laurent Destailleur	608f87d03b	Set focus on first field to fill.	2017-11-02 16:14:24 +01:00
Laurent Destailleur	a6879775bb	FIX Search into language is ok for file into external modules two.	2017-11-01 20:05:28 +01:00
Laurent Destailleur	e184cac2c5	FIX Search into language is ok for file into external modules two.	2017-11-01 19:58:46 +01:00
Laurent Destailleur	2094ae1a57	NEW Add filter on event code on automatic filling setup page	2017-10-31 19:28:34 +01:00
Laurent Destailleur	bd94ec0f1d	Use fontawesome for picto for on/off default.	2017-10-31 12:25:06 +01:00
Laurent Destailleur	29bb0b37ef	Translation	2017-10-31 11:50:56 +01:00
Laurent Destailleur	068f5e32cb	NEW Tooltip for substitutions variables on tooltips on admin pages	2017-10-31 11:17:44 +01:00
Laurent Destailleur	007783cf76	FIX Searching translation should not be case sensitive	2017-10-30 01:45:39 +01:00
Laurent Destailleur	9edc8f6eb6	FIX Searching translation should not be case sensitive	2017-10-30 01:32:17 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Laurent Destailleur	1adfc02724	Fix hook not visible when using old syntax	2017-10-27 10:05:21 +02:00
Laurent Destailleur	3accb9d658	Fix warning	2017-10-26 03:35:57 +02:00
Laurent Destailleur	9f0f5eb5e8	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
Laurent Destailleur	4d4f1ab6ec	Fix html entities	2017-10-24 10:09:20 +02:00
Laurent Destailleur	e257da6b19	Reload of menu auguria done when required	2017-10-24 09:47:18 +02:00
Laurent Destailleur	605c9c45e4	Merge pull request #7656 from atm-maxime/fix_accounting_mode Fix #7584	2017-10-22 02:21:53 +02:00
Laurent Destailleur	4c58e4f98a	Update compta.php	2017-10-22 02:21:34 +02:00
Laurent Destailleur	3bca0ad07d	More modern picto for switch on/off Work on website module	2017-10-20 21:39:19 +02:00
Maxime Kohlhaas	4224ea6c56	Fix use conf instead of global var	2017-10-18 19:09:29 +02:00
Laurent Destailleur	6bcdf2ff75	Test replacement of img switcher with FA css	2017-10-17 14:03:22 +02:00
Laurent Destailleur	3a97a3e2ad	Move key "Translation" into main file. Add direct link to edit on transifex	2017-10-17 13:05:55 +02:00
Laurent Destailleur	5b880cf45f	Merge pull request #7645 from frederic34/transedit enhance admin translation	2017-10-17 11:48:19 +02:00
Frédéric FRANCE	23e2c95af6	enhance admin translation	2017-10-16 21:22:13 +02:00
Laurent Destailleur	ebe0664aff	Merge branch 'develop' into scrutinizer-patch-3	2017-10-16 20:54:15 +02:00
Rui Strecht	447cc208fe	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE # Conflicts: # htdocs/societe/class/societe.class.php	2017-10-16 09:34:24 +01:00
Laurent Destailleur	87814af7b6	Move function colorIsLight into functions.lib.php Fix scrutinizer bugs.	2017-10-16 09:29:10 +02:00
Scrutinizer Auto-Fixer	bd5bffa72c	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	d12019d1b5	Fix from scrutinizer	2017-10-13 13:10:36 +02:00
Laurent Destailleur	8113321062	Start to work on email sender profiles	2017-10-13 12:02:26 +02:00
Laurent Destailleur	2b55fb81b9	Standardize substition keys.	2017-10-13 10:35:21 +02:00
Laurent Destailleur	56be9e2b60	Introduce table c_email_senderprofile to have several profils	2017-10-11 19:41:45 +02:00
Laurent Destailleur	bcf56e3140	Introduce table c_email_senderprofile to have several profils	2017-10-11 19:41:19 +02:00
Laurent Destailleur	2759e2552e	Merge pull request #7609 from dolibarr95/patch-24 Update : Add class in module list table	2017-10-11 11:53:33 +02:00
dolibarr95	220b37133b	Wrong test https://github.com/Dolibarr/dolibarr/issues/7604#issuecomment-335387587	2017-10-11 11:49:46 +02:00
Laurent Destailleur	acc83db220	Merge pull request #7605 from dolibarr95/patch-22 Fix : Wrong test in technical services provided	2017-10-11 11:49:18 +02:00
dolibarr95	0abc16b27f	Add class Add oddeven class to tr tag	2017-10-10 14:55:42 +02:00
dolibarr95	7943a14fa2	Wrong test https://github.com/Dolibarr/dolibarr/issues/7604#issuecomment-335387587	2017-10-10 09:43:03 +02:00
Laurent Destailleur	0b7aa20464	Add link to ChangeLog	2017-10-09 22:52:26 +02:00
Rui Strecht	1a5cdf2406	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE # Conflicts: # htdocs/admin/company.php # htdocs/core/class/commonobject.class.php	2017-10-09 11:36:38 +01:00
Laurent Destailleur	14b667c9f1	Merge pull request #7587 from hregis/develop_admin NEW add doActions hook in admin ihm	2017-10-09 10:48:52 +02:00
Laurent Destailleur	33624e1001	NEW Attaching doc automatically in email is now a parameter of template.	2017-10-08 16:34:42 +02:00
Laurent Destailleur	ce7ce82801	Enhance email template editor	2017-10-08 14:51:10 +02:00
Regis Houssin	6401c8a58e	NEW add doActions hook in admin ihm	2017-10-07 20:05:02 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Laurent Destailleur	de71de61af	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 18:52:38 +02:00
Laurent Destailleur	df38f60617	Export website into zip	2017-10-06 18:29:18 +02:00
Regis Houssin	4ea3d27ced	Fix: for avoid problem with currentcontext	2017-10-06 15:19:43 +02:00
Laurent Destailleur	4bc7eb0ec1	Merge pull request #7520 from hregis/develop_ldap Fix: Set LDAP password when LDAP key changed	2017-10-06 13:09:28 +02:00
Regis Houssin	e1311340a7	NEW add doActions hook in company admin	2017-10-06 08:45:59 +02:00
Laurent Destailleur	801a5180d6	Fix scrutinizer bug reports	2017-10-06 01:16:19 +02:00
Regis Houssin	8d3ad9ddc8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-10-04 08:43:07 +02:00
Laurent Destailleur	5ddd77c950	Fix We must use dol_escape_htmltag for input field not dol_htmlentities	2017-10-03 18:35:35 +02:00
Laurent Destailleur	eeb36464b7	Merge pull request #7524 from hregis/develop_mc Fix: command not found with escapeshellarg !	2017-10-03 18:06:49 +02:00
Laurent Destailleur	386c8215ee	Update security_file.php	2017-10-03 18:06:32 +02:00
Laurent Destailleur	2f02015c30	Update security_file.php	2017-10-03 17:58:50 +02:00
Laurent Destailleur	f2e0ff0d30	Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict	2017-10-03 17:25:01 +02:00
Laurent Destailleur	1f11dcb4bd	Fix no loose of configuration of action auto after upgrade Close #7527	2017-10-03 17:21:18 +02:00
Regis Houssin	a88938ace4	Fix: use GETPOST	2017-10-03 17:11:42 +02:00
Regis Houssin	09e71f1390	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-10-02 11:51:27 +02:00
Regis Houssin	475c881e67	Fix: add missing ldap fields	2017-10-02 09:00:07 +02:00
Regis Houssin	c1b6f59c1b	Fix: restore possible ldap keys	2017-10-02 08:43:53 +02:00
Laurent Destailleur	989f285d32	Replace table with div	2017-10-02 01:23:07 +02:00
Laurent Destailleur	3f3a5e0921	Merge pull request #7499 from atm-gauthier/NEW_custom_meteo New custom meteo	2017-10-02 00:48:52 +02:00
Laurent Destailleur	b3939f12b9	Enhance the default value feature	2017-10-01 15:06:43 +02:00
Regis Houssin	cb9d627f02	Fix: Set LDAP password when LDAP key changed	2017-09-30 11:51:22 +02:00
Regis Houssin	660c5dd03d	Fix: avoid ldap error when firstname and lastname is empty	2017-09-28 18:49:33 +02:00
Rui Strecht	4839d0f84d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2017-09-28 09:36:52 +01:00
Laurent Destailleur	8242469e40	FIX The unique index on email templates can work now.	2017-09-27 18:16:28 +02:00
Regis Houssin	a38668033d	Fix: missing modification	2017-09-27 17:46:17 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
Rui Strecht	3ebb18ab16	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2017-09-26 16:34:59 +01:00
gauthier	79049f55b7	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_custom_meteo	2017-09-26 09:56:00 +02:00
Laurent Destailleur	c9e9f60f8f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-25 19:55:52 +02:00
Laurent Destailleur	c5287e68b1	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/admin/multicurrency.php htdocs/core/modules/modFournisseur.class.php	2017-09-25 19:54:27 +02:00
Laurent Destailleur	4c7b39f49e	FIX #7486 Empty value for multicurrency rate must be forbidden	2017-09-25 19:22:41 +02:00
gauthier	3db52aed78	NEW : calcul percentage ok	2017-09-25 17:13:50 +02:00
gauthier	6fa1929d5c	NEW : change description on click	2017-09-25 12:26:15 +02:00
Regis Houssin	d592664150	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-09-25 06:48:26 +02:00
Laurent Destailleur	cef7b9c92d	FIX #7435 Can't add payment term	2017-09-25 00:08:26 +02:00
Regis Houssin	06ee9f4775	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-24 16:10:55 +02:00
Laurent Destailleur	91d303465d	NEW Can add html content on right of tabs	2017-09-24 01:39:06 +02:00
Regis Houssin	791c385e5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap Conflicts: htdocs/adherents/card.php	2017-09-22 20:26:22 +02:00
Laurent Destailleur	f990667b1a	NEW Can send email from the member card using email templates.	2017-09-22 17:48:38 +02:00
Laurent Destailleur	d4bde2a4ea	Fix date substitution for contracts	2017-09-22 15:12:36 +02:00
Laurent Destailleur	252f038468	Mutualize code of substitutions for emails	2017-09-22 14:34:31 +02:00
Laurent Destailleur	236cf853e5	Sort list of invoice template	2017-09-22 11:47:36 +02:00
Laurent Destailleur	292095f0c6	NEW Can filter on type of email template	2017-09-22 10:11:51 +02:00
gauthier	d51c22a012	NEW : customizable meteo in value or percentage	2017-09-21 17:28:00 +02:00
Rui Strecht	24f8ea003a	Added self to contributors list	2017-09-20 12:30:59 +01:00
Rui Strecht	42a57aab26	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2017-09-20 12:16:09 +01:00
Rui Strecht	f1126b65bf	Updated method to fetch state name, code and id to match method used with country Reverted some previous changes to allow backwards compatibility Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card	2017-09-20 12:06:35 +01:00
Regis Houssin	1f59e4f7e9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-20 12:47:35 +02:00
Laurent Destailleur	cfd29841e1	NEW Option STOCK_SUPPORTS_SERVICES become visible.	2017-09-19 23:42:20 +02:00
Laurent Destailleur	c38ed54990	Disable old datepicker	2017-09-19 17:31:37 +02:00
Laurent Destailleur	278bcfa8da	FIX #7148	2017-09-18 15:31:22 +02:00
Regis Houssin	f550e27579	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-18 12:15:01 +02:00
Regis Houssin	bb0cb8adf4	Fix: remove unused file	2017-09-18 11:04:55 +02:00
Regis Houssin	8389555882	Fix: wrong image url and file not present	2017-09-18 10:33:54 +02:00
Regis Houssin	a03ef95eaa	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/tables/llx_c_payment_term.sql	2017-09-18 09:11:04 +02:00
Laurent Destailleur	e244ee6715	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-17 21:17:04 +02:00
Laurent Destailleur	2c3428a1bf	Fix css	2017-09-17 20:48:09 +02:00
Laurent Destailleur	ab5724e7ff	Mutualize code for forms to send emails. Remove thousand line of code.	2017-09-17 17:12:14 +02:00
Regis Houssin	1f88e624c2	Fix: add ldap import/export script	2017-09-17 10:42:00 +02:00
Regis Houssin	bdc425c203	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-16 21:41:55 +02:00
Regis Houssin	87b81fb2fd	NEW add members types ldap group management	2017-09-16 21:41:30 +02:00
Laurent Destailleur	b099e0a135	Fix translation of dolistore interface	2017-09-16 10:42:23 +02:00
Laurent Destailleur	8773a6860f	Fix HTML5 use of <br> is preferred to <br />	2017-09-15 23:49:04 +02:00
Regis Houssin	db17eb80ec	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/class/paymentterm.class.php	2017-09-15 16:45:49 +02:00
Laurent Destailleur	c930ba1669	Merge pull request #7403 from hregis/develop_bug Fix: avoid Warning: A non-numeric value encountered	2017-09-15 15:52:25 +02:00
Regis Houssin	25cd1ee27a	Fix: avoid Warning: A non-numeric value encountered	2017-09-15 11:19:19 +02:00
Regis Houssin	a213a5d5fd	Fix: missing empty $object	2017-09-15 11:12:56 +02:00
Regis Houssin	b9e0879847	NEW: Add hook addAdminLdapOptions and doAction in ldap admin page NEW: complete_head_from_modules() in ldap_prepare_head()	2017-09-15 10:57:22 +02:00
Laurent Destailleur	0873260b8a	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
Laurent Destailleur	3b40c95107	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/categories/class/categorie.class.php	2017-09-14 21:57:14 +02:00
Regis Houssin	a494e01f00	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-14 12:07:19 +02:00
Laurent Destailleur	205989b64b	Fix phpunit	2017-09-14 09:16:57 +02:00
Laurent Destailleur	51e5959765	Fix travis	2017-09-14 08:26:13 +02:00
Laurent Destailleur	1a056d29d2	Debug search on dolistore	2017-09-12 21:02:18 +02:00
Laurent Destailleur	a4665e17d4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinter.class.php htdocs/societe/class/societe.class.php htdocs/societe/list.php	2017-09-12 13:26:25 +02:00
Laurent Destailleur	d0a0bf57b6	NEW The "Show detail by account" accepts 3 values: yes, no, if non zero	2017-09-12 12:52:48 +02:00
Laurent Destailleur	31b5ca17f1	Merge pull request #7353 from hregis/6.0_htmlentities Fix: avoid htmlentities	2017-09-11 14:08:37 +02:00
Regis Houssin	b5de8da3a6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/modules/modFacture.class.php	2017-09-11 08:07:55 +02:00
Laurent Destailleur	e9e6a8e5ad	Fix center of button	2017-09-11 03:29:36 +02:00
Laurent Destailleur	903df90f8a	NEW Can edit with delete/insert a forced translation	2017-09-10 22:46:08 +02:00
Regis Houssin	7404a6cf98	Fix: avoid htmlentities	2017-09-09 12:15:59 +02:00
Laurent Destailleur	75172966c2	Fix selection of email templates	2017-09-08 14:40:39 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	152416a6d7	Fix bad param	2017-09-08 13:24:10 +02:00
Laurent Destailleur	b7197530c2	NEW Each user can edit its own email template (menu tools)	2017-09-08 12:48:01 +02:00
Laurent Destailleur	835cd43565	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-09-08 10:09:41 +02:00
Laurent Destailleur	7dbd0bd355	FIX Some page of admin were not responsive	2017-09-08 10:09:22 +02:00
Laurent Destailleur	f92eded0a2	Merge pull request #7340 from Oeris/6.0-ficheinter NEW Adds an option to hide duration in the "intervention" module	2017-09-07 18:07:14 +02:00
Laurent Destailleur	b9af2d6b97	Merge pull request #7331 from simnandez/6.0 FIX: Bad const name	2017-09-07 17:57:33 +02:00
Neil Orley	e43b13968e	New: Adds an hide hour button in the "intervention" module Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module	2017-09-07 15:31:19 +02:00
Neil Orley	b5c30ea679	New: Adds an hide duration button in intervention module Adds a way to set the visibility of the intervention time field from the administration interface of the "intervention" module	2017-09-07 11:58:22 +02:00
Regis Houssin	66e548427c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/resultat/clientfourn.php htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-09-07 10:50:35 +02:00
Laurent Destailleur	859d0dfe97	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-06 19:24:42 +02:00
Laurent Destailleur	d26b2a694d	FIX Security fixes (filter onload js, less verbose error message in download and viewimage, show info to encourage dolibarr_main_prod=1)	2017-09-06 11:39:30 +02:00
Laurent Destailleur	f29a4c1fb1	Make accountancy pages responsive	2017-09-05 20:42:34 +02:00
Juanjo Menent	53f5513476	FIX: Bad const name	2017-09-05 18:10:19 +02:00
Laurent Destailleur	c3daad7545	Fix not reachable code	2017-09-04 12:55:32 +02:00
Laurent Destailleur	3e9679f273	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-04 10:20:17 +02:00
Laurent Destailleur	58b08c7de8	Clean code	2017-09-01 23:56:59 +02:00
Laurent Destailleur	4b9f54e571	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql	2017-09-01 17:34:57 +02:00
Regis Houssin	d9008cd302	Fix: missing $dolibarrdataroot value	2017-09-01 08:20:33 +02:00
Regis Houssin	8e8f94df11	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/class/facture-rec.class.php	2017-08-30 19:33:23 +02:00
Juanjo Menent	bfc5f01e1e	NEW Add detail of all tax rates into pdf column tax sale. -Can be hidden by pdf setup page -For know if localtax is applied into line we have to read totaltax line	2017-08-30 14:36:00 +02:00
Laurent Destailleur	4d908c2dd0	Merge pull request #7299 from atm-maxime/new_expense_numbering New : add expense report numbering mask	2017-08-29 18:24:17 +02:00
Laurent Destailleur	a60cd49fb0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php	2017-08-28 12:53:02 +02:00
Laurent Destailleur	21a7fcb01a	Fix substitution when sending emails	2017-08-28 12:18:18 +02:00
Maxime Kohlhaas	350b24f32b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_expense_numbering	2017-08-27 17:53:19 +02:00
Maxime Kohlhaas	61fadfd0e1	New numbering module for expense report + admin setup	2017-08-27 10:49:51 +02:00
Laurent Destailleur	77af3b96d3	Showempty on language list	2017-08-26 18:45:10 +02:00
Laurent Destailleur	5ed22b64fb	Show if module add objects tables	2017-08-26 16:04:24 +02:00
Laurent Destailleur	632119a5c5	Show if module add dictionary data	2017-08-26 15:46:35 +02:00
Laurent Destailleur	f2a437fa89	Enhance modulebuilder	2017-08-26 15:22:13 +02:00
Laurent Destailleur	7329d21dcd	Fix lang selection	2017-08-25 17:13:33 +02:00
Laurent Destailleur	9d380a8b8a	NEW Can edit the language into the email templates editor.	2017-08-25 16:38:45 +02:00
Laurent Destailleur	17f44ad980	NEW Can make a specific setup for SMTP sending for emailing module	2017-08-24 02:02:00 +02:00
Regis Houssin	1befd9c67f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-23 21:05:36 +02:00
Laurent Destailleur	9f5718f00a	Fix php unit	2017-08-23 19:38:06 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	d90a23efb6	Fix for old php	2017-08-23 17:00:50 +02:00
Laurent Destailleur	f3ef6448d7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/admin/supplier_payment.php htdocs/core/lib/ajax.lib.php htdocs/don/admin/donation.php htdocs/product/admin/product.php	2017-08-23 16:11:51 +02:00
Regis Houssin	2492b9968a	Fix: missing scandir	2017-08-23 10:21:10 +02:00
Regis Houssin	6dda2f3670	Fix: "scandir" in url is blocked in some providers	2017-08-23 10:07:00 +02:00
Regis Houssin	2f537a1ade	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2017-08-22 18:49:40 +02:00
Laurent Destailleur	ec56ff59d6	Fix invalid link after renaming a website key.	2017-08-22 15:32:45 +02:00
Laurent Destailleur	109e0f7179	Fix typo	2017-08-22 15:31:37 +02:00
Laurent Destailleur	a5d210195c	Add option MAIN_DISABLE_DOLISTORE_SEARCH	2017-08-22 14:55:01 +02:00
Laurent Destailleur	42666a0146	Fix bad link	2017-08-22 14:51:47 +02:00
Laurent Destailleur	14cd150762	NEW Introduce experimental feature to search dolistore from application	2017-08-22 14:47:01 +02:00
Laurent Destailleur	b3d1cdf84c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php	2017-08-22 10:11:32 +02:00
Laurent Destailleur	4a310f36d8	Fix help url	2017-08-22 08:12:30 +02:00
Laurent Destailleur	188653a85d	Work on website module	2017-08-20 18:50:51 +02:00
Laurent Destailleur	5c5c4046a1	Prepare setup for email reminder	2017-08-20 16:07:22 +02:00
Laurent Destailleur	5d76227948	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-18 23:22:36 +02:00
Laurent Destailleur	097b660c41	Mutualize code	2017-08-18 16:25:00 +02:00
Laurent Destailleur	22a7c9bd6b	Merge pull request #7220 from guerrierk/develop NEW\|Add possibility to propose last num releve in conciliation	2017-08-17 23:42:07 +02:00
Laurent Destailleur	f058fa1938	Better detection if a module provide triggers	2017-08-03 12:19:31 +02:00
Laurent Destailleur	00a1893d93	Better help	2017-08-03 12:04:13 +02:00
Laurent Destailleur	fa752348c8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang	2017-08-02 17:56:09 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
Regis Houssin	0dc0fe81fc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-31 07:40:01 +02:00
Laurent Destailleur	69357dd91c	Merge pull request #7113 from atm-ph/new_develop_expense_report NEW Add expense report rules and ik	2017-07-31 02:33:49 +02:00
Laurent Destailleur	80f096a9d8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-31 02:09:15 +02:00
Laurent Destailleur	bb8d458468	Fix menu editor	2017-07-30 19:41:45 +02:00
GUERRIER Kevin	ded6b40489	Add possibility to propose last num releve in conciliation	2017-07-29 14:21:58 +02:00
atm-ph	1f3f9e40b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-27 16:01:53 +02:00
Regis Houssin	2efb86b5d8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-23 10:36:14 +02:00
Laurent Destailleur	854a6ca3d5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-22 16:40:45 +02:00
Laurent Destailleur	5207b84e8b	Fix compatibility with indian IGST/CSGST/SGST	2017-07-22 01:56:38 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Laurent Destailleur	1851080b31	Merge pull request #7152 from dolibarr95/patch-14 'int' for $rate variable	2017-07-21 15:07:00 +02:00
Laurent Destailleur	5965bec501	Update multicurrency.php	2017-07-21 15:06:53 +02:00
Laurent Destailleur	168f167934	Tooltip	2017-07-21 12:42:21 +02:00
Laurent Destailleur	df61a5f045	Debug module website	2017-07-20 20:05:49 +02:00
Laurent Destailleur	1e7aa4d9b4	Work on module website	2017-07-19 16:38:00 +02:00
Regis Houssin	c8bd11660d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-18 15:23:43 +02:00
Laurent Destailleur	1ef70b387d	Fix bad limit	2017-07-17 16:45:24 +02:00
Laurent Destailleur	7b2a71802b	Do some TODO on modulebuilder module.	2017-07-16 13:00:35 +02:00
Regis Houssin	200f232164	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-16 07:51:20 +02:00
Laurent Destailleur	15cf15f47f	Look and feel v6	2017-07-14 02:07:01 +02:00
dolibarr95	de24c0e367	Keep alpha for $rate var	2017-07-13 16:21:02 +02:00
dolibarr95	c36c2408c2	'int' for $rate variable see : https://github.com/Dolibarr/dolibarr/pull/7149#issuecomment-315076031	2017-07-13 15:31:46 +02:00
Laurent Destailleur	743de4e586	FIX Option to classify proposal/order in workflow module must not set source object to billed if amount differs.	2017-07-13 12:42:32 +02:00
Laurent Destailleur	028f1f5133	Fix default currency in creation form.	2017-07-13 10:16:40 +02:00
Laurent Destailleur	2870798d07	Fix remove warnings	2017-07-13 00:35:10 +02:00
Laurent Destailleur	23fbef3dae	Fix the delete dir functions does not return real nb of deleted files.	2017-07-13 00:26:05 +02:00
Laurent Destailleur	0d4d4516c8	Fix template for css and js	2017-07-12 22:52:56 +02:00
Regis Houssin	cb6b81d897	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-11 19:10:22 +02:00
Laurent Destailleur	be09c911ce	Debug module websites	2017-07-10 23:44:46 +02:00
Laurent Destailleur	fd89535037	Debug module website	2017-07-09 22:30:19 +02:00
Laurent Destailleur	3c576dcf21	Fix bad name of tables	2017-07-09 20:57:45 +02:00
Laurent Destailleur	10cb7b2524	Fix remove warnings	2017-07-09 20:31:27 +02:00
Laurent Destailleur	71d360b4a0	Merge pull request #7105 from hregis/develop_bug2 Fix: check if action type is different of 'user' (external module)	2017-07-07 19:57:26 +02:00
Laurent Destailleur	2be9f402c6	Fix order of tab	2017-07-07 10:58:18 +02:00
phf	6ab0ec4b1b	Fix travis and rename 2 fields	2017-07-07 10:22:37 +02:00
phf	b8865c425f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-05 10:48:01 +02:00
phf	1beec51928	New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE	2017-07-05 10:44:52 +02:00
Laurent Destailleur	0ee93fb00c	Fix conflict between option login and logina and logint in agenda export	2017-07-04 10:29:38 +02:00
Regis Houssin	d9d9b748ad	Fix: check if action type is different of 'user' (external module)	2017-07-03 19:27:21 +02:00
Laurent Destailleur	9e26e6b0a3	Fix bad value for ref of old contracts	2017-07-03 11:42:17 +02:00
Regis Houssin	3f882cb33a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-07-03 09:24:05 +02:00
Laurent Destailleur	658fe93d8c	Fix menu editor (data not aligned)	2017-07-01 12:42:49 +02:00
Regis Houssin	fa247ffd98	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-29 08:51:42 +02:00
Laurent Destailleur	5f00fb5df8	Merge pull request #7059 from jfefe/patch-13 Add missing end tag `form` into fichinter setup	2017-06-27 17:36:33 +02:00
Laurent Destailleur	3b7667292b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-27 11:59:40 +02:00
Laurent Destailleur	10eda66735	Fix alignement	2017-06-27 11:32:52 +02:00
jfefe	9b951c5d1b	Add missing end tag `form` into fichinter setup The setup for option `FICHINTER_PRINT_PRODUCTS` was broken.	2017-06-26 21:37:36 +02:00
Laurent Destailleur	85ce1f3332	Fix missing var init	2017-06-26 09:20:16 +02:00
Laurent Destailleur	e97a4d953d	Merge pull request #7052 from hidupcloud/develop FIX Fixing pages warning when value is null	2017-06-25 03:03:34 +02:00
Laurent Destailleur	778e581aca	Fix: avoid warning on permission if there is only admin users	2017-06-24 22:14:04 +02:00
Juan Bautista Mesa Roldán	0f5dc90bae	Fixing pages warning when value is null	2017-06-24 16:45:45 +02:00
Laurent Destailleur	b0c5616ff0	Fix in the way markdown README and ChangeLog are output on module page.	2017-06-24 16:01:18 +02:00
Laurent Destailleur	014cb4b004	Fix navigation on security event list	2017-06-21 12:03:49 +02:00
Regis Houssin	2fffd2fa6f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-20 23:26:21 +02:00
Laurent Destailleur	ec9bbe2b52	Help/Need debug of some online instances with the log view	2017-06-20 16:54:37 +02:00
Laurent Destailleur	4dda771079	FIX #6973	2017-06-20 12:54:26 +02:00
Laurent Destailleur	f2a2cfd8c8	Look and feel v6	2017-06-20 11:46:30 +02:00
Regis Houssin	544d051fe3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-19 07:06:57 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Laurent Destailleur	abe736c6a6	Escape hml tags	2017-06-18 19:42:59 +02:00
Regis Houssin	dcc152d4a4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-18 06:52:20 +02:00
Regis Houssin	a0299042e4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-17 12:05:33 +02:00
Regis Houssin	d1b003f3c4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-17 12:01:14 +02:00
Laurent Destailleur	8a1de52f3c	Fix translation	2017-06-17 12:00:33 +02:00
Laurent Destailleur	7c41c9a3e4	Fix activation of dependency for a dedicated country. BlockedLog depends now on CashDesk only.	2017-06-17 11:43:00 +02:00
Regis Houssin	49e8af7cc9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-17 10:34:50 +02:00
Laurent Destailleur	1d91ce90d3	FIX image from medias directory into PDF free text	2017-06-17 00:16:22 +02:00
Regis Houssin	f0e234eef2	Fix: missing hookmanager init	2017-06-16 17:01:43 +02:00
Laurent Destailleur	b228fe6a2a	Fix auto focus on module page	2017-06-16 16:06:20 +02:00
Regis Houssin	c656856ec2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi	2017-06-16 10:52:43 +02:00
Laurent Destailleur	8149bf62a8	Fix ajaxcombo broken on accouting account edition on vat dictionary.	2017-06-15 23:47:19 +02:00
Regis Houssin	78d5520741	Fix: missing _cleanObjectDatas function	2017-06-15 21:23:35 +02:00
Regis Houssin	cd095e99c9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-14 12:16:10 +02:00
Laurent Destailleur	0b6d7a5b57	Modulebuilder	2017-06-14 12:05:47 +02:00
Regis Houssin	773abff80e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-12 21:24:10 +02:00
Laurent Destailleur	58c4144123	Fix sort of dictionnary	2017-06-11 19:27:07 +02:00
Regis Houssin	d1233755f6	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-11 11:41:02 +02:00
Laurent Destailleur	a96362e2f9	Fix #formmailbeforetitle not supported everywhere	2017-06-11 11:40:01 +02:00
Regis Houssin	3445c9d329	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict Conflicts: htdocs/core/lib/functions.lib.php	2017-06-11 06:27:49 +02:00
Laurent Destailleur	542a72c684	NEW custom dir is enabled dy default on first install. Fix modulebuilder when custom dir not defined.	2017-06-10 23:50:46 +02:00
Laurent Destailleur	7c0de18ac1	Fix code comment	2017-06-10 12:56:28 +02:00
Laurent Destailleur	58a407d9f1	Fix style and align when no permission on widget	2017-06-10 00:05:47 +02:00
Regis Houssin	460a6f0fb7	Fix: phpunit : Unexpected 'print' (T_PRINT)	2017-06-09 14:15:29 +02:00
Regis Houssin	0e8f36dc92	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-09 14:00:48 +02:00
Laurent Destailleur	1af74b4c42	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-06-09 12:50:56 +02:00
Laurent Destailleur	41586b76c0	Fix missing css	2017-06-09 11:40:35 +02:00
Regis Houssin	0546f28823	Fix: Travis error	2017-06-08 18:38:24 +02:00
Regis Houssin	73557151d2	Fix: better test if entity equal 0	2017-06-08 18:27:32 +02:00
Regis Houssin	3bddbd3bdf	Fix: better test	2017-06-08 18:20:27 +02:00
Regis Houssin	ade915af5f	New: add dictionnary sharing (multicompany)	2017-06-08 16:36:42 +02:00
Regis Houssin	4b98a1aefd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-08 15:05:45 +02:00
Laurent Destailleur	b441c62e1d	Fix syntax error	2017-06-08 14:55:12 +02:00
Laurent Destailleur	b1f93ccb0c	Fix security	2017-06-08 14:33:46 +02:00
Laurent Destailleur	57f3d0910e	Merge pull request #6738 from grandoc/new_branch_20_04 Update code using new css class	2017-06-08 11:00:49 +02:00
Regis Houssin	1baa620688	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict	2017-06-08 10:33:26 +02:00
Laurent Destailleur	7587a3d592	Merge branch 'develop' into develop_transverse	2017-06-08 10:25:04 +02:00
Regis Houssin	44dba391c1	New: add dictionnary sharing (multicompany)	2017-06-08 10:24:16 +02:00
Regis Houssin	b183c6e7ac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-07 20:23:24 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Regis Houssin	bfd6116e5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-06 15:03:36 +02:00
Regis Houssin	03df365eea	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 11:01:42 +02:00
Laurent Destailleur	02b5d9e6f7	FIX #6945	2017-06-06 10:53:53 +02:00
Regis Houssin	b66da3d148	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
Regis Houssin	2df33d1df3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-03 11:45:15 +02:00
Laurent Destailleur	7ad92c3a4d	Fix new generic substitution system	2017-06-01 13:32:20 +02:00
Laurent Destailleur	733d1caac6	Correct usage of parameter 'none' in GETPOST	2017-06-01 12:37:16 +02:00
Laurent Destailleur	77df19009d	Removed duplicated code	2017-06-01 12:11:45 +02:00
Laurent Destailleur	c70beaa56b	Complete work for mutualizing generic substitution system.	2017-06-01 01:57:22 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	fa6bc03765	Fix typo	2017-05-30 01:34:20 +02:00
Laurent Destailleur	d56cd44ebc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-29 19:11:41 +02:00
Laurent Destailleur	59ab9a4421	FIX #6850	2017-05-29 15:25:37 +02:00
Laurent Destailleur	3f5cf0ee18	Merge pull request #6897 from hregis/develop_bug4 Fix: for view special values	2017-05-29 10:46:03 +02:00
Laurent Destailleur	452579150d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2017-05-29 10:43:26 +02:00
Laurent Destailleur	e667d72547	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/build_class_from_table.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php	2017-05-29 10:41:51 +02:00
Laurent Destailleur	b22817c237	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/compta/facture/fiche-rec.php	2017-05-29 10:25:07 +02:00
Laurent Destailleur	c4f09b8894	Work on modulebuilder	2017-05-28 14:43:17 +02:00
Regis Houssin	95b2b1bd17	Fix: for view special values	2017-05-26 10:28:10 +02:00
Alexandre SPANGARO	1f079fac9d	Move html.formventilation.class.php to html.formaccounting.class.php	2017-05-25 06:57:28 +02:00
Laurent Destailleur	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +02:00
Laurent Destailleur	a53fb25cfa	Look and feel v6	2017-05-20 18:46:15 +02:00
Laurent Destailleur	80cbc28385	NEW Add REST API to push a file.	2017-05-20 15:52:36 +02:00
Laurent Destailleur	807c77f754	Fix inconsistent options	2017-05-19 18:03:49 +02:00
Laurent Destailleur	d1c4439a0f	Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option NEW Module Agenda: Add option - Show linked object into agenda view	2017-05-19 17:23:54 +02:00
Laurent Destailleur	b35b40e2bf	Align position of right	2017-05-19 17:08:42 +02:00
Laurent Destailleur	f65b29c135	FIX #6867 - Rewrite code to solve regression (not mixing array/string type and solve php warnings). Also restore $langs as a global var.	2017-05-19 16:57:38 +02:00
Laurent Destailleur	2a0a0f12f3	Merge pull request #6867 from OPEN-DSI/core_dict_actioncomm_modify_color_position NEW Core dictionaries: Adds the ability to change the color and position …	2017-05-19 16:33:05 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
KHELIFA	2382a0a4ee	Core dictionaries: Adds the ability to change the color and position of the dictionary 'Types of agenda events'	2017-05-19 10:46:29 +02:00
Laurent Destailleur	7dbe3b1da9	Merge pull request #6843 from aspangaro/6.0-multijournal Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-18 17:45:21 +02:00
Laurent Destailleur	dff7d00d2b	Look and feel v6	2017-05-18 13:13:18 +02:00
Laurent Destailleur	4a46480ef5	Fix preview of PDF contract	2017-05-18 12:40:20 +02:00
KHELIFA	169859b708	Module Agenda: Add option - Show linked object into agenda view	2017-05-17 17:00:45 +02:00
Sergio Sanchis Climent	1a98886aa3	FIX: #6813	2017-05-17 00:42:29 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Laurent Destailleur	cc16bb0bef	Debug default value feature.	2017-05-16 12:22:55 +02:00
Laurent Destailleur	789fbb6dc3	Enhance tooltips	2017-05-15 12:57:08 +02:00
Alexandre SPANGARO	93554b7e30	Typo searchpicto	2017-05-14 21:06:33 +02:00
Laurent Destailleur	553f5b990c	Fix scrutinizer errors	2017-05-13 18:50:55 +02:00
Laurent Destailleur	b09300ab61	NEW Can edit background color for odd and even lines in tables	2017-05-11 13:02:29 +02:00
Laurent Destailleur	2199c525bc	Merge pull request #6805 from grandoc/new_branch_06_05 Update code using new css class	2017-05-10 22:51:31 +02:00
Laurent Destailleur	578eb98b33	Better user interface	2017-05-10 13:13:33 +02:00
Laurent Destailleur	b8b91db007	Use function top_httphead to include headers in pages.	2017-05-09 21:46:57 +02:00
Laurent Destailleur	9fe28c9b2c	NEW Can disable all overwrote translations in one click.	2017-05-09 10:08:04 +02:00
Laurent Destailleur	05d6c2cd75	Fix no more use of constant	2017-05-09 01:36:20 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +02:00
Laurent Destailleur	910a925167	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
Laurent Destailleur	d948447600	Add button to disable all personalized default values in one click.	2017-05-06 17:08:38 +02:00
Philippe Grand	fe50dabf42	Merge branch 'develop' into new_branch_20_04	2017-05-06 11:05:33 +02:00
philippe grand	55feea5d98	Update code using new css class	2017-05-06 10:54:28 +02:00
Laurent Destailleur	56140ae572	Work on default focus	2017-05-06 01:09:22 +02:00
Laurent Destailleur	5e6b2897ad	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 22:57:52 +02:00
Laurent Destailleur	d53654e64f	Look and feel v6	2017-05-05 20:45:06 +02:00
Laurent Destailleur	fb58dfa898	Merge pull request #6752 from grandoc/new_branch_24_04 Update code using new css class	2017-05-05 19:08:38 +02:00
Laurent Destailleur	68b63927e0	Maxi miscellaneous debug	2017-05-05 12:33:49 +02:00
Philippe Grand	b5b79bc36b	Merge branch 'develop' into new_branch_24_04	2017-05-04 21:42:43 +02:00
Philippe Grand	ffe4e48304	Update agenda_other.php	2017-05-04 21:37:27 +02:00
Laurent Destailleur	aa8aa5672b	Merge pull request #6753 from grandoc/new_branch_25_04 Update code using new css class	2017-05-04 21:03:11 +02:00
Laurent Destailleur	626c0d6d5e	Add more substitution keys for PDFs.	2017-05-04 20:40:13 +02:00
Laurent Destailleur	768df56c07	Uniformize name of standard PDF template	2017-05-04 20:16:55 +02:00
Laurent Destailleur	c196e79bf4	Merge branch 'develop' into FIX_inventory	2017-05-04 13:50:53 +02:00
Philippe Grand	4c2f3aeeac	Update compta.php	2017-05-04 13:46:25 +02:00
Philippe Grand	a19268c0a3	Merge branch 'develop' into new_branch_20_04	2017-05-04 13:43:37 +02:00
Laurent Destailleur	7ec46b3bd6	Finished work to have substitution keys code mutualized.	2017-05-04 12:35:45 +02:00
alexis portable	428e16341c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into FIX_inventory	2017-05-02 22:46:33 +02:00
alexis Algoud	6138d197e4	FIX major issues for inventory - Move all needed declaration from coreobject to commonobject for updateCommon, fetchCommon, deleteCommon, createCommon - Just leave method for child object into coreobject, check later if is useless - debug inventory card, PHP 7.0 compatibility - activate rights for inventory into stock module - add inventory options into stock admin module	2017-05-02 15:19:55 +02:00
Laurent Destailleur	ad095d7fb2	NEW Can set margins of PDFs	2017-05-02 14:26:51 +02:00
Laurent Destailleur	9641a240ea	Complete vat dictionnary	2017-05-02 11:27:35 +02:00
Laurent Destailleur	6e1f825190	Look and feel v6	2017-05-01 13:01:05 +02:00
Laurent Destailleur	a9eeb823bd	Fix browser notif	2017-04-30 05:01:53 +02:00
Laurent Destailleur	60951cf307	Less data example	2017-04-30 04:09:50 +02:00
Laurent Destailleur	f5bdfc426f	Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview New inventory coreobject listview	2017-04-29 21:31:46 +02:00
Laurent Destailleur	a8c775dcbd	Fix compatibility with the removal of "constant".	2017-04-29 18:48:30 +02:00
Laurent Destailleur	2e6d865c7d	NEW Can define default values for create forms. NEW Can define default filters for list pages. NEW Can define default sort order for list pages.	2017-04-29 00:44:25 +02:00
phf	8219ff84c8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-04-28 14:45:04 +02:00
Laurent Destailleur	676ff84a4e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-04-28 14:05:42 +02:00
Laurent Destailleur	defce63a24	Work on management of default values	2017-04-28 14:05:28 +02:00
Laurent Destailleur	0ba6433a61	Work on module website	2017-04-28 13:10:08 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Laurent Destailleur	5e856e6923	More complete tooltip help to describe available substitution vars	2017-04-27 17:16:19 +02:00
Laurent Destailleur	1a98c4a3ff	Fix error management in adding translation key	2017-04-27 12:48:13 +02:00
Laurent Destailleur	aa4b967e17	FIX image of rss when link is relative Fix regression after disabling constant init.	2017-04-26 11:46:12 +02:00
philippe grand	e2dbcb2b5a	Update code using new css class	2017-04-25 11:59:18 +02:00
Laurent Destailleur	113d4d1665	FIX spaces not allowed into vat code	2017-04-25 10:29:13 +02:00
philippe grand	0c7cfdb037	Update code using new css class	2017-04-24 16:36:58 +02:00
philippe grand	635894cf10	Update code using new css class	2017-04-20 14:51:36 +02:00
Juanjo Menent	4e2f4fd48b	Merge pull request #6699 from grandoc/new_branch_12_04 Update code using new css class	2017-04-19 16:10:02 +02:00
Philippe Grand	88f771a7f1	Merge branch 'develop' into new_branch_12_04	2017-04-19 11:49:26 +02:00
Philippe Grand	a88d6425d7	Merge branch 'develop' into new_branch_13_04	2017-04-19 11:38:28 +02:00
Laurent Destailleur	3da0aea168	Prepare code to use different SMTP servers.	2017-04-18 01:39:06 +02:00
Laurent Destailleur	0994622bf8	NEW Can use translations into all substitutions (watermark, freetext...)	2017-04-17 23:54:09 +02:00
Laurent Destailleur	b0442aa56a	Better explanation on label that are translated.	2017-04-14 19:48:01 +02:00
Laurent Destailleur	e2c31b5f23	Fix regression	2017-04-14 18:43:34 +02:00
Laurent Destailleur	db73eeba5c	NEW Can filter on code in dictionnaries	2017-04-14 16:31:16 +02:00
Laurent Destailleur	846204bdb4	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
Laurent Destailleur	4818b1ba44	Load default values into $user->default_values	2017-04-14 12:39:11 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
philippe grand	1d546462dd	Update code using new css class	2017-04-13 15:59:51 +02:00
philippe grand	edaa3ae672	Update code using new css class	2017-04-12 17:44:01 +02:00
Laurent Destailleur	423ffefbf3	NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN_LINKTO	2017-04-11 18:18:36 +02:00
Laurent Destailleur	2446cb5431	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/compta/facture.php htdocs/compta/facture/fiche-rec.php htdocs/contact/list.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/facture/card.php htdocs/societe/list.php htdocs/user/document.php	2017-04-11 11:43:54 +02:00
Laurent Destailleur	d15792bdf4	Minor fix	2017-04-11 00:59:47 +02:00
Laurent Destailleur	9b45776941	Fix responsive	2017-04-10 17:25:53 +02:00
Laurent Destailleur	06f9c1989b	Work on default values	2017-04-10 13:14:31 +02:00
Laurent Destailleur	f1ae0eb7c6	Default value	2017-04-10 12:51:52 +02:00
Marcos García de La Fuente	da0af36086	FIX #6671 Cannot remove thirdparty type with "#" in its name Close #6671	2017-04-09 14:51:15 +02:00
Laurent Destailleur	bb7c164752	Work on page to set/edit default values	2017-04-08 14:18:10 +02:00
Laurent Destailleur	f598bf8bef	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-04-06 21:59:11 +02:00
Laurent Destailleur	a6c60e4a9a	FIX shared bank account with multicompany not visible in invoice setup	2017-04-05 11:14:02 +02:00
Laurent Destailleur	6d81f29835	Merge pull request #6578 from inoveaconseil/patch-1 Update pdf.php	2017-03-31 18:07:03 +02:00
Laurent Destailleur	01a74a8d23	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
Laurent Destailleur	979bcd3a9b	NEW Can add a background image on login page	2017-03-31 11:40:31 +02:00
Laurent Destailleur	18e1e5b780	NEW Add "depends on" and "required by "into module informations	2017-03-30 15:54:48 +02:00
Laurent Destailleur	4df8dcf980	Work on module modBlockedLog and modModuleBuilder	2017-03-29 21:50:15 +02:00
Laurent Destailleur	54b03a3552	Work on 6.0 new look and feel	2017-03-29 11:03:13 +02:00
phf	c3e8a5be62	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-28 17:20:50 +02:00
Laurent Destailleur	219bcb0d54	Work on 6.0 features.	2017-03-27 22:44:50 +02:00
Laurent Destailleur	9f0328ab7f	Hidden for the moment because option specific to one theme only.	2017-03-26 13:11:01 +02:00
Laurent Destailleur	95fbe0147d	Merge pull request #6585 from defrance/patch-99 display input border by setting	2017-03-26 13:06:48 +02:00
Laurent Destailleur	9a85e5ef00	Enhance the file checker	2017-03-26 01:45:09 +01:00
Laurent Destailleur	8c2b70c4a7	Fix filechecker	2017-03-25 20:51:02 +01:00
BENKE Charlie	acfdc96121	Border input display is allowed by setting	2017-03-25 19:34:04 +01:00
Inovea Conseil	447607ecd9	Update pdf.php Missing translate #6577	2017-03-25 12:46:32 +01:00
atm-ph	edc2d39702	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-24 17:06:40 +01:00
Laurent Destailleur	3adb43c6e5	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/langs/en_US/bills.lang htdocs/product/class/product.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-23 12:52:19 +01:00
Laurent Destailleur	fec3a89aa5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 11:38:46 +01:00
Laurent Destailleur	0a35d17207	CSS enhancement	2017-03-23 10:59:13 +01:00
Laurent Destailleur	917ef1e01e	Uniformize code	2017-03-22 20:34:01 +01:00
Laurent Destailleur	b5e646daa0	NEW Show by default README.md file found into root dir of ext module.	2017-03-21 16:43:09 +01:00
Laurent Destailleur	a5c11dc840	NEW Add function dolMd2Html	2017-03-21 16:03:13 +01:00
Laurent Destailleur	5b4bb56012	No more need of $bc[$var]	2017-03-21 12:13:02 +01:00
Laurent Destailleur	d9abe553cf	Useless bottom-border	2017-03-21 10:54:47 +01:00
Laurent Destailleur	967f3f579d	Fix translation	2017-03-18 20:07:37 +01:00
Laurent Destailleur	49624c7b68	Useless bottom-border	2017-03-18 19:57:33 +01:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +01:00
Laurent Destailleur	4bf0e31299	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-11 02:40:42 +01:00
Laurent Destailleur	c3179963ca	Fix search fails under certain circumstances.	2017-03-10 14:59:57 +01:00
Laurent Destailleur	c72e7c1057	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php	2017-03-10 14:54:35 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
Laurent Destailleur	fda84995e8	If manage zero is set, we must NOT set length. So we can here make a shortcut to avoid useless code.	2017-03-10 11:50:57 +01:00
Laurent Destailleur	c962daabac	NEW add property to show warnings when activating modules	2017-03-09 15:16:16 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
arnaud	abeba95de9	New USER odt	2017-03-02 15:13:42 +01:00
Laurent Destailleur	0f22beb774	Upgrade to ckeditor 4.6.2.	2017-02-28 10:49:58 +01:00
Laurent Destailleur	74e8fb9c19	NEW Can set number of dump to keep with job "local database backup"	2017-02-27 02:04:25 +01:00
BENKE Charlie	a2611e31fe	add selectform choice for private mailing better usability than enter 0 ou 1 value	2017-02-24 11:12:14 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Laurent Destailleur	86c399db70	Clean admin menu entries	2017-02-22 02:32:35 +01:00
Laurent Destailleur	d5bb208957	Clean admin menu entries	2017-02-22 02:19:50 +01:00
Laurent Destailleur	eef3824f8c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang	2017-02-21 10:34:52 +01:00
Laurent Destailleur	89d10ae5aa	Fix the accounting account groups must be editable by book keeper, not admin user.	2017-02-20 11:21:38 +01:00
arnaud	4ec664029d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment	2017-02-17 16:40:14 +01:00
Laurent Destailleur	8d03f86f45	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 13:10:46 +01:00
Laurent Destailleur	bde6815e5d	Merge pull request #6425 from GPCsolutions/5.0-multicurrency-error Fix: [Multicurrency] properly display API error	2017-02-17 10:45:45 +01:00
Laurent Destailleur	c3d78bf1b4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/tools/update.php	2017-02-16 22:09:37 +01:00
Laurent Destailleur	a1ba4aa941	NEW: No external check of version without explicit click in about page.	2017-02-16 02:27:07 +01:00
Laurent Destailleur	ea4a83838c	Missing not visible paramater	2017-02-15 18:30:27 +01:00
Raphaël Doursenaud	d9f32f7ae1	Fix: [Multicurrency] properly display API error	2017-02-15 13:20:38 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +01:00
Laurent Destailleur	bcd624e5a5	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-13 01:37:53 +01:00
Laurent Destailleur	25e8caa64e	Fix reversing test for a test	2017-02-13 01:37:12 +01:00
Laurent Destailleur	868f2e5473	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/tools/update.php htdocs/core/lib/functions.lib.php	2017-02-13 01:36:02 +01:00
Laurent Destailleur	ae740b7c1b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/langs/en_US/errors.lang	2017-02-13 01:19:30 +01:00
Laurent Destailleur	bf32acaadd	Fix control of module format.	2017-02-13 01:13:41 +01:00
Laurent Destailleur	cda301f6b7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-12 20:51:52 +01:00
Laurent Destailleur	d4fd9bd71e	Merge pull request #6414 from laudeco/fix/dictionnary_without_rowid [FIX] Dictionaries without rowid	2017-02-12 20:46:43 +01:00
Laurent Destailleur	a8c5ba2983	Fix php7 error	2017-02-12 20:40:20 +01:00
Laurent Destailleur	5233b8c87f	Fix support for option MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES	2017-02-12 18:38:24 +01:00
Laurent Destailleur	05c9f57fd4	Move edition of emails templates out of dictionaries so we would be able to have templates per user (not reserved to admin).	2017-02-12 18:13:49 +01:00
Laurent Destailleur	f34e0b1bdb	NEW Can deploy an external module from the module setup area.	2017-02-11 15:41:01 +01:00
Laurent Destailleur	4723eac227	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-11 13:56:39 +01:00
Laurent Destailleur	f6a8aacc8d	Fix: deployement of a module	2017-02-10 18:42:59 +01:00
arnaud	4230b075c2	INIT pdf supplier payment	2017-02-10 17:28:00 +01:00
Laurent Destailleur	44ab6ad9b7	NEW Can control constants values into file integrity checker	2017-02-10 17:05:45 +01:00
De Coninck Laurent	4fb4bc6f6c	[FIX] Dictionnaries without rowid It's possible to create a dictionnary without the key rowid. But in that case it's impossible to enable/disable the value because the dictionnary fonctionality uses always rowid even another primary key is defined. By this fix, the id property uses is the primary key defined on the dictionnary creation.	2017-02-10 10:29:08 +01:00
Laurent Destailleur	488d68113d	Add total in the file integrity checker	2017-02-09 12:56:39 +01:00
Laurent Destailleur	fbe0b13706	Add parameter to set the url to use for the file integrity checker	2017-02-09 01:07:54 +01:00
Laurent Destailleur	b250485efd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-08 11:00:19 +01:00
Laurent Destailleur	31c3398b7f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/modules.php	2017-02-08 10:59:05 +01:00
Laurent Destailleur	dc0856413c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-08 10:57:02 +01:00
florian HENRY	7fcf598c78	Fix travis	2017-02-08 08:52:58 +01:00
Laurent Destailleur	d56b5f30c8	FIX #6330	2017-02-07 01:34:21 +01:00
Laurent Destailleur	e58743ea5b	Fix regression: Textarea to enter data was crushed.	2017-02-07 01:13:04 +01:00
Laurent Destailleur	74992ee53f	Merge pull request #6375 from marcosgdf/admin-view Little improvements to admin pages where a FREE_TEXT or a watermark constant was set	2017-02-06 20:11:22 +01:00
Laurent Destailleur	9220a638b5	NEW Filechecker can include custom dir and report added files.	2017-02-06 15:29:07 +01:00
Laurent Destailleur	fea2b081f9	Fix: The long description feature will be available with 6.0. Large content creates problem with tooltip.	2017-02-04 14:17:55 +01:00
Laurent Destailleur	a673afe601	NEW Description of feature of a module into a dedicated popup	2017-02-04 14:16:17 +01:00
Marcos García de La Fuente	a94a951a89	Little improvements to admin pages where a FREE_TEXT or a watermark constant was set	2017-02-03 19:38:33 +01:00
Laurent Destailleur	c48400331f	Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date NEW get multicurrency rate from document date (propal, order)	2017-01-27 01:32:52 +01:00
Laurent Destailleur	29df2c9115	Merge branch 'develop' into mail-lines	2017-01-27 01:29:58 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	809e3ce4d5	Debug browser notification	2017-01-20 20:10:16 +01:00
Juanjo Menent	2374aa351e	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-20 15:55:51 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
Laurent Destailleur	bb95f139a8	Fix responsive	2017-01-17 20:04:41 +01:00
BENKE Charlie	e701ea0b2f	Add dictionnary mail for contract	2017-01-16 14:06:34 +01:00
Laurent Destailleur	f5458b4337	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/admin/modules.php htdocs/core/class/html.formfile.class.php htdocs/product/stats/card.php	2017-01-16 00:48:37 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
Regis Houssin	f9ed1592e1	Fix: search problem if name contains accents	2017-01-15 16:07:04 +01:00
Juanjo Menent	3a40d5a4f1	NEW: Events notifications in browser	2017-01-13 16:13:01 +01:00
Juanjo Menent	6cc3ef0c99	NEW: Events notifications in browser	2017-01-13 16:08:49 +01:00
Alexis Algoud	8b4a43ec77	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-09 10:31:05 +01:00
Laurent Destailleur	b21998d506	Fix global checksum not visible on old versions. Link with checksum file to check was hardcoded.	2017-01-07 15:56:04 +01:00
Laurent Destailleur	358616cda2	Fix link should be https	2017-01-07 15:18:57 +01:00
Laurent Destailleur	680c48d90a	Fix error on expired tokens	2017-01-07 14:48:05 +01:00
Laurent Destailleur	9cfc8d4095	Fix several problems into OAuth2 module.	2017-01-06 19:58:46 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Alexis Algoud	370be70e46	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-03 16:30:50 +01:00
Ion Agorria	522fb4cf7a	Add email template for each line in object	2016-12-31 17:39:01 +01:00
Rabouin Geoffroy	a277a6f190	Typo in SQL request	2016-12-28 10:26:31 +01:00
Laurent Destailleur	c5850d29e7	Fix checksum integrity. Also add a global checksum.	2016-12-26 19:51:24 +01:00
Laurent Destailleur	83a8fcb7f9	Fix filecheck tool.	2016-12-26 19:01:24 +01:00
Laurent Destailleur	374a6d7783	Fix filecheck tool.	2016-12-26 18:50:20 +01:00
Laurent Destailleur	c16489a3c0	Fix add message to explain why some emails fails	2016-12-25 23:14:51 +01:00
Laurent Destailleur	7e2b41402e	Fix bad balance of form	2016-12-23 16:24:07 +01:00
Laurent Destailleur	77c320a092	Fix warning for expense report late	2016-12-22 15:33:43 +01:00
Laurent Destailleur	3c79f3acb5	Minor fixes or code comment	2016-12-20 12:06:26 +01:00
Laurent Destailleur	4d624fd875	Debug feature to choose email "from"	2016-12-20 11:23:44 +01:00
Laurent Destailleur	b3d5f40f37	Merge pull request #6166 from atm-gauthier/3.9_fix_wrong_test FIX : wrong test on dict.php	2016-12-18 10:58:32 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
Laurent Destailleur	c750ba8b99	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/install/mysql/data/llx_c_payment_term.sql htdocs/langs/en_US/bills.lang htdocs/langs/en_US/mails.lang	2016-12-16 13:56:55 +01:00
Laurent Destailleur	929904041d	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 Conflicts: htdocs/conf/conf.php.example htdocs/langs/en_US/mails.lang	2016-12-16 13:53:34 +01:00
Laurent Destailleur	534e2b1282	FIX Security to restrict email sending was not efficient	2016-12-16 13:46:39 +01:00
Alexis Algoud	b7a6a71dff	move file to core	2016-12-15 17:20:46 +01:00
gauthier	4dd740fe2f	FIX : wrong test on dict.php	2016-12-13 11:41:26 +01:00
Laurent Destailleur	5187ffcc9a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-12 13:03:37 +01:00
Laurent Destailleur	4e86e59fb3	Fix responsive	2016-12-12 13:02:54 +01:00
Laurent Destailleur	7077b4931c	Add dump v5	2016-12-12 11:57:50 +01:00
tarrsalah	eb6620f6f6	fix (#6158 )default localtax1 and localtax2 values.	2016-12-11 17:56:49 +01:00
phf	f5bffeb535	New get multicurrency rate from document date (propal, order)	2016-12-11 16:30:01 +01:00
Maxime Kohlhaas	194639c30e	Missing lang in admin	2016-12-10 22:41:57 +01:00
Maxime Kohlhaas	3ab23ecb7e	Better currency rate setup	2016-12-10 22:40:25 +01:00
BENKE Charlie	b74071dc73	Better display on internal/external module info	2016-12-10 19:35:58 +01:00
Laurent Destailleur	211436b436	Better responsive	2016-12-04 01:14:09 +01:00
Laurent Destailleur	8c428ac5b7	Fix responsive design	2016-12-04 00:51:15 +01:00
Laurent Destailleur	81a3235cf6	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/list.php htdocs/fourn/facture/card.php htdocs/fourn/facture/list.php	2016-12-03 16:01:18 +01:00
Laurent Destailleur	711961ed18	Fix missing translation	2016-11-29 17:24:40 +01:00
Laurent Destailleur	c33e486828	Fix order of option and picto	2016-11-29 10:42:10 +01:00
Laurent Destailleur	2e5634e60f	Fix responsive design	2016-11-27 14:21:23 +01:00
Laurent Destailleur	60c494fd5f	Missing dolibarr version in dump file	2016-11-26 17:48:06 +01:00
aspangaro	638563dc5d	Fix missing language key in holiday type dictionary	2016-11-22 05:54:44 +01:00
aspangaro	6e66d529f0	Fix missing language key for lead status dictionary	2016-11-22 05:33:33 +01:00
aspangaro	38a31cbd28	Fix missing key language in dictionary email models	2016-11-22 05:25:08 +01:00
aspangaro	213e7d1cd7	Fix Missing language key for dictionary format card	2016-11-21 21:49:08 +01:00
aspangaro	31dd20ec7c	Spaces	2016-11-20 22:59:13 +01:00
Laurent Destailleur	ad981a0f07	FIX the key for getEntity was different for same element.	2016-11-18 12:54:08 +01:00
Laurent Destailleur	bfd1ce0095	Fix translation	2016-11-14 15:25:45 +01:00
Laurent Destailleur	b44c746c2e	Fix table disabled	2016-11-13 18:31:22 +01:00
Laurent Destailleur	6d70d39bbd	NEW Add type "url" as possible extrafield.	2016-11-08 17:21:26 +01:00
Laurent Destailleur	7a94cfc994	NEW Better filtering of automatic/manually inserted events.	2016-11-08 13:03:20 +01:00
Laurent Destailleur	341e014a3d	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/don/document.php	2016-11-08 11:36:31 +01:00
Laurent Destailleur	bcd3a1a888	NEW Default collation for mysql is now utf8_unicode_ci	2016-11-07 01:53:34 +01:00
Laurent Destailleur	961f7a4e48	Fix label on tab	2016-11-07 00:32:28 +01:00
Laurent Destailleur	4681c84e1d	Better responsive	2016-11-06 12:16:10 +01:00
Laurent Destailleur	a658b7cc3d	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/comm/card.php	2016-10-31 21:31:57 +01:00
Laurent Destailleur	ffe4ae5915	Fix php7 compatibility	2016-10-31 21:24:23 +01:00
Laurent Destailleur	32b6660f63	Uniformize code	2016-10-29 16:18:39 +02:00
Laurent Destailleur	38e6c9cc57	Fix multientity on overwritting translation not yet supported.	2016-10-28 22:47:37 +02:00
Laurent Destailleur	0847dba26d	Keep option hidden	2016-10-26 12:43:05 +02:00
Laurent Destailleur	d27ffd4194	Merge pull request #5393 from frederic34/patch-10 NEW Add admin parameter BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDE for supplier order	2016-10-26 11:48:02 +02:00
Laurent Destailleur	f1421a2ee4	Rename constant with english name	2016-10-24 13:10:35 +02:00
Laurent Destailleur	fdcc858008	Merge branch 'dev_resource_extrafields' of https://github.com/atm-florian/dolibarr into atm-florian-dev_resource_extrafields Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-10-24 02:05:34 +02:00

... 19 20 21 22 23 ...

6196 Commits