8417 Commits

Author	SHA1	Message	Date
Philippe GRAND	67bbead7c1	Standardize and update code	2018-09-20 17:46:39 +02:00
Philippe GRAND	e1a03c49cf	Standardize and update code	2018-09-20 17:19:42 +02:00
Philippe GRAND	43edc64e7f	Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018	2018-09-20 16:57:10 +02:00
Laurent Destailleur	e0dfab4c71	FIX The max size for upload file was not corectly shown	2018-09-20 16:21:36 +02:00
Laurent Destailleur	c6470d49b0	FIX The max size for upload file was not corectly shown	2018-09-20 16:21:08 +02:00
Philippe GRAND	5979db7733	Standardize and update code	2018-09-20 12:07:23 +02:00
Laurent Destailleur	12b449fe49	It's easier to select fields to show on list	2018-09-19 16:41:33 +02:00
Laurent Destailleur	4580ed0b09	Fix bad link	2018-09-18 15:31:25 +02:00
Laurent Destailleur	b67392b016	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-18 15:18:16 +02:00
Laurent Destailleur	52b6dd16da	Standardize code	2018-09-18 15:18:07 +02:00
Laurent Destailleur	61f5a2e899	Merge pull request #9533 from frederic34/trimParameters ... trimParameters function	2018-09-18 15:04:32 +02:00
Laurent Destailleur	1c13fbb122	Merge pull request #9532 from frederic34/patch-17 ... reduce complexity of commoninvoice class	2018-09-18 15:03:25 +02:00
Philippe GRAND	cd796bf682	Standardize and update code	2018-09-17 12:29:21 +02:00
Philippe GRAND	484b36c5aa	Standardize and update code	2018-09-17 09:31:32 +02:00
Laurent Destailleur	0bf540b3c1	Fix regression in edition of date	2018-09-17 09:17:11 +02:00
wdammak	b17c44c665	Update html.form.class.php ... Add the ability to sort products by category	2018-09-16 16:53:35 +01:00
Frédéric FRANCE	b950043618	trimParameters	2018-09-16 15:16:08 +02:00
Frédéric FRANCE	f9441d3249	Update commoninvoice.class.php	2018-09-16 14:07:11 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	cc4fbfc3ef	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/commonobject.class.php	2018-09-16 12:54:39 +02:00
Laurent Destailleur	10c6bc44ca	Fix scrutinizer	2018-09-16 10:28:41 +02:00
Laurent Destailleur	d6ee00f2e7	Fix constructors does not need return value	2018-09-16 10:22:23 +02:00
Laurent Destailleur	e90a60d4ee	Remove warnings	2018-09-16 10:09:19 +02:00
Laurent Destailleur	eebd329c7c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modAgenda.class.php htdocs/core/modules/modFacture.class.php htdocs/langs/en_US/admin.lang htdocs/langs/en_US/main.lang htdocs/stripe/transaction.php	2018-09-16 09:50:13 +02:00
Philippe Grand	1d82825afa	Update html.formsms.class.php	2018-09-15 21:34:55 +02:00
Laurent Destailleur	69dcdcbe75	Merge pull request #9509 from grandoc/new_branch_14_09_2018 ... Standardize and update code	2018-09-15 17:30:14 +02:00
Laurent Destailleur	76cdbc8bf1	Merge branch 'develop' into testsqlAndScript	2018-09-15 17:01:23 +02:00
Laurent Destailleur	bbfe4462dc	NEW Add lib for multiselect with checkboxes ... NEW Can select several prospect level in thirdparty filter. Remove old multiselect lib that was not used by core.	2018-09-15 13:31:25 +02:00
Philippe GRAND	18f4755a90	Standardize and update code	2018-09-14 10:20:21 +02:00
John BOTELLA	ec23cd0da4	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files	2018-09-14 09:54:14 +02:00
Philippe Grand	51ba970eaf	Update html.formsms.class.php	2018-09-14 09:33:16 +02:00
Philippe GRAND	3da762a59d	Standardize and update code	2018-09-13 15:06:06 +02:00
tarrsalah	08453a5337	FIX #9497 ... Extract $defaultcode and $defaulttxt from the value returned by get_default_tva function .	2018-09-13 11:04:11 +01: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	163bc55e4a	Merge pull request #9468 from jmarsac/numericextrafields9464 ... Convert localized numeric extrafields value before inserting/updating	2018-09-12 19:06:43 +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	358bc7ab1b	Merge pull request #9454 from frederic34/patch-16 ... Update dolreceiptprinter.class.php	2018-09-12 18:28:10 +02:00
Laurent Destailleur	64d99dd302	Merge pull request #9459 from frederic34/patch-18 ... Completely comment unused code	2018-09-12 18:21:51 +02:00
Philippe GRAND	69bf43f851	Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018	2018-09-12 14:48:50 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Laurent Destailleur	53da80a79f	FIX Missing translation in predefined email to membership renewal	2018-09-12 12:55:10 +02:00
Jean-Marie Arsac	345c24990e	Correction of variable name	2018-09-11 20:51:54 +02:00
Jean-Marie Arsac	2f2dff8155	Convert localized numeric extrafields value before inserting ... - add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()	2018-09-11 14:57:31 +02:00
Philippe GRAND	b4cbb0561d	Standardize and update code	2018-09-11 10:36:39 +02:00
Frédéric FRANCE	2995208e5b	Completely comment unused code	2018-09-11 00:36:44 +02:00
Frédéric FRANCE	a36f41728f	deprecate formbarcode:form_barcode_type	2018-09-10 23:58:57 +02:00
Frédéric FRANCE	312a606345	deprecate formbarcode:select_barcode_type	2018-09-10 23:50:48 +02:00
Laurent Destailleur	d011204624	Fix switch of extrafields between all and only one entity	2018-09-10 17:36:46 +02:00
Frédéric FRANCE	2589b23464	Update dolreceiptprinter.class.php	2018-09-10 17:25:35 +02:00
Regis Houssin	43ac51b44c	FIX remove debug	2018-09-10 10:11:07 +02:00
Regis Houssin	8699866062	FIX better compatibility with multicompany	2018-09-10 10:08:04 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Frédéric FRANCE	8249756726	replace select_date	2018-09-09 10:40:00 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	ac8f568604	replace select_date by selectDate	2018-09-08 12:47:27 +02:00
Frédéric FRANCE	cb97a29fc0	introduce seletDate	2018-09-08 12:00:11 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Frédéric FRANCE	70ba223788	move phpcs:ignore	2018-09-06 21:27:18 +02:00
Philippe GRAND	97c740f510	Merge branch 'develop' of github.com:grandoc/dolibarr into develop	2018-09-06 19:28:10 +02:00
Frédéric FRANCE	3ecf788438	move phpcs:ignore	2018-09-06 18:29:01 +02:00
Frédéric FRANCE	4cbfa2073a	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 21:02:16 +02:00
Frédéric FRANCE	85df267a5b	move phpcs:ignore	2018-09-05 20:36:44 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +02:00
Frédéric FRANCE	f7c3ca9d20	move phpcs:ignore	2018-09-05 18:49:06 +02:00
Laurent Destailleur	cb89942bfb	Add option capture on input file for photo	2018-09-05 16:03:10 +02:00
Frédéric FRANCE	ecc6c118a6	move phpcs:ignore	2018-09-04 23:26:37 +02:00
Frédéric FRANCE	7799774ca1	move phpcs:ignore	2018-09-04 22:52:55 +02:00
Frédéric FRANCE	3847df1de6	move phpcs:ignore	2018-09-04 21:53:53 +02:00
Laurent Destailleur	ab8155f170	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php	2018-09-04 21:35:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	fd6281b364	move phpcs:ignore	2018-09-04 20:00:09 +02:00
Philippe Grand	c32c67ca57	Merge branch 'develop' into develop	2018-09-04 16:58:59 +02:00
Philippe GRAND	50a26aaf16	fix merge	2018-09-04 14:33:34 +02:00
Philippe GRAND	42565e722e	Standardize and update code	2018-09-04 13:37:00 +02:00
Philippe GRAND	0492492df1	fix merge	2018-09-04 12:30:06 +02:00
Ferran Marcet	b658626e21	NEW: Highlight lines on lists when they are checked	2018-09-04 11:54:13 +02:00
Laurent Destailleur	f2ec94e9fd	FIX #9353 Bug: html error - div inside span on graphs	2018-09-04 11:13:54 +02:00
Laurent Destailleur	c59b0f95e6	FIX #9403	2018-09-04 10:10:47 +02:00
Frédéric FRANCE	d08b68e8ed	move phpcs:ignore	2018-09-03 20:38:52 +02:00
Frédéric FRANCE	7288335c6d	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-03 19:01:11 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Regis Houssin	912c05774b	FIX remove deprecated triggers USER_LOG*	2018-09-03 09:30:36 +02:00
Frédéric FRANCE	e4946cc8eb	move phpcs:ignore	2018-09-03 00:03:17 +02:00
Frédéric FRANCE	9c3352d2de	move phpcs:ignore	2018-09-02 23:44:53 +02:00
Frédéric FRANCE	47e73bfd8e	move phpcs:ignore	2018-09-02 23:01:14 +02:00
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +02:00
Frédéric FRANCE	b05c175a78	Merge remote-tracking branch 'upstream/develop' into testsqlAndScript	2018-09-02 19:00:43 +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	a68f5cad77	Fix syntax error	2018-09-02 17:18:19 +02:00
Laurent Destailleur	887a40cf1d	Remove TODO	2018-09-02 16:46:01 +02:00
Laurent Destailleur	3d3edb19d8	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/langs/en_US/commercial.lang	2018-09-02 15:48:26 +02:00
Laurent Destailleur	76d6affb27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: .travis.yml	2018-09-02 15:46:09 +02:00
Frédéric FRANCE	04c1a7d4af	move phpcs:ignore	2018-09-02 13:38:11 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Frédéric FRANCE	b60f7db60a	move phpcs:ignore	2018-09-02 10:43:34 +02:00
Frédéric FRANCE	e98b8e5e25	move phpcs:ignore	2018-09-02 09:27:59 +02:00
Philippe GRAND	ae2df6be11	Standardize and Update code	2018-09-01 23:04:46 +02:00
Philippe GRAND	7b0d3c32ab	Standardize and Update code	2018-09-01 22:55:10 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Frédéric FRANCE	ab9bf78ecf	replace test_sql_and_script_inject	2018-09-01 17:42:16 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps ... mark non camelCaps function	2018-09-01 15:37:56 +02:00
Philippe GRAND	f77dd2ebc7	Standardize and update code	2018-09-01 15:13:59 +02:00
Laurent Destailleur	2301ecf1dc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-01 14:51:20 +02:00
Philippe GRAND	8d7dfaf98c	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:49:42 +02:00
Laurent Destailleur	945e925399	Update html.form.class.php	2018-09-01 14:41:44 +02:00
Laurent Destailleur	e4e1bf5a1a	Merge pull request #9361 from frederic34/patch-19 ... Update discount.class.php	2018-09-01 14:30:16 +02:00
Philippe GRAND	17e349eba2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 14:27:53 +02:00
Laurent Destailleur	359eebbbec	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-01 14:26:48 +02:00
Laurent Destailleur	08bc81a7ab	Merge pull request #9370 from joseplluis/patch-5 ... NEW optional param to show a specific extrafield	2018-09-01 14:24:23 +02:00
Laurent Destailleur	bc71aef7b4	Code comment	2018-09-01 14:24:02 +02:00
Philippe GRAND	7b47c79bc3	precise label comment	2018-09-01 14:06:58 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Philippe GRAND	b59d49d3b3	Merge remote-tracking branch 'upstream/develop' into develop	2018-09-01 13:58:33 +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	06355f7f08	Merge pull request #9362 from frederic34/patch-20 ... Update ldap.class.php	2018-09-01 13:28:32 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing ... function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	b863b5176d	Merge pull request #9322 from grandoc/new_branch_29_08_2018 ... New branch 29 08 2018	2018-09-01 12:11:01 +02:00
Frédéric FRANCE	9454f897ef	doxygen fix	2018-09-01 09:40:50 +02:00
Philippe GRAND	3a8bde227b	Standardize and update code	2018-08-31 19:26:08 +02:00
Philippe GRAND	edaa575435	Standardize and update code	2018-08-31 18:36:15 +02:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Josep Lluís	78c0aa437f	NEW optional param to show a specific extrafield ... Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas. For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));	2018-08-31 17:16:27 +02:00
atm-ph	102b698c76	Fix search company by code	2018-08-31 11:38:45 +02:00
Frédéric FRANCE	26c0244dbb	Update ldap.class.php	2018-08-30 23:13:16 +02:00
Frédéric FRANCE	4ad5201a16	Update discount.class.php	2018-08-30 23:10:09 +02:00
Philippe Grand	b3c84ac3bc	Merge branch 'develop' into new_branch_29_08_2018	2018-08-30 12:09:40 +02:00
Philippe GRAND	2e66c65650	WTF...	2018-08-30 12:03:20 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Laurent Destailleur	86d8513138	Merge pull request #9309 from frederic34/trimtrailing2 ... last trimtrailing	2018-08-29 17:57:05 +02:00
Laurent Destailleur	7bf48b8d77	Fix date_start and date_end not saved on supplier invoice ... Conflicts: htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2018-08-29 17:26:41 +02:00
Laurent Destailleur	98356c6ed0	Fix date_start and date_end not saved on supplier invoice	2018-08-29 17:03:18 +02:00
Frédéric FRANCE	0e512cbc36	Merge remote-tracking branch 'upstream/develop' into trimtrailing2	2018-08-29 15:47:55 +02:00
Laurent Destailleur	ee204e2e64	Fix regression in php style	2018-08-29 15:37:35 +02:00
Philippe GRAND	660f02f5a6	Fix white spaces	2018-08-29 12:35:56 +02:00
Philippe GRAND	32a9e35a6a	Fix white spaces	2018-08-29 12:31:36 +02:00
Philippe Grand	6fc813254b	Update html.formmail.class.php	2018-08-28 10:43:13 +02:00
Philippe Grand	b73fd487c0	Update ctyperesource.class.php	2018-08-28 10:41:54 +02:00
Philippe Grand	1856fb8946	Update ctyperesource.class.php	2018-08-28 10:41:26 +02:00
Philippe GRAND	65af8f902f	Update and standardize code	2018-08-28 09:44:54 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Frédéric FRANCE	1182f29864	trimtrailing	2018-08-28 08:33:02 +02:00
Laurent Destailleur	9c6ce4b29d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-28 02:36:15 +02:00
Laurent Destailleur	2db84a679e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/modulebuilder/index.php	2018-08-28 02:35:45 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing ... Trimtrailing	2018-08-28 02:30:02 +02:00
Laurent Destailleur	0a7ce338f9	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/commondocgenerator.class.php	2018-08-28 02:23:34 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 ... Update and standardize code	2018-08-28 02:13:28 +02:00
Frédéric FRANCE	faa29f9ae0	Update antivir.class.php	2018-08-28 01:34:42 +02:00
Laurent Destailleur	004b352e8e	Merge pull request #9279 from frederic34/patch-11 ... FIX Error message when sending a file with .virus extension	2018-08-28 01:26:04 +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	e67e32c023	Add forcecombo on select language	2018-08-24 15:25:18 +02:00
Laurent Destailleur	b22d9db1a5	Fix tdclass	2018-08-24 15:18:19 +02:00
Laurent Destailleur	4885e61240	Fix tdclass	2018-08-24 15:16:03 +02:00
Laurent Destailleur	9f92974e98	Fix tdclass	2018-08-24 15:13:34 +02:00
Laurent Destailleur	32bde2c375	Add tdclass to form confirm for more control	2018-08-24 15:12:47 +02:00
Laurent Destailleur	d2a7c9976b	Fix syntax error	2018-08-24 15:05:57 +02:00
Laurent Destailleur	07407f46a7	Remove colspan	2018-08-24 15:02:19 +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
Philippe GRAND	215677c972	Standardize and update code	2018-08-23 18:17:09 +02:00
Philippe GRAND	74ce0bfea6	Standardize and update code	2018-08-23 16:54:24 +02:00
Philippe GRAND	80b7229174	Standardize and update code	2018-08-23 11:34:55 +02:00
Philippe GRAND	9e900e583d	Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018	2018-08-23 11:13:54 +02:00
Philippe GRAND	aafa16afa5	Update and standardize code	2018-08-23 11:11:46 +02:00
Philippe Grand	e09f7bedd0	Update commonobject.class.php	2018-08-23 09:57:19 +02:00
Philippe GRAND	504b0e3d16	Update and standardize code	2018-08-22 18:34:50 +02:00
Frédéric FRANCE	96f16b7497	Update commondocgenerator.class.php	2018-08-22 17:29:05 +02:00
Laurent Destailleur	b650f7ac17	Fix tab	2018-08-22 13:37:18 +02:00
Laurent Destailleur	c7a241a5db	FIX Get templates in a forced language ... Conflicts: htdocs/core/class/html.formmail.class.php	2018-08-22 13:22:49 +02:00
Laurent Destailleur	c20d556265	FIX Get templates in a forced language	2018-08-22 13:16:55 +02:00
Frédéric FRANCE	d1d6d81f8f	Update antivir.class.php	2018-08-22 11:53:08 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	d91b1fd895	Update and standardize code	2018-08-22 11:06:34 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Laurent Destailleur	3f4714416d	Clean comment	2018-08-21 18:58:10 +02:00
Laurent Destailleur	f8b3ec7b87	Fix PHPCS	2018-08-21 18:57:34 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration ... function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	289f194641	Merge pull request #9058 from defrance/patch-123 ... New : Add total price on dashboard	2018-08-21 13:33:33 +02:00
Laurent Destailleur	b40e32b8c3	Merge pull request #9264 from grandoc/new_branch_17_08_2018 ... standardize code	2018-08-21 12:52:34 +02:00
Laurent Destailleur	26d34422b0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-19 03:01:26 +02:00
Laurent Destailleur	795b2f3d58	FIX Delete file on smartphone	2018-08-19 03:00:11 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +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
Laurent Destailleur	3b245f1b30	Merge pull request #9247 from frederic34/missingReturn ... return comment	2018-08-16 00:35:39 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Laurent Destailleur	ec56ad752c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2018-08-15 14:26:38 +02:00
Frédéric FRANCE	5146ab9177	trim	2018-08-14 15:34:44 +02:00
Frédéric FRANCE	d25fa61998	return comment	2018-08-14 13:14:55 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	3210181a3d	rule for private function is different	2018-08-14 10:21:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	33f0172603	Fix select zip/town	2018-08-13 16:44:49 +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	82e8efe792	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 20:14:14 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Frédéric FRANCE	62db9a4022	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 19:54:03 +02:00
Frédéric FRANCE	6f74ecceaf	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-12 18:21:59 +02:00
Laurent Destailleur	2f559a7edb	Merge pull request #9199 from atm-quentin/FIX_hook_update_price ... NEW Add hook changeRoundingMode in update_price	2018-08-12 18:17:52 +02:00
Laurent Destailleur	3d4d42462c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-12 16:30:21 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
John BOTELLA	d6d8f98f38	add retained warranty cond field and add forms	2018-08-10 15:06:00 +02:00
Laurent Destailleur	2dbb6e258b	FIX Can filter on month in export of blockedlog ... FIX Fingerprint correct in popup	2018-08-09 22:29:02 +02:00
florian HENRY	9024ed9e61	Merge branch '7.0' into 7.0_fhe	2018-08-09 17:47:21 +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
Laurent Destailleur	8d54df4263	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2018-08-08 17:31:23 +02:00
Laurent Destailleur	d79778a67e	Fix reponsive	2018-08-08 17:00:16 +02:00
Juanjo Menent	948bb47040	Merge pull request #9207 from atm-florian/dev_showadressinthirdpartylistoption ... NEW: Add option to display thirdparty adress in combolist	2018-08-08 11:14:22 +02:00
Frédéric FRANCE	9025c452ef	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-07 16:40:03 +02:00
gauthier	a2a8929d0e	NEW : tag odt line_product_ref_fourn for supplier doc lines	2018-08-07 11:45:56 +02:00
ATM-Nicolas	5b15e688af	FIX : PHP warning, undefined index notnull	2018-08-07 09:38:18 +02:00
florian HENRY	45a52a955e	NEW: Add optoin to display thirdparty adress in combolist	2018-08-06 10:52:10 +02:00
florian HENRY	0d85eb52c5	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0	2018-08-03 17:10:26 +02:00
florian HENRY	615ed11534	fix bad use of test_sql_and_script_inject return int not value tested	2018-08-03 17:09:58 +02:00
atm-quentin	c97e2db089	Merge branch '7.0' of github.com:Dolibarr/dolibarr into FIX_hook_update_price	2018-08-03 11:49:00 +02:00
atm-quentin	6662bf05ba	FIX hook on update price AND fix id on line	2018-08-03 11:47:43 +02:00
Laurent Destailleur	b01f07efda	Merge branch 'develop' into FIX_project_overview	2018-08-02 18:43:55 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include ... Include and co are statements	2018-08-02 11:03:44 +02:00
gauthier	cadf931e8d	FIX : extrafieldkey	2018-07-31 15:02:51 +02:00
atm-quentin	37a4a0c488	fix for travis	2018-07-31 10:02:36 +02:00
Frédéric FRANCE	b90d125fda	trim trailing	2018-07-26 20:19:52 +02:00
Frédéric FRANCE	526ea496ee	trim trailing	2018-07-26 19:26:03 +02:00
Frédéric FRANCE	6cb0fb10d6	trim trailing	2018-07-26 19:05:34 +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
atm-quentin	1297470c99	FIX project overview (can use any fields as fk_projet)	2018-07-26 15:05:32 +02:00
Frédéric FRANCE	2dd907a8e1	extrafield totalizable	2018-07-26 09:41:44 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	d871b8964f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-07-24 19:23:40 +02:00
Laurent Destailleur	20f178fdfe	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/comm/action/index.php htdocs/core/lib/functions.lib.php	2018-07-24 19:22:00 +02:00
Laurent Destailleur	7e9a2c5ec7	Fix #9092	2018-07-24 17:06:41 +02:00
John BOTELLA	1e986bc39a	Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP)	2018-07-20 11:51:01 +02:00
Laurent Destailleur	508133b336	Clean code	2018-07-17 13:04:54 +02:00
Laurent Destailleur	f747cefda3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/install/upgrade2.php	2018-07-16 15:44:44 +02:00
Laurent Destailleur	45a45b0dec	NEW Can enable a module, even external module, from command line ... Conflicts: htdocs/install/upgrade2.php	2018-07-16 15:35:00 +02:00
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	e92ab19a06	Fix var not defined	2018-07-16 11:26:23 +02:00
Laurent Destailleur	c477ca8266	Fix scrutinizer	2018-07-16 11:25:21 +02:00
Laurent Destailleur	e3d9e609d5	Fix var not defined	2018-07-16 11:20:54 +02:00
Laurent Destailleur	89cc048fff	FIX Init of contact in combo list when thirdparty not yet known	2018-07-16 10:46:10 +02:00
Laurent Destailleur	3710f95719	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/exports.lang	2018-07-16 10:01:23 +02:00
Laurent Destailleur	6846ff7d21	Fix problem in some vars as reported in #8955	2018-07-16 09:57:45 +02:00
Philippe GRAND	9ae7e55fea	fix: breaking link	2018-07-13 19:54:37 +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	699df860d8	Code comment	2018-07-09 15:39:59 +02:00
Laurent Destailleur	e427496ddf	FIX Injection	2018-07-09 14:13:01 +02:00
Laurent Destailleur	d3d1b6d513	NEW Can enable a module, even external module, from command line	2018-07-09 13:02:01 +02:00
Regis Houssin	e8afd7e833	Fix: use "supplier" instead "reseller"	2018-07-07 08:48:26 +02:00
Regis Houssin	1522a5b22d	Fix: differentiate customer prices from supplier prices sharing	2018-07-07 08:43:59 +02:00
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	4db7e04523	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.formactions.class.php htdocs/loan/index.php	2018-07-06 16:09:32 +02:00
Laurent Destailleur	2a676b414a	Merge pull request #9024 from atm-maxime/fix_link_create_event ... Fix link to create event had no socid if from thirdparty card	2018-07-06 14:26:38 +02:00
Laurent Destailleur	2113965b57	Update html.formactions.class.php	2018-07-06 14:26:21 +02:00
Laurent Destailleur	05ed721a8c	Fix name of constant for module TICKET	2018-07-06 13:09:07 +02:00
BENKE Charlene	633bf3034f	new add total price on dashboard	2018-07-05 11:52:58 +02:00
ATM-Nicolas	59220c05e4	FIX : Select first mail model by default	2018-07-05 11:18:28 +02:00
Laurent Destailleur	f7b8e09268	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml	2018-07-03 13:53:34 +02:00
Laurent Destailleur	f93f5bd6e0	Fix travis	2018-07-03 13:49:41 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	7ef6b16d31	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/install/step1.php	2018-07-03 10:04:25 +02:00
Laurent Destailleur	0138b0e0b7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/class/html.form.class.php	2018-07-03 10:01:30 +02:00
Laurent Destailleur	4e7f9b1b4d	Merge pull request #9038 from hregis/8.0_multicompany ... Fix: possibility to overload permissions (multicompany sharing)	2018-07-02 16:12:40 +02:00
Laurent Destailleur	63f3143718	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-02 12:18:34 +02:00
Laurent Destailleur	dc69960b00	Code comment	2018-07-02 12:17:34 +02:00
Laurent Destailleur	7bf33b1bac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/hrm/index.php htdocs/install/mysql/tables/llx_website_account.key.sql htdocs/modulebuilder/template/myobject_card.php	2018-07-02 12:16:51 +02:00
Laurent Destailleur	11021353da	Fix text in payment area of crabe pdf	2018-07-02 11:33:33 +02:00
Regis Houssin	9709207a4f	Fix: superadmin can show all users in master entity	2018-07-02 10:18:16 +02:00
Regis Houssin	df718cca5c	Fix: better sql request with multicompany transverse mode	2018-07-02 10:09:56 +02:00
Regis Houssin	233ad2945c	Fix: missing hook parameter	2018-07-01 20:03:08 +02:00
Regis Houssin	f13dd9c9bd	Fix: missing hook parameter	2018-07-01 18:22:18 +02:00
Regis Houssin	8f124efc15	Fix: wrong mysql resource name	2018-07-01 17:48:01 +02:00
Regis Houssin	df55bee8ae	Fix: missing "$disableremove" global	2018-07-01 15:33:10 +02:00
Laurent Destailleur	d8c7c61951	Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into ... hregis-8.0_canvas # Conflicts: # htdocs/product/canvas/product/tpl/list.tpl.php	2018-06-30 18:29:08 +02:00
Laurent Destailleur	ee2d543781	Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist ... NEW support selllist in the module builder	2018-06-30 15:33:17 +02:00
Regis Houssin	62a55e10b7	Fix: remove not used list template	2018-06-30 10:58:28 +02:00
Regis Houssin	3a26443546	Fix: remove unused code ... Conflicts: htdocs/product/list.php	2018-06-30 10:53:40 +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	c6b650a7bb	Merge pull request #8789 from defrance/patch-116 ... NEW Add CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY and CONTRACT_HIDE_UNSELECTABLES by SELECT_HIDE_UNSELECTABLES	2018-06-30 01:23:09 +02:00
Laurent Destailleur	292d7967c3	Merge pull request #9021 from grandoc/8.0 ... Fix : Notice: A non well formed numeric value encountered line 509	2018-06-29 20:02:54 +02:00
Laurent Destailleur	9004a51880	Update conf.class.php	2018-06-29 20:02:40 +02:00
Laurent Destailleur	4ace9dd12d	Merge pull request #9015 from hregis/8.0_bug ... Fix: remove unused and blocking field	2018-06-29 19:58:25 +02:00
Laurent Destailleur	2175a012e1	Fix lang	2018-06-29 18:23:59 +02:00
Regis Houssin	2d13b5b59d	Fix: broken feature with edit in place	2018-06-29 15:57:34 +02:00
atm-ph	41a516f1c4	New parameter to transform select into multiselect	2018-06-29 11:48:54 +02:00
Laurent Destailleur	20c72c1ae4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/main.inc.php	2018-06-29 00:22:15 +02:00
Laurent Destailleur	198deb92f6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-29 00:09:12 +02:00
Laurent Destailleur	66f0ee9e18	Fix hack with hook to solve a problem to let a chance of external ... modules to be visible to android webview.	2018-06-28 22:59:53 +02:00
Laurent Destailleur	60c62895bf	WIP Can add tooltips on extrafields	2018-06-28 19:13:23 +02:00
Maxime Kohlhaas	5756955d55	Fix link to create event had no socid if from thirdparty card	2018-06-28 14:27:59 +02:00
Philippe GRAND	a4ccb47b78	Fix : Notice: A non well formed numeric value encountered line 509	2018-06-28 12:18:03 +02:00
Laurent Destailleur	055d818069	FIX dashboard with IE10 not supporting flex	2018-06-28 12:09:13 +02:00
Laurent Destailleur	6fc6a743c8	Fix template email message html/nohtml	2018-06-27 12:11:49 +02:00
Laurent Destailleur	9eaca045e4	Fix default message with online payment link must be hidden when no ... online payment mode exists.	2018-06-27 11:34:40 +02:00
Regis Houssin	775e11ce33	Fix: wrong table name	2018-06-27 09:33:09 +02:00
Laurent Destailleur	ac758e02a9	Fix error message with old usage of childtables	2018-06-27 01:32:54 +02:00
Laurent Destailleur	8147152ec8	Fix look and feel v8	2018-06-26 11:25:28 +02:00
John	008163628a	New pdf documents using new column system	2018-06-26 08:03:25 +02:00
Laurent Destailleur	cbe682582e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-26 01:25:24 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	36402c22ee	FIX SQL Injections reported by mu shcor (ADLab of Venustech)	2018-06-25 14:06:09 +02:00
Laurent Destailleur	97976fbb43	Fix type of parameter must be string	2018-06-25 09:19:45 +02:00
Regis Houssin	a6729b0bd1	Fix: change field name and remove obsolete data	2018-06-25 09:10:24 +02:00
Laurent Destailleur	25b1d063ae	Fix length of hidden password	2018-06-24 11:45:10 +02:00
Laurent Destailleur	00165871bd	CSS	2018-06-23 15:10:44 +02:00
Laurent Destailleur	7daee6dc6b	A lot of fix of css and look and feel v8	2018-06-23 00:07:56 +02:00
Laurent Destailleur	88d3bf0148	FIX creation of tasks must hide closed project	2018-06-21 18:47:02 +02:00
Laurent Destailleur	75dee7538b	Fix add protection to avoir fatal error 500	2018-06-19 01:15:37 +02:00
Laurent Destailleur	5d5083199f	FIX better text content for multipart email	2018-06-18 23:26:21 +02:00
Laurent Destailleur	f9f7d3655d	FIX better text content for multipart email	2018-06-18 23:24:31 +02:00
Laurent Destailleur	c3f64ed36e	FIX better text content for multipart email	2018-06-18 23:18:22 +02:00
Laurent Destailleur	7c7ee56832	Fix missing email ... Fix avoid warning	2018-06-17 01:50:10 +02:00
Laurent Destailleur	910652eb6d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang	2018-06-13 23:07:30 +02:00
Laurent Destailleur	4c2af6fc70	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php	2018-06-13 23:04:08 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	e18717aa85	Update html.formprojet.class.php	2018-06-13 22:12:16 +02:00
Laurent Destailleur	933a6a5ba3	Update html.formcontract.class.php	2018-06-13 22:11:44 +02:00
Laurent Destailleur	4b84b7ccf2	Merge pull request #8926 from fappels/develop_fix_setvaluefrom ... FIX commonobject setValueFrom trigger	2018-06-13 20:50:26 +02:00
Laurent Destailleur	03b6bec8b8	Fix email template for test	2018-06-13 17:03:46 +02:00
Laurent Destailleur	cfa69fe93f	FIX popup confirmation deos not accept value with special chars	2018-06-13 14:51:20 +02:00
Laurent Destailleur	50aa674ebc	Fix support of 'help' field property. Fix bad td closing.	2018-06-13 13:36:40 +02:00
Laurent Destailleur	f4bef82bfa	Fix td not closed and js code duplicated (at wrong place)	2018-06-13 13:00:08 +02:00
Laurent Destailleur	5ae1395acd	Fix js when no data	2018-06-11 14:22:01 +02:00
Laurent Destailleur	485dc9a57a	Clean code	2018-06-08 15:37:25 +02:00
Laurent Destailleur	929a44d7ca	Fix dir of contract for multicompany	2018-06-06 23:56:59 +02:00
Laurent Destailleur	d10c9cf565	FIX dir for modules must not have s at end (fix contracts into contract)	2018-06-06 23:47:48 +02:00
fappels	a9f60bcdac	fix travis	2018-06-06 22:04:12 +02:00
fappels	81ef355b65	Fix trigger on setValueFrom ... Load updated values into object for trigger.	2018-06-06 17:10:46 +02:00
gauthier	45ecb0258b	FIX : entity test must be on product_fourn_price table and not product table	2018-06-05 12:41:38 +02:00
Laurent Destailleur	8d62c06653	css	2018-06-05 11:25:41 +02:00
Laurent Destailleur	b6955692b4	Fix autofill of password	2018-06-05 11:22:00 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
Laurent Destailleur	5ff3398048	Try to fix evil Google Chrome autopopulate bug	2018-06-01 18:27:17 +02:00
Laurent Destailleur	b094ae953e	Better log	2018-06-01 17:20:49 +02:00
Laurent Destailleur	7eea70ebc8	FIX #8858 #8860 Backport better compatibility fix	2018-05-29 10:13:34 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
patrick Delcroix	ef37fccef4	Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist	2018-05-26 23:43:17 +02:00
patrick Delcroix	adda3144bc	Fix Show double(x,y) fields	2018-05-26 23:39:36 +02:00
Laurent Destailleur	10281169e6	Empty page first	2018-05-25 15:43:08 +02:00
Laurent Destailleur	b246034670	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-25 14:57:43 +02:00
Laurent Destailleur	823936ef87	Merge pull request #8847 from frederic34/multipriceqty ... NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-25 12:55:02 +02:00
Laurent Destailleur	bcbe28d802	Code comment	2018-05-25 12:48:33 +02:00
Laurent Destailleur	f3713844ee	Update commonobject.class.php	2018-05-25 12:38:01 +02:00
Laurent Destailleur	770e97431b	Update commonobject.class.php	2018-05-25 12:36:38 +02:00
Laurent Destailleur	86b1904a41	Update commonobject.class.php	2018-05-25 12:33:30 +02:00
Laurent Destailleur	aa65b3f9ba	Merge pull request #8830 from wdammak/patch-8 ... Add liste_modeles to warehouse module	2018-05-25 11:43:48 +02:00
Laurent Destailleur	3d71ce8297	Update html.formfile.class.php	2018-05-25 11:19:38 +02:00
Laurent Destailleur	520ce99e56	Merge pull request #8828 from bgenere/develop ... FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php	2018-05-25 11:17:45 +02:00
Laurent Destailleur	a3bea8d298	Update commonobject.class.php	2018-05-25 11:17:01 +02:00
Laurent Destailleur	22b1f2574e	Merge pull request #8851 from atm-florian/develop ... fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL on upgrade.php page where global is not yet defined	2018-05-25 11:07:18 +02:00
Laurent Destailleur	ac0570f6b2	Update translate.class.php	2018-05-25 11:07:11 +02:00
Laurent Destailleur	fbcaf8872b	Merge pull request #8808 from atm-john/Add_table_thead_and_tbody ... Add table thead and tbody for object lines	2018-05-25 10:42:26 +02:00
delcroix Patrick	3158fdc551	Update commonobject.class.php	2018-05-24 21:20:34 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
florian HENRY	436a1001b3	fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL ... on upgrade.php page where global is not yet defined	2018-05-24 10:56:01 +02:00
Frédéric FRANCE	8547827575	Merge remote-tracking branch 'upstream/develop' into multipriceqty	2018-05-23 17:06:02 +02:00
Frédéric FRANCE	efbb053e54	PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES	2018-05-23 17:05:08 +02:00
delcroix Patrick	c85d216f8e	Merge branch 'develop' into patch-modulebuilder-supportsellist	2018-05-22 22:24:20 +02:00
patrick Delcroix	29d26b6e89	New: support sellist in modulebuilder	2018-05-22 22:16:25 +02:00
patrick Delcroix	2ccaf1ad95	New: support sellist in modulebuilder	2018-05-22 22:00:20 +02:00
Laurent Destailleur	354198b31e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/societe/contact.php	2018-05-22 20:26:09 +02:00
Laurent Destailleur	f074daae48	Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT	2018-05-22 20:17:31 +02:00
Laurent Destailleur	2a579b707a	FIX javascript showempty error ... FIX Contact tab not visible when using canvas	2018-05-22 19:43:28 +02:00
wdammak	1f43882bb7	Add liste_modeles to warehouse module	2018-05-22 01:09:52 +01: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	1b20ec05d1	Save translation	2018-05-21 19:37:47 +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
bgenere	227539d647	FIX : showOptionals function is now consistent with template ... Extrafield_view.tpl.php for date and datetime fields The jdate function is not called when not needed.	2018-05-21 16:55:35 +02:00
Laurent Destailleur	6d0306f75a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/class/html.formfile.class.php	2018-05-18 11:52:48 +02:00
Laurent Destailleur	492b1e7169	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-05-18 11:48:08 +02:00
Laurent Destailleur	e724cfd6a2	Merge pull request #8802 from atm-john/new_avoir_situation ... Add credit note compatibility with situation invoice.	2018-05-18 11:34:10 +02:00
Laurent Destailleur	a279451241	Fix can use actionmsg for generic trigger	2018-05-17 17:58:29 +02:00
John	8710cf570d	Add table thead and tbody for object lines	2018-05-17 16:52:16 +02:00
John	b01893d536	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull	2018-05-16 15:29:57 +02:00
Laurent Destailleur	ad32b3098a	Too verbose log	2018-05-16 10:31:44 +02:00
BENKE Charlene	4bebc8149b	Update html.formcontract.class.php	2018-05-13 21:17:15 +02:00
BENKE Charlene	f4af9ec22f	Update html.formcontract.class.php	2018-05-13 19:38:30 +02:00
BENKE Charlene	b0757916c4	Update html.formcontract.class.php	2018-05-13 16:59:03 +02:00
BENKE Charlene	2f1800f3e2	Update html.formprojet.class.php	2018-05-13 15:34:26 +02:00
BENKE Charlene	537048a10a	Update html.formcontract.class.php	2018-05-13 15:30:32 +02:00
Laurent Destailleur	a2d485c14f	Fix management of enabled property extrafields	2018-05-13 14:27:40 +02:00
Laurent Destailleur	302d9399e2	Fix search when using special char	2018-05-13 12:42:16 +02:00
Laurent Destailleur	53b5733fb4	Fix test	2018-05-12 13:40:53 +02:00
Laurent Destailleur	ee11a46a66	Merge pull request #8766 from fmarcet/develop ... NEW Add Date delivery and Availability on Propals List	2018-05-10 12:18:27 +02:00
Laurent Destailleur	d020741173	Merge pull request #8757 from bafbes/abb7004 ... New : Translate list elements in journal selection	2018-05-10 12:15:34 +02:00
Laurent Destailleur	0bf1fe2908	Merge pull request #8753 from delcroip/patch-15 ... new: log message for missing translation	2018-05-10 11:56:56 +02:00
Laurent Destailleur	f476e3e304	Update translate.class.php	2018-05-10 11:56:49 +02:00
Laurent Destailleur	842c6168a2	FIX #8762	2018-05-10 11:50:35 +02:00
Laurent Destailleur	56b80d81dd	Declare hook as addreplace hook	2018-05-10 11:39:29 +02:00
Ferran Marcet	70527e64c5	New: Add Date delivery and Availability on Propals List	2018-05-08 18:15:02 +02:00
Abbes Bahfir	fd9b6365a7	New : Translate list element in journal selection	2018-05-07 09:20:19 +01:00
delcroix Patrick	5ac2b51517	new: log message for missing traduction ... It's often difficult to find out the missing translation	2018-05-06 17:29:30 +02:00
Laurent Destailleur	546da0ceda	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php	2018-05-05 14:40:39 +02:00
Laurent Destailleur	9c68b81f59	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/accountancy/admin/account.php htdocs/projet/class/task.class.php	2018-05-05 14:34:54 +02:00
TuxGasy	12440e6a7e	Do not display multicurrency cols if currency of object is same as main currency	2018-05-02 11:30:35 +02:00
Laurent Destailleur	cb76d2ce0f	Better logging	2018-05-01 18:58:19 +02:00
florian HENRY	b5d7206519	fix 6.0 accountancy multientity	2018-05-01 12:02:33 +02:00
Laurent Destailleur	d975dd507b	Revert "No display object line curreny if not necessary"	2018-05-01 11:17:47 +02:00
Laurent Destailleur	32ace6a8cf	NEW Add hook setContentSecurityPolicy	2018-04-30 15:17:38 +02:00
Laurent Destailleur	4c12369a26	Debug module ticket	2018-04-30 10:33:36 +02:00
Laurent Destailleur	2fc2c44de4	Fix phpcs	2018-04-29 20:18:50 +02:00
Laurent Destailleur	0cdfd6800a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +02:00
Laurent Destailleur	82a8513aed	Standardize code	2018-04-29 19:52:14 +02:00
Regis Houssin	2906358383	Fix: use "socpeople" instead "societe"	2018-04-27 10:42:10 +02:00
Laurent Destailleur	659fd46b76	Merge pull request #8653 from ATM-Marc/NEW_commonObject_array ... NEW: work on CommonObject 'array' field typeNew common object array	2018-04-27 09:39:26 +02:00
Laurent Destailleur	36616cdd50	FIX When time is entered without hour, edit keeps this	2018-04-26 10:07:27 +02:00
Laurent Destailleur	21a18da43b	We can disable the "favorites" in select combo of countries	2018-04-25 21:06:51 +02:00
Laurent Destailleur	9d070cac87	NEW Can add product in supplier order/invoice even w/o predefined price ... Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY, SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old behaviour.	2018-04-24 12:57:31 +02:00
florian HENRY	67329b8805	fix commonobject double style	2018-04-24 12:33:07 +02:00
Laurent Destailleur	fb8ad77378	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2018-04-23 23:09:53 +02:00
Laurent Destailleur	fdb3a11f34	FIX extrafields price and double were lost during a failed post.	2018-04-23 22:56:40 +02:00
Laurent Destailleur	0a5e606937	FIX extrafields price and double were lost during a failed post.	2018-04-23 22:53:57 +02:00
Laurent Destailleur	e9a2894727	Fix PSR2	2018-04-22 20:59:29 +02:00
Laurent Destailleur	32511422ab	Fix PSR2	2018-04-22 20:08:29 +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	cca4b1cbf5	NEW Optimize load of hooks classes (save 1-5Kb of memory)	2018-04-21 11:24:45 +02:00
Philippe GRAND	be600690cd	Fix : Bad value for modulepart	2018-04-20 16:47:49 +02:00
Marc de Lima Lucio	39e890e2d7	FIX: handle non-js users	2018-04-20 16:43:27 +02:00
Marc de Lima Lucio	2bf66780cb	FIX: travis + code readability	2018-04-20 16:38:52 +02:00
Marc de Lima Lucio	41a0727481	NEW: work on CommonObject 'array' field type	2018-04-20 16:38:52 +02:00
Laurent Destailleur	d0efc41983	New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD	2018-04-20 14:50:11 +02:00
Laurent Destailleur	6b90558b7a	FIX File name not visible in email preview	2018-04-20 11:20:56 +02:00
Laurent Destailleur	5f43ff3609	Fix no pitco if bank account not defined	2018-04-20 08:47:53 +02:00
Laurent Destailleur	bbd1257222	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-20 01:50:08 +02:00
Laurent Destailleur	e621daa61d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-20 01:47:54 +02:00
Laurent Destailleur	7a703e149f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-20 01:39:48 +02:00
Laurent Destailleur	c6a53ca25d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/supplier_proposal/card.php	2018-04-20 01:39:26 +02:00
Laurent Destailleur	c10c962d3a	Merge pull request #8624 from inoveaconseil/patch-1 ... NEW add any predefined mail content	2018-04-20 01:31:37 +02:00
Laurent Destailleur	54154343b2	Merge pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default ... FIX: CommonObject: don't require 'notnull' field if 'default' set	2018-04-20 01:28:00 +02:00
Laurent Destailleur	2f19ba11e5	Merge pull request #8637 from hregis/develop_ticket ... Fix: dolibarrize	2018-04-20 01:22:19 +02:00
Laurent Destailleur	558bda5f27	Fix translation of extrafields	2018-04-19 17:45:00 +02:00
Regis Houssin	5b79b76685	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_ticket Conflicts: htdocs/core/class/html.formticketsup.class.php	2018-04-19 15:58:14 +02:00
Laurent Destailleur	0358e0f29f	Debug ticketsup	2018-04-19 15:11:26 +02:00
Laurent Destailleur	8acc752195	Debug ticket module	2018-04-19 14:44:21 +02:00
Marc de Lima Lucio	893ce55852	FIX: commonobject: don't require notnull field if default set	2018-04-19 10:29:48 +02:00
Laurent Destailleur	41be1c3d3d	Removed deprecated class (method setCookie already exists for that)	2018-04-19 10:22:08 +02:00
florian HENRY	882863ab48	fix : define in conf dir_output for suipplier_proposal modules	2018-04-18 16:21:20 +02:00
Marc de Lima Lucio	e88830820a	FIX: dont print empty date in CommonObject::showOutputField	2018-04-18 11:13:18 +02:00
Regis Houssin	ff76e60c49	Fix: some bugs and warnings	2018-04-18 10:13:20 +02:00
Regis Houssin	d841abd55a	Fix: missing value when reload	2018-04-18 09:37:29 +02:00
Regis Houssin	85c93c26a9	Fix: dolibarrize	2018-04-18 09:27:54 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	46d28acb44	Look and feel v8	2018-04-18 02:10:23 +02:00
Inovea Conseil	d032280a96	NEW add any predefined mail content	2018-04-17 16:03:12 +02:00
Laurent Destailleur	2135365e0a	Bug new extrafields architecture	2018-04-17 14:44:55 +02:00
Laurent Destailleur	7bb8078b46	Fix translation of extrafields	2018-04-17 13:52:50 +02:00
Laurent Destailleur	1e0a660d24	More font awesome picto instead of img	2018-04-16 19:57:46 +02:00
Laurent Destailleur	106fb87d0a	NEW Can sort order of files in attach tab for leave and expensereport	2018-04-16 19:25:27 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	e2838aa074	NEW Show also size in bytes in tooltip if visible unit is not bytes	2018-04-15 17:58:13 +02:00
Laurent Destailleur	9e50bbb9b1	standardize code	2018-04-15 16:35:18 +02:00
Philippe GRAND	0a6bcb2a39	fix typo and translation	2018-04-15 07:37:23 +02:00
Philippe GRAND	7943a19402	fix typo	2018-04-15 07:07:04 +02:00
Laurent Destailleur	a0e243a29b	Clean code	2018-04-13 23:11:19 +02:00
Laurent Destailleur	3b202b2255	Merge branch 'develop' into develop_bug5	2018-04-13 22:23:14 +02:00
Laurent Destailleur	6f91b8019f	Remove warnings	2018-04-13 17:54:27 +02:00
Laurent Destailleur	4251748aca	Clean code	2018-04-13 16:18:33 +02:00
Laurent Destailleur	77a853e49d	Fix remove warning	2018-04-13 14:53:40 +02:00
Laurent Destailleur	9f5eed0c9a	Code comment	2018-04-13 14:12:31 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	b68cded9c4	Clean code	2018-04-13 13:11:07 +02:00
Laurent Destailleur	fbae4429b7	Clean code for better extrafields management	2018-04-13 12:52:23 +02:00
Regis Houssin	e6ff852226	Fix: avoid Warning: Creating default object from empty value	2018-04-13 11:20:21 +02:00
Laurent Destailleur	78fcbe9633	FIX the extrafields separator was not translated	2018-04-13 10:48:29 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 ... NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Laurent Destailleur	ace55ba569	Debug usage of extrafields for ticket module	2018-04-12 23:17:46 +02:00
Laurent Destailleur	3cecfd02c7	NEW Mutualize code for action="update_extras" ... NEW Can use setValueFrom without user modification field FIX Exclude separators from mandatory extrafields test More code to use the new framework array for extrafields Can use text condition in extrafield visibility	2018-04-12 23:16:23 +02:00
All-3kcis	f7e58f3c73	Add files management on products lot	2018-04-12 15:10:37 +02:00
Laurent Destailleur	dd022ee423	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:38 +02:00
Laurent Destailleur	ea2fd67e0d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang	2018-04-12 13:31:14 +02:00
Laurent Destailleur	3df873ee06	Merge pull request #8562 from ATM-Marc/FIX_modulebuilder ... FIX: various modulebuilder-related issues	2018-04-11 18:01:04 +02:00
Laurent Destailleur	9ccba03a17	Update html.form.class.php	2018-04-11 18:00:34 +02:00
Laurent Destailleur	afdd504e16	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/accountancy/journal/sellsjournal.php	2018-04-11 17:58:21 +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	d7da83ebc5	Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity ... Fix extrafield entity query filter	2018-04-11 17:31:36 +02:00
Laurent Destailleur	e4f2e0ecbd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-11 17:21:14 +02:00
Laurent Destailleur	590bc2948a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/bank/card.php htdocs/core/tpl/admin_extrafields_view.tpl.php	2018-04-11 17:20:49 +02:00
Laurent Destailleur	c70e0c1cda	FIX #8475 #8540	2018-04-11 17:14:34 +02:00
Laurent Destailleur	ca6b7205ef	Update commonobject.class.php	2018-04-11 16:27:56 +02:00
Laurent Destailleur	ab43d9d675	Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement ... FIX: payment term doc-specific label was not used (issue #8414)	2018-04-11 14:52:06 +02:00
Laurent Destailleur	f54113b1a1	Merge pull request #8524 from frederic34/patch-10 ... FIX do not fill error with success message when using SwiftMailer	2018-04-11 13:19:04 +02:00
Laurent Destailleur	273eadab43	Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby ... NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830)	2018-04-11 13:18:10 +02:00
Marc de Lima Lucio	c966cdbd47	FIX: selectForFormsList: entity checked even is object not multi-entity managed	2018-04-11 11:43:51 +02:00
John	96e26100f0	Add extrafield entity query filter	2018-04-11 11:27:47 +02:00
Laurent Destailleur	f181719769	Can fetch a companypaymentmode of a thirdparty	2018-04-10 18:11:08 +02:00
ATM-Nicolas	47d5b1f6fd	FIX : update wrong datetime extrafield	2018-04-10 16:39:28 +02:00
Marc de Lima Lucio	7aa4d16eef	NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked	2018-04-10 16:23:56 +02:00
Laurent Destailleur	0bf4381226	NEW The field "visible" on extrafield can accept expression as condition	2018-04-10 15:39:11 +02:00
Marc de Lima Lucio	1fd5dba118	FIX: payment term doc-specific label was not used	2018-04-10 15:24:57 +02:00
Laurent Destailleur	24f4d5040a	Move isInEEC from common to thirdparty class.	2018-04-09 14:25:02 +02:00
John	63180f45a8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-09 09:17:26 +02:00
Frédéric FRANCE	f5b49aa93b	do not fill error with success message	2018-04-09 00:21:29 +02:00
Laurent Destailleur	259f3b3020	Add hidden option MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP	2018-04-07 13:23:26 +02:00
Laurent Destailleur	093c367609	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php	2018-04-07 13:20:22 +02:00
Laurent Destailleur	5a34a22934	Code comment	2018-04-07 13:04:52 +02:00
Laurent Destailleur	85d4f7115b	Better position of the substitution tooltip for emails	2018-04-06 16:16:08 +02:00
Laurent Destailleur	9ce5d02fde	Merge pull request #8517 from bafbes/master700 ... define module part to include external modules menus	2018-04-06 11:26:23 +02:00
Laurent Destailleur	151245a5e4	Update conf.class.php	2018-04-06 11:25:48 +02:00
Laurent Destailleur	658e1224d1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-05 19:53:09 +02:00
Laurent Destailleur	48ff89c63b	Fix regression	2018-04-05 19:52:54 +02:00
Laurent Destailleur	2d547abaa9	Merge pull request #8498 from atm-john/New_import_lines_from_linked_element ... New import lines from linked element	2018-04-05 18:26:47 +02:00
Laurent Destailleur	d55657951d	Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda ... FIX: img_pictos for remove assigned user in agenda card	2018-04-05 16:42:40 +02:00
bahfir abbes	16ae46e64c	define module part to include external modules menus	2018-04-05 15:23:17 +01:00
Laurent Destailleur	dd934c89bf	Merge pull request #8507 from frederic34/patch-2 ... Translation of error message	2018-04-05 16:12:36 +02:00
Laurent Destailleur	533de639ae	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/hookmanager.class.php	2018-04-05 13:29:27 +02:00
Laurent Destailleur	45d074c39d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-05 13:25:59 +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	2b135dc951	FIX #8488	2018-04-05 13:13:45 +02:00
Regis Houssin	5914bfdf18	Fix: more complete	2018-04-05 13:00:55 +02:00
Regis Houssin	156d26ddb9	Fix: backward compatibility	2018-04-05 13:00:50 +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
Frédéric FRANCE	fd6c1f129c	Update CMailFile.class.php	2018-04-04 15:58:24 +02:00
John	ce24ca08ee	move list of situation table and fix credit note display	2018-04-04 12:33:48 +02:00
John	b7681e7249	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-03 14:12:49 +02:00
Rui Strecht	4f9a8d5b0a	img_picto must return fullpath to picto.png	2018-04-03 12:23:26 +01:00
John	d689e88b92	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-04-03 11:38:12 +02:00
Laurent Destailleur	2d3a55a6a8	Restore broken confirmation popup	2018-03-31 23:39:08 +02:00
Laurent Destailleur	d21143831c	Clean code	2018-03-31 22:44:32 +02:00
Laurent Destailleur	96c73a13f6	Clean code	2018-03-31 16:45:36 +02:00
Laurent Destailleur	84bb4c6ad7	FIX With x extrafields, request for multicompany label was done x times	2018-03-30 19:51:53 +02:00
Laurent Destailleur	0978c8f58b	CSS	2018-03-29 16:07:49 +02:00
Laurent Destailleur	a214d0b3d7	Merge pull request #8461 from hregis/develop_multicompany ... Fix: best visibility of choices	2018-03-29 13:58:30 +02:00
florian HENRY	cc7deb0add	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0	2018-03-29 09:36:05 +02:00
florian HENRY	78812ef826	better error management	2018-03-29 09:35:47 +02:00
Laurent Destailleur	1c86eb1c44	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/quarter_report.php htdocs/core/lib/tax.lib.php	2018-03-29 03:08:01 +02:00
Laurent Destailleur	125085acee	Fix name of method to avoid ci errors	2018-03-29 03:01:05 +02:00
florian HENRY	7635f23d78	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0	2018-03-27 18:39:56 +02:00
florian HENRY	af7c1d8da1	fix error log	2018-03-27 18:39:18 +02:00
Regis Houssin	7d7a006583	Fix: best visibility of choices	2018-03-27 18:12:42 +02:00
Laurent Destailleur	e28307ede4	Merge pull request #8449 from hregis/develop_dict ... NEW add "moreHtmlRef" hook	2018-03-27 18:07:57 +02:00
Laurent Destailleur	3fa7cdf17f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-27 18:00:29 +02:00
Laurent Destailleur	20eb7015e8	Doxygen	2018-03-27 18:00:17 +02:00
Regis Houssin	35b6cb750f	Fix: move "moreHtmlRef" hook in "showrefnav" function	2018-03-27 17:36:25 +02:00
Laurent Destailleur	930512d9a2	FIX Add a test to avoid to reset binding by error.	2018-03-27 13:08:16 +02:00
Frédéric FRANCE	1071ec7e57	ignore Return-Path in dkim sign with swiftmailer	2018-03-26 21:36:03 +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	852191010a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:29:11 +02:00
Laurent Destailleur	a5dd98701e	Too verbose log	2018-03-25 13:40:22 +02:00
Laurent Destailleur	6ef1dbbe0f	FIX auto open contract if one result found	2018-03-24 18:28:06 +01:00
Laurent Destailleur	c85cb7fe0a	Merge pull request #8447 from fappels/7.0_modulbuilder ... Update on module builder	2018-03-24 16:41:43 +01:00
Laurent Destailleur	a3c199e9e3	FIX Missing include	2018-03-24 12:48:19 +01:00
Laurent Destailleur	f9ad2f7fb2	FIX Missing include	2018-03-24 12:10:04 +01:00
Laurent Destailleur	c864dbd515	Save Stripe customer id when using online member subscription	2018-03-23 23:59:35 +01:00
Laurent Destailleur	53edb86ffb	Make sending of email for member module ok with new email template archi	2018-03-23 19:35:25 +01:00
Laurent Destailleur	639d8ce9ef	Fix link replacement	2018-03-23 18:11:01 +01:00
Laurent Destailleur	6e32e9961f	Syn transifex	2018-03-23 17:56:35 +01:00
fappels	caa43ae2f6	Make helper methods available for derived classes. ... Use-case: a module build with modulebuilder can make it's own fetch method using the helper methods.	2018-03-23 17:35:46 +01:00
John	88fab15c60	Change situation display	2018-03-23 17:12:09 +01:00
Laurent Destailleur	7363ae17ee	Move setup of email for module module into email templates	2018-03-23 16:09:46 +01:00
Laurent Destailleur	171ad5dce2	Enhance code for template invoices	2018-03-22 21:42:19 +01:00
Laurent Destailleur	86e496963b	Merge pull request #8081 from atm-maxime/new_salesrep ... NEW improve way of adding users/sales representative to thirdparty	2018-03-22 14:05:44 +01:00
Laurent Destailleur	700c69e127	NEW Can set position of images in module tickets ... Mutualize code of method show_photo	2018-03-22 11:46:35 +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
florian HENRY	d3ae285c0c	finish work	2018-03-21 22:58:17 +01:00
Laurent Destailleur	7b6104de38	Merge pull request #8427 from ATM-Consulting/develop_atm ... NEW: method Form::selectArrayFilter() + use in left menu search	2018-03-21 20:44:44 +01:00
Laurent Destailleur	10d7e7d289	Merge pull request #8425 from atm-florian/dev_scrunit ... Dev scrunit	2018-03-21 20:40:01 +01:00
Laurent Destailleur	35938b1942	NEW Variable __ONLINE_PAYMENT_URL__ available in email templates	2018-03-21 20:06:22 +01:00
Laurent Destailleur	517301f014	Work on subscription reminder	2018-03-21 16:40:09 +01:00
Marc de Lima Lucio	744c263c6c	NEW: selectArrayFilter() + use in left menu search	2018-03-21 15:08:20 +01:00
Laurent Destailleur	200fd88132	Fix output message in log rotation job	2018-03-21 13:56:24 +01:00
Laurent Destailleur	7e5c3cc807	Code comment	2018-03-21 13:30:30 +01:00
florian HENRY	dc6f4c1f4d	NEW : option to send email to salaries	2018-03-21 11:48:30 +01:00
florian HENRY	d959905e4f	fix scrutinizer	2018-03-21 08:35:03 +01:00
Laurent Destailleur	fc50fcd59e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-20 20:07:24 +01:00
Laurent Destailleur	11d33c8dcc	Merge pull request #8420 from hregis/7.0_bug3 ... Fix: better compatibility with all hostname syntax	2018-03-20 17:32:14 +01:00
Laurent Destailleur	d7ad899839	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/card.php htdocs/core/class/conf.class.php htdocs/core/tpl/objectline_view.tpl.php htdocs/holiday/list.php	2018-03-20 14:52:27 +01:00
Laurent Destailleur	896a1cbc24	Fix bad var init	2018-03-20 11:27:47 +01:00
Laurent Destailleur	29775f735b	Option MAIN_EXTRAFIELDS_IN_ONE_TD is now 1	2018-03-20 11:26:41 +01:00
Laurent Destailleur	8cf2d4eb45	Fix filter on holiday statut ... Fix tr/td balance for extrafields on lines	2018-03-20 10:10:21 +01:00
Laurent Destailleur	a325bbf865	FIX Input of holiday for subordinates was ko	2018-03-19 20:46:43 +01:00
Regis Houssin	4767819b7a	Fix: better compatibility with all hostname syntax	2018-03-19 17:59:23 +01:00
Laurent Destailleur	0c45760dd4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/step5.php htdocs/langs/en_US/holiday.lang htdocs/public/payment/newpayment.php htdocs/public/stripe/newpayment.php	2018-03-19 17:58:19 +01:00
Laurent Destailleur	91cc3d1b73	FIX navigation and filters on holiday list	2018-03-19 16:11:42 +01:00
Laurent Destailleur	eb7886ecff	Update ldap.class.php	2018-03-19 12:37:53 +01:00
Regis Houssin	890d0b6685	Fix: replace ldaps:// by ssl://	2018-03-19 12:11:59 +01:00
Laurent Destailleur	e91ffa00eb	NEW Can crop image files attached in "document" tabs of a member	2018-03-19 11:56:04 +01:00
Laurent Destailleur	f46df6d8e5	Can resize and crop images in the ticketsup module	2018-03-19 11:49:05 +01:00
Laurent Destailleur	f8ca4b1b5c	NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD	2018-03-19 11:34:48 +01:00
Laurent Destailleur	51b6723b08	Dolibarrize module ticket	2018-03-18 20:01:11 +01:00
Laurent Destailleur	d4ae0395ed	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
Laurent Destailleur	dc0fc73931	Code comment	2018-03-17 12:15:32 +01:00
Laurent Destailleur	e323084cf8	Better template	2018-03-16 19:03:16 +01:00
Laurent Destailleur	2bbf738cb8	FIX Sql escape	2018-03-16 18:20:28 +01:00
Laurent Destailleur	f258d31a98	Triggers for Strips payment modes	2018-03-16 16:10:04 +01:00
Laurent Destailleur	9997a6c787	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2018-03-16 12:20:42 +01:00
Laurent Destailleur	96ff5b1b23	Update sql image file for 7.0 stable	2018-03-16 11:19:58 +01:00
Laurent Destailleur	46fb2945d4	NEW Show keyboard shortcut of nav arrow into tooltip	2018-03-15 22:02:03 +01:00
Laurent Destailleur	e1a0df263d	Fix code with the new return structure of getEmailTemplate	2018-03-15 18:43:47 +01:00
Laurent Destailleur	5392218806	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/translate.class.php	2018-03-15 02:13:29 +01:00
Laurent Destailleur	c4eea1f0e0	Fix SQLi	2018-03-15 02:12:01 +01:00
Laurent Destailleur	f0f6f71161	Fix Sqli	2018-03-15 01:55:47 +01:00
Laurent Destailleur	87bbb4ef87	Can create card from dolibarr	2018-03-15 00:40:29 +01:00
Laurent Destailleur	302fed8646	More fa image to replace png picto	2018-03-14 20:08:44 +01:00
Laurent Destailleur	9994b1f133	Work on stripe interface	2018-03-14 17:12:32 +01:00
Laurent Destailleur	3f7cd8b1bd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-14 13:56:41 +01:00
Laurent Destailleur	5c2a005e75	Work on generic customer payment modes	2018-03-14 13:56:21 +01:00
Laurent Destailleur	268b07bcf0	Can add/delete credit card localy	2018-03-14 11:51:13 +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	da617f7d32	Can work both with remote and local payment modes	2018-03-13 22:43:50 +01:00
Laurent Destailleur	a86da671ba	Remove verbose log	2018-03-13 18:13:31 +01:00
Laurent Destailleur	944ba69cd8	Add unique key. Dolibarrize view of stripe card.	2018-03-13 17:32:49 +01:00
Laurent Destailleur	e6d8219396	Dolibarrize module ticket	2018-03-13 13:26:03 +01:00
Laurent Destailleur	4380367923	Error management	2018-03-13 12:54:53 +01:00
Frédéric FRANCE	d6e98d3b05	Update CMailFile.class.php	2018-03-12 15:14:41 +01:00
Laurent Destailleur	0d1e26b02c	Fix error management	2018-03-12 13:19:09 +01:00
Laurent Destailleur	ae82d045f8	Dolibarrize module ticket	2018-03-11 23:56:17 +01:00
TuxGasy	34145ed443	Do not display multicurrency cols if currency of object is same as main currency	2018-03-11 21:58:32 +01:00
Frédéric FRANCE	683486eaf1	Update html.formticketsup.class.php	2018-03-11 21:00:39 +01:00
Laurent Destailleur	b084ca4a50	Fix	2018-03-11 19:44:19 +01:00
Laurent Destailleur	baf6fc6a8b	Merge pull request #8343 from atm-maxime/develop ... Fix mail send	2018-03-11 18:11:37 +01:00
Maxime Kohlhaas	df185de6ae	Fix mail send	2018-03-11 15:09:25 +01:00
jfefe	0f96575b41	Fix PHPCS errors with ticketsup module	2018-03-11 12:06:57 +01:00
Laurent Destailleur	0ac1d8b226	Dolibarize	2018-03-11 11:33:24 +01:00
Laurent Destailleur	e14d2f08b8	Dolibarize	2018-03-11 11:12:38 +01:00
jfefe	79acb79ae0	Begin integration of module « Ticketsup » ... Related to #4948	2018-03-11 09:44:58 +01:00
Laurent Destailleur	64f21b8a3c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php	2018-03-11 00:10:13 +01:00
Laurent Destailleur	72bccd9c6b	Merge branch 'develop' into bug-6980	2018-03-10 22:27:07 +01:00
Alexis Algoud	74dc815bfa	fix commonobject isInt for module builder capabilities	2018-03-10 19:02:06 +01:00
Laurent Destailleur	72eff36cd6	Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked ... Fix commonobject isInt for module builder capabilities	2018-03-10 18:59:12 +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	e3ace1f89f	Fix morecss not provided	2018-03-10 18:17:54 +01:00
Alexis Algoud	b370a3096c	fix commonobject isInt for module builder capabilities	2018-03-10 14:14:31 +01:00
florian HENRY	26686a05c2	fix scrunituzer	2018-03-10 10:38:56 +01:00
florian HENRY	63fb53159c	fix scrunitizer	2018-03-10 01:12:47 +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
Frédéric FRANCE	27bf5419d6	Merge branch 'develop' into swifmailer	2018-03-09 22:44:57 +01:00
TuxGasy	9eeb80151e	Fix bug when updating multi currency rate on invoice supplier	2018-03-09 21:13:54 +01:00
florian HENRY	42fed5981d	bettre syntax	2018-03-09 19:16:06 +01:00
florian HENRY	02beed265e	better space	2018-03-09 19:14:43 +01:00
florian HENRY	5a56e802d9	FIX #8232	2018-03-09 19:10:52 +01:00
Maxime Kohlhaas	4e222d3d92	Comment for travis	2018-03-09 19:09:16 +01:00
Maxime Kohlhaas	ded69bf57d	New : link users to company like a tag	2018-03-09 18:59:06 +01:00
Marc de Lima Lucio	d6b4bc14e4	NEW: syslog file autoclean	2018-03-09 16:52:06 +01:00
Laurent Destailleur	1c9e7145e7	Merge pull request #8276 from ATM-Consulting/develop_atm ... NEW: supplier credit notes & discounts (absolute and relative)	2018-03-08 20:06:37 +01:00
Laurent Destailleur	47b03068ac	Merge pull request #8300 from hregis/develop_dict ... Fix: regression, restore primary key	2018-03-08 16:22:23 +01:00
Laurent Destailleur	0b316c3980	Attach invoice on email subscription confirmation	2018-03-08 15:01:34 +01:00
Regis Houssin	fd9c79fa7f	Fix: use getEntity if no rowid to compare	2018-03-08 07:42:17 +01:00
Regis Houssin	93a9430e49	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
Laurent Destailleur	fe45e82e99	Fix use of table llx_c_paiement (param showempty was not used/set)	2018-03-07 19:00:38 +01:00
Marc de Lima Lucio	884b74a6bb	FIX: warning when adding ECM files using old photo path	2018-03-07 17:12:59 +01:00
Laurent Destailleur	7e6ba51780	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/tasks/comment.php	2018-03-07 13:06:29 +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
florian HENRY	03873038d5	fix comment task	2018-03-07 08:47:34 +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
Marc de Lima Lucio	f1faf155fc	FIX: supplier discounts: wrong link to source supplier invoice	2018-03-05 11:41:06 +01:00
Marc de Lima Lucio	480d756090	FIX: supplier discounts: typo	2018-03-05 11:30:18 +01:00
Marc de Lima Lucio	1765b09fda	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-05 11:05:38 +01:00
Laurent Destailleur	864edce665	NEW Accept anonmymous events (no user assigned) ... NEW Online payment now record the payment on invoices	2018-03-04 19:39:46 +01:00
Laurent Destailleur	9355c5a8d7	Fix scrutinizer	2018-03-04 11:31:57 +01:00
Laurent Destailleur	e574ec4bf1	Fix backward compatibility	2018-03-04 11:28:01 +01:00
Laurent Destailleur	82fd84fb48	Fix scrutinizer errors	2018-03-04 11:22:43 +01:00
Laurent Destailleur	6338328c90	Fix scrutinizer errors	2018-03-04 11:09:53 +01:00
Laurent Destailleur	44eb50c424	FIX Infinite loop on deletion of temp file when there is symbolic links	2018-03-03 11:57:10 +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	0a5edb871b	Merge pull request #8253 from ruistrecht-alt/Fix_supress_count_warning_in_extrafields_view_tpl ... FIX Suppress count warning in admin_extrafields_view.tpl	2018-03-02 18:00:52 +01:00
Laurent Destailleur	7584fe62e3	Merge pull request #8244 from hregis/develop_bug ... Fix: avoid warning during "upgrade2" process	2018-03-02 17:51:47 +01:00
Laurent Destailleur	48b578b9f2	Update commonobject.class.php	2018-03-02 17:51:21 +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	bf36f00897	Update html.formfile.class.php	2018-03-02 17:48:58 +01:00
Marc de Lima Lucio	451d943927	NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)	2018-03-02 16:48:25 +01:00
Laurent Destailleur	e073fa15f7	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-02 14:00:27 +01:00
Laurent Destailleur	c478ab952f	Fix block to generate donation document missing	2018-03-02 11:57:39 +01:00
Laurent Destailleur	191a1e9350	Fix css	2018-03-02 11:18:29 +01:00
Laurent Destailleur	132ee2c788	CSS	2018-03-01 16:48:12 +01:00
Laurent Destailleur	0f237e4d5c	NEW Add mass action enable/disable on cron job list	2018-03-01 15:24:50 +01:00
Marc de Lima Lucio	e07177fec2	FIX: supplier relativ discounts: pre-fill newlines with qty/discount	2018-03-01 12:31:33 +01:00
Laurent Destailleur	2368cb615f	Look and feel v8	2018-03-01 11:51:25 +01:00
Marc de Lima Lucio	059801fe03	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-01 10:22:21 +01:00
Laurent Destailleur	de9f1aab0f	NEW Can set the reply-to into email sent	2018-02-28 19:09:05 +01:00
Laurent Destailleur	575fc9f90d	NEW add hook moreHtmlStatus to complete to status on banners	2018-02-27 22:06:21 +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	03858d73b1	NEW Add extrafield type "html"	2018-02-27 17:30:13 +01:00
Marc de Lima Lucio	7cd1b2caa9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-27 16:45:01 +01:00
Laurent Destailleur	8ac4cb9c43	Add fetch_product	2018-02-27 16:33:50 +01:00
Rui Strecht	24ae7b4780	Suppress count warning in admin_extrafields_view.tpl	2018-02-27 14:45:17 +00:00
Laurent Destailleur	7d3162313e	FIX Temporary dir for mail files must be cleaned at beginning of form	2018-02-27 10:59:26 +01:00
Regis Houssin	1aa1b0a3ea	Fix: avoid warning during "upgrade2" process	2018-02-26 12:15:30 +01:00
Laurent Destailleur	0d12552445	NEW Can enter time spent from the list of time spent of project	2018-02-26 11:57:29 +01:00
Regis Houssin	365fffddf5	Fix: missing object entity	2018-02-26 11:35:44 +01:00
Regis Houssin	093ea49cc6	Fix: use "multidir_output" instead "dir_output"	2018-02-26 11:35:30 +01:00
Laurent Destailleur	4866d63ece	Fix method getListOfPayments in the wrong class	2018-02-26 09:45:15 +01:00
Laurent Destailleur	1666f371bf	css	2018-02-26 00:13:16 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	2cd5ed65a6	Clean deprecated (field unit_charge in supplier price)	2018-02-25 14:13:09 +01:00
Laurent Destailleur	8dceb8930f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/class/html.formactions.class.php htdocs/user/card.php	2018-02-25 12:41:17 +01:00
Laurent Destailleur	c604ce0a06	Fix date in odt	2018-02-24 15:31:30 +01:00
Laurent Destailleur	3b5a3915c4	NEW Use common substitution rule for language to get translation in ODT	2018-02-24 14:23:52 +01:00
Laurent Destailleur	38d1fc27e0	Start to introduce common substitution rules for odt substitutions	2018-02-24 13:41:01 +01:00
Laurent Destailleur	c8078b54b5	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php	2018-02-24 12:52:57 +01:00
Laurent Destailleur	435e4823a5	Fix some warning during install	2018-02-24 11:58:09 +01:00
Laurent Destailleur	d8bf553ea9	Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing	2018-02-23 19:55:15 +01:00
Laurent Destailleur	7cf7bf6e45	Code comment	2018-02-23 16:26:23 +01:00
Laurent Destailleur	f3e1e81219	Fix update of extrafield password that are crypted	2018-02-23 16:11:25 +01:00
Laurent Destailleur	93a8176813	Fix do not encrypt if empty	2018-02-23 15:28:24 +01:00
Laurent Destailleur	863cab362f	NEW Cat set the encryption algorithm for extrafields of type password	2018-02-23 14:38:41 +01:00
Laurent Destailleur	cc618e886f	Fix extrafield password must be >= than 64 for password_hash	2018-02-23 13:19:33 +01:00
Laurent Destailleur	82ae65b18d	NEW Can get template of email from its label	2018-02-23 11:23:36 +01:00
Laurent Destailleur	420fe3a07a	Clean code	2018-02-22 17:05:45 +01:00
Laurent Destailleur	a27ed54128	Fix sort order of email templates	2018-02-22 16:40:48 +01:00
John	a7a6630fad	Add popin dialog	2018-02-22 15:19:20 +01:00
Laurent Destailleur	b87feab1e3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commonobject.class.php	2018-02-22 12:19:20 +01:00
Laurent Destailleur	51cfb9795e	Fix bad picto	2018-02-22 11:26:41 +01:00
Juanjo Menent	1d6baf5f2b	Fix: Not showing link to ad event if module is disabled	2018-02-22 10:16:53 +01:00
John	f313fb925b	Add new checkbox for lines	2018-02-21 17:06:40 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
John	bd0e8506f5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-02-21 11:53:16 +01:00
Laurent Destailleur	72c1357c9b	NEW Section of files generated by mass action not visible if empty	2018-02-21 11:02:45 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	34135e0a13	Fix extrafield date or datetime with bad timezone	2018-02-20 19:20:47 +01:00
Laurent Destailleur	e465b0c40e	Fix extrafield date or datetime with bad timezone	2018-02-20 19:19:27 +01:00
Laurent Destailleur	71cbcce3a2	NEW Can select sample to use when creating a new page	2018-02-20 18:10:11 +01:00
John	09c5dc506a	Add html dom element and fix class	2018-02-20 17:46:32 +01:00
John	5624257a6d	add new dom html5 elements and class	2018-02-20 16:49:49 +01:00
Marc de Lima Lucio	95be155010	FIX: supplier credit notes: harmonize discount filters	2018-02-20 12:26:29 +01:00
Laurent Destailleur	5f51af505f	NEW Can delete dir content in media and ECM module recursively	2018-02-19 23:52:45 +01:00
Laurent Destailleur	1ee128ff13	NEW Add type of website container/page into dictionary	2018-02-19 19:48:53 +01:00
Marc de Lima Lucio	44b0d1ca0f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-19 17:33:20 +01:00
Marc de Lima Lucio	f5ad93b272	NEW: supplier credit notes: handle Excess Paid + translation	2018-02-19 15:52:07 +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	f67f0df609	Fix preview link not visible with long file names	2018-02-16 12:11:39 +01:00
Marc de Lima Lucio	e2b65b3755	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note	2018-02-16 09:14:53 +01:00
Laurent Destailleur	362aec3e4b	NEW Add param $dolibarr_main_restrict_ip in config file to limit ips	2018-02-15 19:49:50 +01:00
Laurent Destailleur	6b74c79798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/website.lang	2018-02-15 15:34:17 +01:00
Laurent Destailleur	f0855da0fb	Fix responsive	2018-02-15 12:57:04 +01:00
Laurent Destailleur	b515448bbd	Fix delete when no extrafields used	2018-02-15 00:01:25 +01:00
Laurent Destailleur	5f0f9ff326	Fix delete page	2018-02-14 23:57:57 +01:00
Laurent Destailleur	78697c1735	USe fk_product is better than ref	2018-02-14 21:14:24 +01:00
Laurent Destailleur	f3ffc7ce8a	Merge pull request #8185 from BitKFu/develop ... NEW Load product data optional fields to the line -> enables to use "line_options_{extrafield}"	2018-02-14 20:56:00 +01:00
Marc de Lima Lucio	daca27b2ed	NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring	2018-02-14 18:02:40 +01:00
Marc de Lima Lucio	4f9bb33600	NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid	2018-02-14 10:47:10 +01:00
Laurent Destailleur	795cbaa978	Code comment	2018-02-13 20:13:35 +01:00
Laurent Destailleur	b128c95a74	NEW Add showempty parameter in country selection	2018-02-13 19:08:46 +01:00
Laurent Destailleur	e510e1b679	Fix search field at wrong column	2018-02-13 15:48:29 +01:00
Laurent Destailleur	35aece060c	Search field in correct column	2018-02-13 15:47:17 +01:00
Laurent Destailleur	1a4aa89489	NEW Can share any file from the "Document" tab.	2018-02-13 13:55:36 +01:00
Gerhard Stephan	f93934905f	Implemented a correct error handling, if the $line->product_ref has not been set	2018-02-13 08:41:57 +01:00
Laurent Destailleur	36ac380cac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 22:26:48 +01:00
Gerhard Stephan	2aaf3a466d	Load product data optional fields to the line -> enables to use "line_options_{extrafield}" ... This fixes the issue #3185 https://github.com/Dolibarr/dolibarr/issues/3185	2018-02-12 21:38:51 +01:00
Laurent Destailleur	b2835fc803	Fix check of vat only for european countries	2018-02-12 15:54:24 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Laurent Destailleur	ab21769aa2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/facture/card.php	2018-02-08 12:58:47 +01:00
Rui Strecht	ecea8d698c	Forgot that MAIN_SHOW_STATE_CODE is not just 0 or 1	2018-02-07 16:07:33 +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	ea92f6beae	Fix for multicompany	2018-02-06 10:57:53 +01:00
Laurent Destailleur	565372eaab	Fix param showsize. Fix extrafields field too long	2018-02-06 10:34:29 +01:00
Laurent Destailleur	eedbcbdc40	Merge branch 'develop' into patch-2	2018-02-05 15:43:18 +01:00
Laurent Destailleur	6291cb4cbe	Update commonobject.class.php	2018-02-05 15:41:34 +01:00
Laurent Destailleur	9a0dca57af	Update commonobject.class.php	2018-02-05 15:40:18 +01:00
Laurent Destailleur	9731a7fedc	Code for update more similar than insert	2018-02-05 15:31:40 +01:00
Regis Houssin	839de65012	Fix: avoid error -1	2018-02-05 11:30:31 +01:00
Laurent Destailleur	0cc6654b06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php	2018-02-04 13:25:00 +01:00
Laurent Destailleur	5a609215d5	Fix default value was not save at creation ... Conflicts: htdocs/core/class/extrafields.class.php	2018-02-04 13:23:04 +01:00
Laurent Destailleur	aff6bced4a	Fix default value was not save at creation	2018-02-04 13:20:47 +01:00
Laurent Destailleur	4fdde55c59	Keep empty graph if graph is called with empty data	2018-02-04 12:14:39 +01:00
Laurent Destailleur	f57ea2682a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/contrat/card.php htdocs/core/class/commonobject.class.php htdocs/core/class/notify.class.php htdocs/societe/class/societe.class.php	2018-02-03 19:33:24 +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	833c7685e1	Hook 'maildao' was renamed into 'mail' into the method sendfile that ... send emails, and method was renamed from 'doaction' into 'sendMail'. To process task #4875 #7969 in several steps.	2018-02-03 17:36:33 +01:00
Regis Houssin	13106d34a6	Fix: compatibility with multicompany sharing	2018-02-02 12:36:47 +01:00
Laurent Destailleur	f51d6a2e50	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-02 10:07:16 +01:00
Laurent Destailleur	a7357e67f9	Code comment	2018-02-01 20:19:04 +01:00
Laurent Destailleur	0412d3d11d	Fix extrafield mandatory check.Fix empty extrafields with type link.	2018-02-01 19:05:24 +01:00
Laurent Destailleur	ed3bcf59b6	Try doc hint array of array of int with @var int[][]	2018-02-01 10:50:50 +01:00
Laurent Destailleur	7f9d6a5458	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/public/paybox/newpayment.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php htdocs/public/stripe/newpayment.php	2018-01-31 20:25:24 +01:00
Laurent Destailleur	14ecdce650	Fix merge of thirdparties (pb when merging codes and error management)	2018-01-31 18:01:56 +01:00
Laurent Destailleur	de0a8ba71f	Fix extrafields	2018-01-31 14:01:58 +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	e9f8c7ba01	Fix edit of extrafields "link" corrupts the data definition	2018-01-31 10:51:40 +01:00
Laurent Destailleur	d6317a26d2	Fix for multicompany	2018-01-30 15:48:09 +01: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	98c7ac9362	Merge pull request #8100 from ruistrecht-alt/label_for_MAIN_SHOW_REGION_IN_STATE ... NEW: Option MAIN_SHOW_REGION_IN_STATE renamed into MAIN_SHOW_REGION_IN_STATE_SELECT and more complete	2018-01-29 21:08:18 +01:00
Laurent Destailleur	8102883356	Fix error when email list contains ', ,' ... Fix output dir of notification	2018-01-29 20:36:40 +01:00
Laurent Destailleur	4eb7d7a332	Debug blockedlog with various payments	2018-01-29 18:22:26 +01:00
Frédéric FRANCE	def89d30ae	Merge remote-tracking branch 'upstream/develop' into patch-2	2018-01-28 15:36:40 +01:00
Laurent Destailleur	65c7117240	Fix var serialized twice	2018-01-27 19:40:42 +01:00
Laurent Destailleur	7dcb3bf6fc	Fix var not initialized	2018-01-27 19:40:35 +01:00
Laurent Destailleur	7a2992bc4b	Fix var serialized twice	2018-01-27 19:35:30 +01:00
Laurent Destailleur	f1cd905bf1	Fix var not initialized	2018-01-27 19:29:57 +01:00
Laurent Destailleur	eb3eee9b6a	Code comment	2018-01-26 15:25:47 +01:00
Frédéric FRANCE	336c44dc88	trigger on shipping method update	2018-01-26 08:33:35 +01:00
Frédéric FRANCE	d0e83b7902	trigger on bank account update	2018-01-26 08:14:39 +01:00
Frédéric FRANCE	ec38b8a5a2	Update interface_99_modMyModule_MyModuleTriggers.class.php	2018-01-25 22:07:10 +01:00
Frédéric FRANCE	0568461a7b	swiftmailer	2018-01-25 22:03:51 +01:00
Frédéric FRANCE	9e0a548eff	Update commonobject.class.php	2018-01-25 17:42:25 +01:00
Rui Strecht	a13866f091	Changed MAIN_SHOW_REGION_IN_STATE to MAIN_SHOW_REGION_IN_STATE_SELECT for clarity	2018-01-25 16:14:39 +00:00
Laurent Destailleur	60c1a1e745	Code comment on accesskey	2018-01-24 17:29:29 +01:00
Laurent Destailleur	d796f403a9	Fix sender email when sending a password remind	2018-01-24 15:43:55 +01:00
Laurent Destailleur	273e88a599	Fix send into ledger for expense report. Show accounted status.	2018-01-22 03:07:11 +01:00
Frédéric FRANCE	d31684376a	swiftmailer	2018-01-21 18:59:48 +01:00
Frédéric FRANCE	a34b99f3ec	swiftmailer	2018-01-21 15:55:56 +01:00
atm-quentin	ce29331c05	NEW Filter export model by user	2018-01-18 12:34:22 +01:00
Laurent Destailleur	1a04178d64	Clean unused file and fix missing translation	2018-01-17 11:20:18 +01:00
Laurent Destailleur	1c3fb7f94b	Fix responsive of boxes	2018-01-16 16:15:49 +01:00
Laurent Destailleur	51421a8bf6	Fix position of fields	2018-01-15 18:11:56 +01:00
Laurent Destailleur	926683763b	Modulebuilde fix sort of fields, fix generation of files	2018-01-15 17:38:15 +01:00
Laurent Destailleur	193dfec29e	Merge pull request #8061 from fappels/7.0_fix_module_builder ... 7.0 fix module builder	2018-01-15 11:32:40 +01:00
fappels	00185bd9d4	Fix fetchCommon should return 0 iso error if not found	2018-01-15 11:21:24 +01:00
Laurent Destailleur	3c3402bc60	Debug API for prices of products	2018-01-14 15:58:04 +01:00
fappels	25b455272a	Fix 0 is a valif value for a NOT NULL field	2018-01-14 15:31:31 +01:00
Laurent Destailleur	f0d6099e5f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/db/DoliDB.class.php htdocs/core/lib/functions.lib.php	2018-01-14 03:15:49 +01:00
Laurent Destailleur	9f6118ed52	Code comments	2018-01-14 03:12:22 +01:00
Laurent Destailleur	7a087327e1	Fix deprecated code	2018-01-13 19:33:40 +01:00
Laurent Destailleur	7c480f76e3	Fix thumbs of pdf at wrong place ... Fix param not provided Fix css	2018-01-13 16:09:05 +01:00
Laurent Destailleur	7a88afe962	Fix field enabled and perms must differs	2018-01-13 13:16:33 +01:00
Laurent Destailleur	53b36435d0	Fix on smartphone	2018-01-12 20:50:18 +01:00
Laurent Destailleur	32a998e68d	Fix preview link	2018-01-12 16:28:10 +01:00
Laurent Destailleur	ad4b59d2c8	Fix scrutinizer	2018-01-12 15:33:21 +01:00
Laurent Destailleur	50596a5214	Fix trans key	2018-01-12 14:06:48 +01:00
Laurent Destailleur	15ed7584b8	Fix navigation in accounting account card	2018-01-11 17:06:06 +01:00
Laurent Destailleur	e141d43999	Fix bad links with mobile	2018-01-10 13:14:30 +01:00
Laurent Destailleur	9b448459c9	Fix dispatching replacement invoice into bookkeeping (not used by most ... countries in europe)	2018-01-09 19:12:08 +01:00
Laurent Destailleur	b3465d441a	Missing ajaxcombobox	2018-01-04 10:45:48 +01:00
Laurent Destailleur	c98b5c7ec7	Fix css background	2018-01-02 17:27:05 +01:00
Laurent Destailleur	8388858715	Fix filemanager	2017-12-27 20:17:08 +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	e6c7f9e69b	Debug module inventory	2017-12-22 21:29:09 +01:00
Laurent Destailleur	2b056b0177	BUG Fix of old hidden feature price per quantity	2017-12-22 12:53:46 +01:00
Laurent Destailleur	eab44f62b1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_builddoc.inc.php htdocs/core/class/html.form.class.php htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/core/tpl/admin_extrafields_edit.tpl.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/notes.tpl.php htdocs/main.inc.php htdocs/product/inventory/tpl/inventory.tpl.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2017-12-21 14:35:33 +01:00
Marcos García	b5804d18b8	Merge branch 'develop' into bug-6980 ... # Conflicts: # htdocs/core/class/html.formmail.class.php	2017-12-21 12:03:03 +01:00
Laurent Destailleur	f1305bbdd6	Fix css	2017-12-20 21:14:22 +01:00
Laurent Destailleur	b03d0134a7	Filter on date extrafield timestamp and datetime disabled (not possible ... yet)	2017-12-20 18:30:41 +01:00
Laurent Destailleur	3f6b3b51ca	Fix css	2017-12-20 15:09:58 +01:00
Laurent Destailleur	12d91d7444	Fix missing messages in error report. ... Fix test on non empty array	2017-12-19 18:26:27 +01:00
Laurent Destailleur	f504716501	Fix sync contact - external user	2017-12-19 16:16:31 +01:00
Laurent Destailleur	1351a43a30	FIX Maxi debug of permission for users external or restricted to sales ... representatives	2017-12-18 16:13:05 +01:00
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	8e12551f17	Fix not employee must not appear on page to create salaries	2017-12-18 11:55:34 +01:00
Marcos García	f45c3e8231	FIX #6980 FormMail::getEmailTemplate returns an array instead of a ModelMail object ... Close #6980	2017-12-17 23:42:50 +01:00
Laurent Destailleur	6f9822ddb3	Fix link for payment no set	2017-12-17 22:03:42 +01:00
Laurent Destailleur	4abcbae79f	NEW The unalterable log can be browse by any user with he permission	2017-12-16 21:36:36 +01:00
Laurent Destailleur	e90a6b8c0f	Option THEME_HIDE_BORDER_ON_INPUT to restore border on inputfields work ... also with md theme.	2017-12-16 20:52:49 +01:00
Laurent Destailleur	9cdf322bfb	Fix scrutinizer bugs	2017-12-15 22:14:28 +01:00
Laurent Destailleur	c119d7dbb9	Code comment	2017-12-13 23:37:34 +01:00
Laurent Destailleur	247c380d18	Several fixes	2017-12-12 16:11:40 +01:00
Laurent Destailleur	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	1251807f54	Fix several pb in links to projects on create page	2017-12-12 10:37:51 +01:00
Laurent Destailleur	9314dcb046	Fix regression	2017-12-12 10:13:48 +01:00
Laurent Destailleur	7efbcfa1e9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-11 13:50:49 +01:00
Laurent Destailleur	338f8d978a	Fix generation of doc in modulebuilder	2017-12-11 13:50:26 +01:00
Laurent Destailleur	acf2d2ee9a	Fix scrutinizer reported bugs	2017-12-11 11:48:11 +01:00
Laurent Destailleur	748aee9a54	Fix javascript error	2017-12-10 19:54:04 +01:00
Laurent Destailleur	2dae21259e	Fix the switch show more/less	2017-12-10 19:03:18 +01:00
Laurent Destailleur	02d9e93ed4	Fix badge and use of data-html instead of html tag	2017-12-10 15:46:35 +01:00
Laurent Destailleur	472d7b591e	Fix hook for formmail and translation	2017-12-10 02:01:36 +01:00
Laurent Destailleur	8d20473ffd	Fix date of extrafields	2017-12-09 23:19:29 +01:00
Laurent Destailleur	cc813df2a5	Fix modulebuilder	2017-12-09 20:17:47 +01:00
Laurent Destailleur	f22e7ee24a	Fixes	2017-12-09 17:29:19 +01:00
Laurent Destailleur	e3dcff7f5b	Fix substition for menus title and urls	2017-12-09 15:35:01 +01:00
Laurent Destailleur	95cb5025a2	Fix length of month too large ... More complete template	2017-12-08 16:15:41 +01:00
Laurent Destailleur	f85e79e250	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/filefunc.inc.php htdocs/holiday/class/holiday.class.php	2017-12-08 13:13:53 +01:00
Laurent Destailleur	8dc3d7323d	Merge pull request #7923 from fmarcet/6.0 ... FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable	2017-12-08 13:02:07 +01:00
Ferran Marcet	bfc476a118	FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable	2017-12-07 18:44:33 +01:00
Laurent Destailleur	74a63ca18c	Fix scrutinizer	2017-12-06 23:43:59 +01:00
Laurent Destailleur	8019f73f99	Fix: protection to not delete invoice if invoice is in bookkeeping	2017-12-05 10:01:30 +01:00
Laurent Destailleur	78c4b7f912	Fix look and feel v7	2017-12-04 20:17:07 +01:00
Laurent Destailleur	d2adec01b0	Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice	2017-12-03 20:18:00 +01:00
Laurent Destailleur	58edc06ac3	Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice	2017-12-03 20:15:04 +01:00
Laurent Destailleur	b41213f9a1	Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice	2017-12-03 20:08:53 +01:00
Laurent Destailleur	cc05bb3c8c	Fix duplicate errors	2017-12-03 19:36:59 +01:00
Laurent Destailleur	ce32da6217	Fix debugs APIs	2017-12-01 15:39:18 +01:00
Laurent Destailleur	a0231b5c60	Fix responsive	2017-12-01 12:55:28 +01:00
Laurent Destailleur	670465fcd8	Fix responsive and search	2017-12-01 12:01:17 +01:00
Laurent Destailleur	b14cb7a97f	Debug accountancy	2017-11-28 11:49:11 +01:00
Laurent Destailleur	533a82187a	NEW Add a protection so we can't journalize non balanced transactions	2017-11-27 17:12:48 +01:00
Laurent Destailleur	57d4f28cba	Enhance usability of accounting module	2017-11-27 15:51:28 +01:00
alexis Algoud	61a3131fc4	fix include for ajax select product supplier order	2017-11-27 10:59:46 +01:00
Laurent Destailleur	e4d0213916	Removed duplicate code	2017-11-26 22:06:14 +01:00
Laurent Destailleur	c02528a479	NEW Accept substitution key __[ABC]__ replaced with value of const ABC	2017-11-25 19:55:31 +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	e6b16815aa	Fix responsive	2017-11-25 17:25:27 +01:00
Laurent Destailleur	e1484caa59	Fix responsive	2017-11-25 17:21:53 +01:00
Laurent Destailleur	1ea9137863	Fix sort order	2017-11-25 16:21:44 +01:00
Laurent Destailleur	5ba4a57b61	Fix sort on last actions	2017-11-25 16:05:45 +01:00
Laurent Destailleur	0b9a3087ea	Fix bug reported by scrutinizer	2017-11-25 12:11:02 +01:00
Laurent Destailleur	412c4e335d	Fix method of herited object has same signature than parent	2017-11-25 11:10:52 +01:00
Laurent Destailleur	88841ccbae	FIX #7590	2017-11-25 01:58:11 +01:00
Laurent Destailleur	c16a150a70	NEW Remove background on agenda view when event is a not busy event.	2017-11-24 20:02:46 +01:00
Laurent Destailleur	7ea96d53a2	Minor fixes	2017-11-24 18:12:01 +01:00
Laurent Destailleur	4f4f929efb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/holiday/class/holiday.class.php	2017-11-24 17:02:14 +01:00
Laurent Destailleur	2493c2468d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/core/class/conf.class.php htdocs/core/lib/files.lib.php	2017-11-24 16:51:59 +01:00
Laurent Destailleur	21764ed0cf	Merge pull request #7856 from frederic34/patch-1 ... Update html.form.class.php	2017-11-24 16:33:00 +01:00
Laurent Destailleur	831099fef8	Debug modulebuilder	2017-11-24 16:24:42 +01:00
Laurent Destailleur	abe13d108b	Clean code used for autocompletion	2017-11-24 09:23:18 +01:00
Laurent Destailleur	9c22b5f335	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
Laurent Destailleur	5cf21fef05	Use autocompletion on list of taxes	2017-11-23 15:46:52 +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
Frédéric FRANCE	0ee30171db	Update html.form.class.php	2017-11-23 08:36:10 +01:00
Laurent Destailleur	5b77fe393e	Fix: contact not preselected	2017-11-23 00:59:43 +01:00
Laurent Destailleur	5a2fe13958	Fix travis	2017-11-22 21:36:01 +01:00
Laurent Destailleur	adce4b5b7b	Debug multi contact on event. ... Prepare also code to manage properties of attendees of event	2017-11-22 14:42:47 +01:00
Laurent Destailleur	fd5cb736ce	Merge pull request #6961 from atm-ph/new_event_with_multi_contact ... New multi contacts on actioncomm	2017-11-22 12:05:04 +01:00
Laurent Destailleur	aa91b9075a	Fix cancel button	2017-11-22 11:54:02 +01:00
Regis Houssin	a9bfe0f48f	Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)	2017-11-22 10:12:51 +01:00
Laurent Destailleur	2b95679b84	Add info to help spam fight	2017-11-21 14:09:15 +01:00
Laurent Destailleur	4b4412d5da	Standardize file names for ECM	2017-11-20 19:40:34 +01:00
Laurent Destailleur	6953420ce8	Support for ar_EG as laternative of ar_AS	2017-11-19 21:25:21 +01:00
Laurent Destailleur	5849efd9fc	Work on public sharing files	2017-11-19 20:44:57 +01:00
Laurent Destailleur	4ad0d5df43	Fix scrutinizer issues	2017-11-19 16:55:28 +01:00
Laurent Destailleur	4938a0ba2a	Add param forcenowrap on tooltip function	2017-11-19 12:41:37 +01:00
Laurent Destailleur	9b1470dab5	Work on generic filemanager component	2017-11-18 22:13:19 +01:00
atm-ph	15a8f2037b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-11-18 11:54:21 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
Laurent Destailleur	451d3ed8ed	NEW Add API to activate/unactivate a contract	2017-11-14 17:51:04 +01:00
Laurent Destailleur	a50589c3c9	NEW Better behaviour when using a text browser	2017-11-14 15:10:46 +01:00
Laurent Destailleur	11cb9c0d81	Code simpler	2017-11-14 01:57:50 +01:00
Laurent Destailleur	b5196b7164	FIX A lot of several fix on local taxes and NPR tax	2017-11-13 14:24:40 +01:00
Laurent Destailleur	53a523ba9d	Module builder	2017-11-12 20:45:06 +01:00
Laurent Destailleur	955ed7dbbf	NEW Show the supplier ref into supplier cards	2017-11-12 15:30:21 +01:00
Laurent Destailleur	186c8cdbf0	Fix selection of contact into creation of event	2017-11-12 13:40:05 +01:00
Laurent Destailleur	0cd8aa8a49	Merge pull request #7798 from hregis/develop_extrafields ... Fix: missing status 3 (only on form)	2017-11-11 17:59:33 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Laurent Destailleur	01a41237bf	CSS	2017-11-11 14:20:08 +01:00
Laurent Destailleur	debc0480dd	CSS	2017-11-10 20:20:59 +01:00
Laurent Destailleur	a029b16795	css	2017-11-10 18:27:03 +01:00
Laurent Destailleur	cb03b2f307	NEW Can sort joined files on thirdparty and user card.	2017-11-10 18:14:29 +01:00
Regis Houssin	3ffe1b6725	Fix: missing status 3 (only on form)	2017-11-10 16:51:37 +01:00
Laurent Destailleur	beacf4225f	Work on filemanager	2017-11-10 15:44:43 +01:00
Laurent Destailleur	c2d7b88bdd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-10 13:51:59 +01:00
Laurent Destailleur	ab78007a54	Work on filemanager generic component	2017-11-10 13:45:38 +01:00
Laurent Destailleur	9d3cf8f217	Fix can use tooltip with popup even for column titles	2017-11-09 18:50:15 +01:00
Laurent Destailleur	f8a44431b5	Fix visibility of extrafields	2017-11-07 13:41:59 +01:00
Laurent Destailleur	bc79aced6c	Fix extrafields with column perms not filled are not visible	2017-11-07 12:33:13 +01:00
Laurent Destailleur	d90e3e88c2	NEW Add method executeCLI and a phpunit	2017-11-06 20:24:12 +01:00
Laurent Destailleur	c78c06776b	Fix bug reported by scrutinizer	2017-11-05 03:39:27 +01:00
Laurent Destailleur	cd70e1506b	Work on common core code	2017-11-03 17:20:08 +01:00
Laurent Destailleur	a346a1a5e9	Work on website module	2017-11-03 15:56:16 +01:00
Laurent Destailleur	fd86c470a8	FIX #7651 #7748 #7542	2017-11-02 13:47:29 +01:00
Laurent Destailleur	f26d970d58	Remove option MAIN_HTML5_PLACEHOLDER (on by default now)	2017-11-01 10:17:24 +01:00
Laurent Destailleur	9458c80c48	Work on reminders	2017-10-31 23:10:29 +01:00
Laurent Destailleur	bbe1c9c494	NEW Can download PDF document from the payment page	2017-10-30 00:45:47 +01:00
Laurent Destailleur	76b0e7ee5a	NEW Add option PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD	2017-10-29 21:24:54 +01:00
Laurent Destailleur	02cae88a8c	Fix date output	2017-10-29 17:50:50 +01:00
Laurent Destailleur	33aa0f3160	Code comment	2017-10-29 17:49:24 +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	46f95e14fa	Fix select2 search	2017-10-28 17:34:46 +02:00
Laurent Destailleur	00db7e16ec	Clean code	2017-10-28 16:00:07 +02:00
Laurent Destailleur	9283aaf6aa	Fix scrutinizer	2017-10-27 00:07:58 +02:00
Laurent Destailleur	a1f862eba6	NEW Enhance framework so we can use html/icons into SELECT options.	2017-10-26 20:06:23 +02:00
Laurent Destailleur	89baa0b307	Work on website	2017-10-26 14:49:30 +02:00
Laurent Destailleur	82b333e423	Fix migration to select2 4.0.5	2017-10-26 14:06:23 +02:00
Laurent Destailleur	6d6c4bf088	Fix export web site	2017-10-26 10:43:47 +02:00
Laurent Destailleur	e865f41b86	NEW Extrafields "link to object" now use a combo selection and getNomUrl	2017-10-26 02:55:43 +02:00
Laurent Destailleur	66d2c29fe1	Work on modulebuilder and website module	2017-10-26 01:02:13 +02:00
Laurent Destailleur	ff9a6ca01b	Work on module builder	2017-10-25 22:23:54 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	bb996019c2	NEW Support visibility on extrafields	2017-10-25 11:42:14 +02:00
Laurent Destailleur	f381361c8b	Work on modulebuilder	2017-10-24 19:57:36 +02:00
Laurent Destailleur	0b120dd1a9	Prepare code to remove hooks on extrafield update	2017-10-24 18:45:34 +02:00
Laurent Destailleur	d3f2e19691	Merge pull request #7680 from Nicos-git/OdtGeneration ... NEW Add product unit fields for ODT substitution	2017-10-22 04:14:17 +02:00
Laurent Destailleur	ba2dd953b4	Update commondocgenerator.class.php	2017-10-22 04:13:49 +02:00
Laurent Destailleur	764e215ca1	Update commondocgenerator.class.php	2017-10-22 04:12:46 +02:00
Laurent Destailleur	b9c0ea3691	Update commondocgenerator.class.php	2017-10-22 04:07:54 +02:00
Laurent Destailleur	5984222794	FIX #7679	2017-10-22 03:47:36 +02:00
Nicolas Leichtle	fc2a834e41	New Add product unit fields for ODT substitution	2017-10-21 23:54:49 +02:00
Laurent Destailleur	dbcf3ddbe8	NEW Upgrade jquery select2 to 4.0.4	2017-10-21 19:05:24 +02:00
Laurent Destailleur	19a5780f7f	Clean code	2017-10-20 23:49:20 +02:00
Laurent Destailleur	5c189449e1	Move default value for user expense report on tab expense report	2017-10-20 17:02:26 +02:00
Laurent Destailleur	f67350db72	Merge pull request #7647 from BackrndSource/patch-2 ... FIX: Some errors from html.form.class.php not translated on fourn/commande/card.php	2017-10-19 19:19:21 +02:00
Laurent Destailleur	9c45e86a1c	Introduce main_doc into table of objects to know what is main doc. ... Work on option PROPOSAL_USE_ONLINE_SIGN	2017-10-19 11:40:40 +02:00
Laurent Destailleur	cfeab01996	Prefill hour/min to 23:59 when creating a task	2017-10-18 18:50:30 +02:00
Laurent Destailleur	8b140ab069	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-17 10:44:29 +02:00
Laurent Destailleur	eb1fdca157	NEW Can create intervention from a proposal	2017-10-17 10:44:18 +02:00
BackrndSource	df388df3ff	Update html.form.class.php ... $lang->load('errors') is needed to load the traductions for: $return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>'; $return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';	2017-10-16 22:56:16 +02:00
Laurent Destailleur	768c623a89	Merge pull request #7644 from atm-florian/dev_extrafield_default_value ... FIX : Extrafield default value admin/defaultvalues.php enabled	2017-10-16 21:42:50 +02:00
florian HENRY	51ce8bf2a5	js	2017-10-16 21:08:09 +02:00
florian HENRY	17db813a4e	Logical variable name suffix/prefix	2017-10-16 21:05:12 +02:00
florian HENRY	695740142a	FIX : Extrafield default value admin/defaultvalues.php enabled	2017-10-16 20:54:53 +02:00
Laurent Destailleur	ebe0664aff	Merge branch 'develop' into scrutinizer-patch-3	2017-10-16 20:54:15 +02:00
Laurent Destailleur	f7fe011e98	Add CRLF before 'boundary' word. Use \r\n on wordwrap.	2017-10-16 14:31:28 +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	afdc176f47	Fix scrutinizer	2017-10-16 08:52:00 +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
Laurent Destailleur	ab280feaa5	Move datepicker vars into lib_heas.js.php	2017-10-13 22:37:46 +02:00
Laurent Destailleur	4296df45af	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/projet/list.php htdocs/user/card.php	2017-10-13 22:01:56 +02:00
Laurent Destailleur	5092c41d94	Look and feel v6	2017-10-13 20:04:11 +02:00
Laurent Destailleur	8b64f979ef	Fix multiple upload was broken	2017-10-13 15:49:39 +02:00
Laurent Destailleur	5f22afa450	Merge pull request #7621 from atm-ph/fix_distinct_credit_note ... Fix distinct credit note select list	2017-10-13 13:32:04 +02:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	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
atm-ph	bab43b043e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-10-13 09:52:56 +02:00
atm-ph	647c4036cf	Fix simplification of code	2017-10-13 09:21:37 +02:00
Laurent Destailleur	558f261b60	FIX #7593	2017-10-13 01:03:33 +02:00
atm-ph	8d3df7ea57	Fix can not distinct which credit note are in select list	2017-10-12 09:59:25 +02:00
Laurent Destailleur	0d0030cff4	Fix use of sender profiles	2017-10-11 19:57:53 +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	efac9ddb12	Merge pull request #7613 from hregis/develop_extrafields ... Fix: label not translated if special lang file used	2017-10-11 11:58:44 +02:00
Laurent Destailleur	eb995bb7ad	Merge pull request #7603 from hregis/develop_bug5 ... Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented)	2017-10-11 11:48:46 +02:00
Laurent Destailleur	e644f7df58	Merge pull request #7597 from hregis/develop_member ... NEW add company alias name when create company from member	2017-10-11 11:31:55 +02:00
Regis Houssin	7e79c3a795	Fix: label not translated if special lang file used	2017-10-11 10:10:27 +02:00
Regis Houssin	9ff0855812	Fix: datepicker.js.php is needed for the translation !!	2017-10-10 10:04:16 +02:00
Regis Houssin	88e700ae12	Fix: add month names short	2017-10-10 09:30:07 +02:00
Regis Houssin	f51c0db705	NEW add translation and possibility to change month and year	2017-10-10 09:16:14 +02:00
Regis Houssin	00db16e0de	Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented)	2017-10-10 08:49:00 +02:00
Regis Houssin	625e440653	Fix: wrong test	2017-10-09 16:50:20 +02:00
Regis Houssin	86c301f197	Fix: uniformize parameters	2017-10-09 15:49:10 +02:00
Regis Houssin	16b766182c	NEW view company name if different of fullname in dol_banner	2017-10-09 15:35:08 +02:00
Laurent Destailleur	8f24a86352	NEW If max nb of generation is reached, date for next gen is striked	2017-10-09 14:16:22 +02:00
Rui Strecht	6c0cb31c08	Fixed issue with merge error	2017-10-09 11:44:10 +01:00
Regis Houssin	f2d9288db5	NEW add company alias name when create company from member	2017-10-09 12:38:44 +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	3e0ccd6312	FIX #7585	2017-10-09 10:43:19 +02:00
Laurent Destailleur	67c33840cf	Code comment	2017-10-08 23:19:19 +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
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
Laurent Destailleur	8d47969d29	Merge pull request #7578 from OPEN-DSI/fix_0002 ... NEW add a new notification for the signed closed event of a proposal.	2017-10-06 17:36:23 +02:00
Laurent Destailleur	c7a0f467cc	Fix var unknown	2017-10-06 17:03:32 +02:00
KHELIFA	88ab3a9cab	Add a new notification for the event that has successfully closed a proposal.	2017-10-06 16:15:40 +02:00
Laurent Destailleur	43d85af5ae	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 15:23:10 +02:00
Laurent Destailleur	f9d9642340	FIX #6981	2017-10-06 14:07:28 +02:00
Laurent Destailleur	8ce723b4c9	FIX #7514	2017-10-06 13:56:54 +02:00
Laurent Destailleur	2d549a6191	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 13:09:42 +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
Laurent Destailleur	2148622d40	Clean code	2017-10-06 12:55:48 +02:00
Inovea Conseil	2f3f04c2b1	Add constant to manage update_price function ... Some external module want no update price after a trigger because they have a other method to calculate the total (ex: with a extrafield).	2017-10-06 10:42:25 +02:00
Laurent Destailleur	801a5180d6	Fix scrutinizer bug reports	2017-10-06 01:16:19 +02:00
Laurent Destailleur	2a2cd30e19	Fix code	2017-10-05 10:00:43 +02:00
Regis Houssin	8a79198769	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_ldap Conflicts: htdocs/core/class/comment.class.php	2017-10-04 20:00:39 +02:00
Laurent Destailleur	6540bc0061	Fix doxygen	2017-10-04 19:48:11 +02:00
Laurent Destailleur	ded55f41fb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commonobject.class.php	2017-10-04 16:08:22 +02:00
Laurent Destailleur	13cb806436	FIX #7531 #7537	2017-10-04 15:18:15 +02:00
Regis Houssin	c563c3d3ac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-10-04 13:19:07 +02:00
Regis Houssin	537fc63da5	Fix: add by error	2017-10-04 13:18:48 +02:00
Laurent Destailleur	85606126a9	Standardize code for events	2017-10-04 12:58:13 +02:00
Regis Houssin	a259057dd3	Fix: Found non escaped string	2017-10-04 12:42:41 +02:00
Regis Houssin	a124f47dcd	Fix: PHPCS	2017-10-04 12:07:17 +02:00
Regis Houssin	66ad30feb0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-10-04 11:23:50 +02:00
Regis Houssin	723bc4d436	NEW add ldap_rename for avoid password if ldap key changed	2017-10-04 11:22:41 +02:00
Laurent Destailleur	75a7e086b3	Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element ... New comment generic element	2017-10-04 11:13:39 +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	a6cf934973	Add log	2017-10-04 02:46:01 +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	c22cd1cfe9	Fix test on entity must always be done using the "IN" instead of "="	2017-10-03 17:41:22 +02:00
Regis Houssin	a88938ace4	Fix: use GETPOST	2017-10-03 17:11:42 +02:00
Regis Houssin	9c2d053f74	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-10-03 17:01:39 +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	c1b6f59c1b	Fix: restore possible ldap keys	2017-10-02 08:43:53 +02:00
Laurent Destailleur	6dbc02022f	Merge pull request #7529 from Nicos-git/develop ... NEW: Add project related fields to ODT	2017-10-02 00:36:46 +02:00
Laurent Destailleur	48c3d0e3f2	Update commondocgenerator.class.php	2017-10-02 00:36:15 +02:00
Laurent Destailleur	f15ce54c05	Update commondocgenerator.class.php	2017-10-02 00:34:55 +02:00
Laurent Destailleur	a81d458829	Merge pull request #7509 from dolibarr95/patch-21 ... NEW Add the attribute accept to the input form for file upload	2017-10-02 00:12:03 +02:00
Laurent Destailleur	e23a88732e	Fix default value on extrafields	2017-09-30 20:05:34 +02:00
Laurent Destailleur	a43dcbd0c5	Fix no "now" link on search of a date extrafield in list	2017-09-30 18:57:21 +02:00
Laurent Destailleur	976cbd5f83	Fix javascript error and input field for password extrafield in list	2017-09-30 18:52:33 +02:00
Nicolas Leichtle	95cc007b39	NEW: Add project related fields to ODT	2017-09-30 15:40:17 +02:00
Laurent Destailleur	0e15aef44f	CSS	2017-09-30 00:30:58 +02:00
Regis Houssin	9490e13c21	Fix: command not found with escapeshellarg !	2017-09-29 14:52:05 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +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	e878f3cfd5	No more need of contacts on each tab by default	2017-09-27 20:15:56 +02:00
Laurent Destailleur	fdc1aa2a03	NEW Move contacts of a thirdparty on tab Contacts/Addresses	2017-09-27 19:56:03 +02:00
Regis Houssin	9823d6622c	Fix: use default $shared value	2017-09-27 17:40:02 +02:00
Regis Houssin	20684b4505	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/core/modules/rapport/pdf_paiement.class.php htdocs/core/modules/rapport/pdf_paiement_fourn.class.php	2017-09-27 17:22:18 +02:00
arnaud	f29ea35dc8	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element	2017-09-27 14:56:52 +02:00
dolibarr95	00862913d8	Add the attribute accept to input tag ... I know this is not a security check but it is more convenient for the user when in a form only images or pdf are accepted for example. see : *https://www.w3.org/wiki/HTML/Elements/input/file *https://www.w3schools.com/TagS/att_input_accept.asp Hope every body needs it. tks	2017-09-27 11:12:38 +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
Laurent Destailleur	d7dd6ed334	Fix undefined var	2017-09-26 16:15:22 +02:00
Laurent Destailleur	d1bee67b40	FIX #3991	2017-09-26 13:09:19 +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	919d29fdf7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-09-25 19:45:40 +02:00
Laurent Destailleur	fe55feb82f	FIX #7461	2017-09-25 19:45:01 +02:00
Laurent Destailleur	dc362fcd30	NEW Can show currency in list of bank accounts	2017-09-25 18:11:03 +02:00
Inovea Conseil	35ae0e435d	Fix quote in input ... Delete a quote in input field	2017-09-25 16:14:14 +02:00
Laurent Destailleur	7b9facc76a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-25 11:43:12 +02:00
Laurent Destailleur	a9fabf117e	Code comment	2017-09-25 11:42:59 +02:00
Laurent Destailleur	53d931dd11	Merge pull request #7481 from dolibarr95/patch-17 ... Fix 7470	2017-09-25 11:34:00 +02:00
dolibarr95	6ee15f1c45	Fix 7470 ... php warning when MAIN_MODULE_xxxxx_DIR exists but the module does not have a directory.	2017-09-25 09:01:47 +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
Regis Houssin	92ff974c5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-25 06:47:34 +02:00
Laurent Destailleur	934edd9f5a	Merge branch 'develop' into 6.0-api	2017-09-24 22:01:07 +02:00
Laurent Destailleur	2285e9bc0b	Merge branch 'develop' into develop_trad	2017-09-24 21:47:17 +02:00
Laurent Destailleur	971e59395c	Fix phpcs	2017-09-24 21:46:14 +02:00
Laurent Destailleur	4246cf24f3	Perf enhancement: Remove one include of js.	2017-09-24 20:36:27 +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
Regis Houssin	0cdca6f3eb	Fix: phpcs error	2017-09-24 11:10:33 +02:00
Laurent Destailleur	91d303465d	NEW Can add html content on right of tabs	2017-09-24 01:39:06 +02:00
Laurent Destailleur	414f633e75	Fix css	2017-09-23 12:59:49 +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	63ec14e47d	Convert sode to send member info email into new generic email template ... system.	2017-09-22 20:18:11 +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	8578a1b825	NEW Option "one email per recipient" when using bulk actions emails.	2017-09-22 17:04:26 +02:00
Laurent Destailleur	6d7db96359	NEW Option "one email per recipient" when using bulk actions emails.	2017-09-22 16:31:05 +02:00
Laurent Destailleur	252f038468	Mutualize code of substitutions for emails	2017-09-22 14:34:31 +02:00
Laurent Destailleur	bd45ea5a03	Split page for invoice template into card + list. Add more filters.	2017-09-22 11:28:53 +02:00
Regis Houssin	1314e00bc6	Fix: check if array and check empty value if required	2017-09-20 14:46:51 +02:00
Rui Strecht	395100ca70	Added missing comments for new function parameters, removed unused parameter $searchlabel	2017-09-20 12:45:18 +01: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	8dfa87fcf6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-19 19:30:28 +02:00
Laurent Destailleur	c38ed54990	Disable old datepicker	2017-09-19 17:31:37 +02:00
atm-quentin	815d0aff90	FIX for free line select unit was wrong	2017-09-19 15:10:18 +02:00
Laurent Destailleur	f936b17d68	FIX Protection to avoid to apply credit note discount > remain to pay	2017-09-19 00:24:52 +02:00
Rui Strecht	998eea09bd	Added new option MAIN_SHOW_STATE_CODE (on/off; 1/0) to show state code in select fields options and values. ... Changed option MAIN_SHOW_REGION_IN_STATE to on/off - 1/0 and to mix with the new MAIN_SHOW_STATE_CODE (can show region name and state code)	2017-09-18 16:48:13 +01:00
arnaud	e7bb7a3588	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element	2017-09-18 17:28:03 +02:00
arnaud	9795f48046	NEW comment system working with all objects	2017-09-18 17:27:29 +02:00
Laurent Destailleur	da6b1e92b2	NEW Add the total in the perday view of the time spent form.	2017-09-18 14:18:34 +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	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	3f7b705674	Use correct term accounting for codes	2017-09-18 00:48:09 +02:00
Laurent Destailleur	ee774f1bf9	FIX Calculation in the activity box	2017-09-17 20:20:48 +02:00
Laurent Destailleur	9dbd88f0ba	FIX Calculation in the activity box	2017-09-17 20:17:51 +02:00
Laurent Destailleur	fa18e788b5	Fix must use photo of user	2017-09-17 17:29:00 +02:00
Laurent Destailleur	ab5724e7ff	Mutualize code for forms to send emails. Remove thousand line of code.	2017-09-17 17:12:14 +02:00
Regis Houssin	d9b3a4e456	Fix: phpcs	2017-09-16 21:58:05 +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	b4eab24490	Add project into list of customer orders	2017-09-16 20:32:28 +02:00
Laurent Destailleur	0fec777d0e	NEW On bulk email from a list, can uncheck "Join main document". ... NEW Show direct preview link on contract	2017-09-16 18:31:30 +02:00
Regis Houssin	4ab1f68102	Fix: check connectivity for avoid ldap errors	2017-09-16 17:12:51 +02:00
Laurent Destailleur	630dc92a13	NEW Mass PDF Merging is available on contracts	2017-09-16 15:39:52 +02:00
Laurent Destailleur	e56b41c1ae	Clean code	2017-09-16 13:28:13 +02:00
Laurent Destailleur	0cf67944fa	Clean code	2017-09-16 13:14:46 +02:00
Laurent Destailleur	bd7c4fe940	NEW Summary of last events on a card are sorted on decreasing date.	2017-09-16 10:12:44 +02:00
Laurent Destailleur	8986640a10	FIX Responsive	2017-09-16 09:16:05 +02:00
Laurent Destailleur	4e7e6cc658	Fix W3C	2017-09-16 09:15:10 +02:00
Laurent Destailleur	baa32f6ed8	FIX Responsive	2017-09-16 09:13:57 +02:00
Laurent Destailleur	961d475a9d	More complete substitution system. ... Add __CONTRACT_NEXT_EXPIRATION_DATE__ and __CONTRACT_NEXT_EXPIRATION_DATETIME__	2017-09-16 03:45:29 +02:00
Laurent Destailleur	a4086b52ef	NEW Can send email from contract card	2017-09-16 01:34:15 +02:00
Laurent Destailleur	b13dbf1f06	Clean code. Make selection of template working even if public.	2017-09-16 00:49:46 +02:00
Regis Houssin	767240698f	Fix: wrong var name	2017-09-15 18:31:22 +02:00
Regis Houssin	7f57f737b3	New: Ping ldap server before ldap_connect for avoid waiting	2017-09-15 18:02:52 +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	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	77056d9adb	NEW All setup of accountancy can be done from menu "Accountancy-Setup"	2017-09-15 14:09:42 +02:00
Laurent Destailleur	1a78e2a055	Mutualize/share code of all payments modes	2017-09-15 13:43:16 +02:00
Laurent Destailleur	0ade500535	Better support of text editor when no js available.	2017-09-15 11:19:56 +02:00
Laurent Destailleur	3b40c95107	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/class/categorie.class.php	2017-09-14 21:57:14 +02:00
Laurent Destailleur	c52e593ea8	Fix this->db	2017-09-14 21:27:14 +02:00
Laurent Destailleur	2f80618545	Merge pull request #7390 from atm-arnaud/FIX_task_comment_design ... Fix task comment design	2017-09-14 12:21:58 +02:00
Laurent Destailleur	ed9c401ca6	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-14 12:20:26 +02:00
Laurent Destailleur	b80b7bbcb9	Merge pull request #7384 from atm-ph/fix_6.0_get_class_self ... Fix get_class(self) instead of get_class($this)	2017-09-14 12:16:16 +02:00
Laurent Destailleur	f2d092c815	Merge pull request #7377 from hregis/6.0_bug2 ... Fix: missing select2 combobox	2017-09-14 12:08:28 +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	74b55d8e8d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-14 11:49:43 +02:00
Laurent Destailleur	ed013c1b7e	Compatibilty php 7.2	2017-09-14 10:21:04 +02:00
Laurent Destailleur	eadfbfe2bd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions2.lib.php	2017-09-13 20:57:53 +02:00
Laurent Destailleur	9b22f046f5	FIX multicompany better accuracy in rounding and with revenue stamp.	2017-09-13 19:31:32 +02:00
Laurent Destailleur	a5a08006e9	FIX multicompany better accuracy in rounding and with revenue stamp.	2017-09-13 19:27:21 +02:00
Laurent Destailleur	c44a5ede43	FIX Several problem with the last event box on project/tasks ... Conflicts: htdocs/core/lib/functions2.lib.php	2017-09-13 15:16:06 +02:00
Laurent Destailleur	7767ac2aa7	FIX Several problem with the last event box on project/tasks	2017-09-13 15:12:54 +02:00
arnaud	4b6553d360	FIX comment color and create colorIsLight function	2017-09-13 10:43:44 +02:00
Laurent Destailleur	2cdea7e37c	Fix bug reported by scrutinizer	2017-09-12 19:21:26 +02:00
atm-ph	30eb03af4c	Fix get_class(self) instead of get_class($this)	2017-09-12 16:36:14 +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
Regis Houssin	e038e1a2f5	Fix: missing select2 combobox	2017-09-12 09:27:59 +02:00
Laurent Destailleur	44405e5415	Fix #7335 #7365 Better fix	2017-09-11 15:04:29 +02:00
Laurent Destailleur	dcc9cb4a16	Some fixes in various payment	2017-09-11 14:29:27 +02:00
Laurent Destailleur	029f1c411f	Merge pull request #7357 from hregis/6.0_medias ... Fix: some problems with medias in multicompany	2017-09-11 14:13:51 +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	d13c4b7b84	Better autosize of extrafields	2017-09-11 01:05:55 +02:00
Laurent Destailleur	25ec124411	Better autosize of extrafields	2017-09-11 00:19:42 +02:00
Laurent Destailleur	e7abb39ee2	NEW Template invoices are visible on the customer tab	2017-09-10 19:28:20 +02:00
Regis Houssin	762b4eb876	Fix: some problems with medias in multicompany	2017-09-09 17:48:04 +02:00
Laurent Destailleur	4f52871c67	Merge pull request #7345 from AXeL-dev/develop ... fix hidepriceinlabel when using ajax autocompleter	2017-09-08 21:22:38 +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	03fe9d4e97	Escape all status	2017-09-08 13:23:12 +02:00
Laurent Destailleur	b7197530c2	NEW Each user can edit its own email template (menu tools)	2017-09-08 12:48:01 +02:00
AXeL-dev	a615a46a5a	fix hidepricelabel when using ajax autocompleter	2017-09-08 11:06:55 +01: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	61ee071f43	Fix regression	2017-09-04 10:17:51 +02:00
Laurent Destailleur	2c3a696b78	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-09-04 10:16:02 +02:00
Laurent Destailleur	f3b1f89bae	Fix warning	2017-09-03 15:21:37 +02:00
Laurent Destailleur	f963afa505	Fix warning	2017-09-03 15:21:17 +02:00
Laurent Destailleur	3126676ffb	FIX inert of extra field must not change extrafield values in memory	2017-09-03 14:27:46 +02:00
Laurent Destailleur	c6cbf2345d	FIX Management of default value in extrafields when default is '0'	2017-09-03 14:25:54 +02:00
Laurent Destailleur	a4d3e48773	FIX inert of extra field must not change extrafield values in memory	2017-09-03 12:40:49 +02:00
Laurent Destailleur	3beee569a6	Enhance support of default value in extrafields	2017-09-02 15:18:41 +02:00
Laurent Destailleur	9923c87fd8	Fix translation of extrafields	2017-09-02 13:03:14 +02:00
Laurent Destailleur	36eb21c135	Fix translation of extrafields	2017-09-02 13:02:01 +02:00
Laurent Destailleur	e5400a4a36	Fix translation of extrafields	2017-09-02 13:01:41 +02:00
Laurent Destailleur	7f7b4cddb4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-02 12:37:02 +02:00
Laurent Destailleur	015bc51c43	Fix regression adding a false error message	2017-09-02 12:17:29 +02:00
Laurent Destailleur	32c6acefd2	Merge pull request #7321 from ruistrecht-alt/NEW_Add_region_to_state/province_form_field ... NEW Added Region name to state/province form field	2017-09-02 00:10:25 +02:00
Rui Strecht	1ee0077e4e	Fix: Added name to contributors	2017-09-01 16:10:19 +01:00
Laurent Destailleur	4660bc58fc	Fix nostop option	2017-09-01 17:08:47 +02:00
Laurent Destailleur	bda507d191	Fix nostop option	2017-09-01 17:07:26 +02:00
Laurent Destailleur	223e1b1cd4	Fix missing the nostop tag	2017-09-01 16:55:09 +02:00
Laurent Destailleur	920d6270c3	Fix missing the nostop tag	2017-09-01 16:54:06 +02:00
Rui Strecht	9443cb0c1b	NEW Added Region name to state/province form field	2017-09-01 15:53:06 +01:00
Laurent Destailleur	2768878618	FIX Bad condition on sms log debug	2017-09-01 16:39:49 +02:00
Laurent Destailleur	e663314cb1	Clean code	2017-09-01 16:38:56 +02:00
Laurent Destailleur	c02355c8c3	FIX Bad condition on sms log debug	2017-09-01 16:37:45 +02:00
Laurent Destailleur	61cf69f2bb	NEW Include a color syntaxed HTML editor for emailing edition.	2017-09-01 13:09:13 +02:00
Maxime Kohlhaas	cf49c274a6	Better fix	2017-09-01 10:38:50 +02:00
Maxime Kohlhaas	1a956cce9a	Fix : insert line extrafield	2017-09-01 10:31:22 +02:00
atm-ph	8188abd4cd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-08-31 11:09:02 +02:00
Laurent Destailleur	9146bb336e	Work on merging all payment modes in one page	2017-08-31 03:34:57 +02:00
Regis Houssin	8e8f94df11	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/class/facture-rec.class.php	2017-08-30 19:33:23 +02:00
Laurent Destailleur	a60cd49fb0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php	2017-08-28 12:53:02 +02:00
Laurent Destailleur	075a138e14	Fix substitution of __EMAIL__	2017-08-28 12:49:57 +02:00
Laurent Destailleur	c382ca22b8	FIX link in to email and option for tls	2017-08-28 00:09:21 +02:00
Laurent Destailleur	b12800d174	FIX link in to email and option for tls	2017-08-28 00:06:19 +02:00
Laurent Destailleur	502ac19a0a	Fix regression on categories	2017-08-27 12:28:59 +02:00
Laurent Destailleur	3f7eea2e0a	NEW Can set language on extrafields	2017-08-27 12:12:02 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	782b85ba13	Merge pull request #7285 from hregis/6.0_bug ... Fix: avoid error "A non-numeric value encountered"	2017-08-26 19:31:16 +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	4337001418	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/societe/list.php	2017-08-24 14:26:45 +02:00
Laurent Destailleur	8e6546497a	Code comment	2017-08-24 13:43:36 +02:00
Laurent Destailleur	326d3df63f	FIX select of category ... FIX pb with extrafield list and key '0' Conflicts: htdocs/core/class/extrafields.class.php	2017-08-24 13:28:56 +02:00
Laurent Destailleur	7da6f93d7e	FIX select of category ... FIX pb with extrafield list and key '0'	2017-08-24 13:23:15 +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
Regis Houssin	7da1b215f3	Fix: avoid error "A non-numeric value encountered"	2017-08-23 21:01:14 +02:00
Laurent Destailleur	ab37794f61	Fix text	2017-08-23 19:34:26 +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	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
Laurent Destailleur	4da49dfc2d	FIX #7239	2017-08-23 15:02:38 +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	e05ac34966	Fix remove var_dump	2017-08-22 18:03:37 +02:00
Laurent Destailleur	64c4f899f3	Fix charset management with ace	2017-08-22 18:00:54 +02:00
Laurent Destailleur	db9cc4683a	Fix php warning	2017-08-22 15:29:40 +02:00
Laurent Destailleur	14cd150762	NEW Introduce experimental feature to search dolistore from application	2017-08-22 14:47:01 +02:00
Laurent Destailleur	30c39d246b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-22 11:18:56 +02:00
Laurent Destailleur	731f826a55	NEW jquery date selector become default date selector	2017-08-22 09:23:35 +02:00
Laurent Destailleur	2321091170	NEW Move the upload input on top right in ECM module	2017-08-20 21:23:19 +02:00
Laurent Destailleur	188653a85d	Work on website module	2017-08-20 18:50:51 +02:00
Laurent Destailleur	260beed512	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
Laurent Destailleur	097b660c41	Mutualize code	2017-08-18 16:25:00 +02:00
florian HENRY	874d61bb6d	Other fix	2017-08-18 11:35:20 +02:00
florian HENRY	c793e847bc	fix comondoc generator	2017-08-18 11:30:13 +02:00
florian HENRY	f6a1e7685c	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_manageextrafieldswithmultientity	2017-08-04 17:13:53 +02:00
florian HENRY	03e935f493	Better management	2017-08-04 17:11:40 +02:00
Laurent Destailleur	1bd992dae9	Merge pull request #7238 from atm-florian/dev_manageextrafieldswithmultientity ... NEW : manageme extrafields with multientity	2017-08-04 15:39:31 +02:00
Laurent Destailleur	402e6bf650	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/card.php htdocs/compta/bank/various_payment/index.php htdocs/compta/paiement/list.php htdocs/core/modules/modCron.class.php	2017-08-04 15:39:00 +02:00
Laurent Destailleur	da831d2c8e	FIX Bad link in ECM	2017-08-04 13:45:57 +02:00
Laurent Destailleur	5b7c144f95	FIX Bad link in ECM	2017-08-04 13:45:20 +02:00
Laurent Destailleur	c107a77722	NEW Can filter on document name in ECM module for automatic tree	2017-08-04 13:10:51 +02:00
Laurent Destailleur	3a098ca047	Reduce verbosity	2017-08-04 11:50:30 +02:00
florian HENRY	8fd45383e2	NEW : manageme extrafields with multientity	2017-08-04 09:00:11 +02:00
Laurent Destailleur	f058fa1938	Better detection if a module provide triggers	2017-08-03 12:19:31 +02:00
Laurent Destailleur	81b11100b0	Prepare code to clone site an fetch external page	2017-08-03 01:45:31 +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
Laurent Destailleur	71d49f1c6f	Fix pb in ecm	2017-08-01 18:44:34 +02:00
Laurent Destailleur	ba221650cf	Start to work on using the jquery date selector.	2017-08-01 01:25:30 +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
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
Laurent Destailleur	ec27eb5b1e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/list.php htdocs/societe/list.php	2017-07-27 02:09:40 +02:00
Laurent Destailleur	bdfb0b7561	FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes	2017-07-26 21:22:53 +02:00
Regis Houssin	acd5780e32	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-07-26 08:58:56 +02:00
Laurent Destailleur	760d2617a0	Can disable the search of previous/next in dol_banner	2017-07-25 23:03:28 +02:00
Laurent Destailleur	5b9ac2a7a9	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/index.php	2017-07-25 21:11:36 +02:00
Laurent Destailleur	c386a02889	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/langs/en_US/stocks.lang	2017-07-25 21:10:08 +02:00
Laurent Destailleur	8b793a261f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/modules/DolibarrModules.class.php	2017-07-25 21:08:31 +02:00
Laurent Destailleur	6c9242b605	Merge pull request #7201 from atm-florian/dev_extrafields_table_uniformisation ... NEW new columns into extrafields table to get update create information	2017-07-25 20:04:50 +02:00
Laurent Destailleur	0e23b04fab	Update extrafields.class.php	2017-07-25 20:04:10 +02:00
Laurent Destailleur	6e8498465a	Update extrafields.class.php	2017-07-25 20:01:47 +02:00
Laurent Destailleur	a7c96416ba	Merge pull request #7194 from hregis/6.0_bug2 ... Fix: getEntity $shared param value is now 1 by default	2017-07-25 13:29:42 +02:00
florian HENRY	d2ecebdddd	new :new column into extrafeild table to get update create information	2017-07-25 11:57:36 +02:00
Laurent Destailleur	dcf5fd20bb	Fix navigation on card generated by modulebuilder	2017-07-25 10:38:39 +02:00
Laurent Destailleur	bfd1fa3984	Enhance modulebuilder	2017-07-25 02:56:19 +02:00
Laurent Destailleur	13cd203502	Enhance modulebuilder	2017-07-25 01:54:54 +02:00
Laurent Destailleur	70341d6169	Debug modulebuilder	2017-07-25 00:33:43 +02:00
Laurent Destailleur	307b8ef4f6	Debug modulebuilder	2017-07-25 00:32:06 +02:00
Laurent Destailleur	1877a3b6fa	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-24 21:04:07 +02:00
Laurent Destailleur	dcb79e66cc	Debug modulebuilder	2017-07-24 13:55:12 +02:00
Regis Houssin	48800bc268	Fix: getEntity $shared param value is now 1 by default	2017-07-24 08:52:10 +02:00
Laurent Destailleur	6421ec3139	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/doleditor.class.php	2017-07-23 19:27:40 +02:00
Laurent Destailleur	25b107defb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/contrat/list.php htdocs/fichinter/list.php	2017-07-23 19:09:00 +02:00
Laurent Destailleur	0aed9ecd7c	Fix ckeditor is now ok since there is no more jmobile.	2017-07-23 18:52:30 +02:00
Laurent Destailleur	336400d9ea	Can clone a page onto another website	2017-07-23 16:20: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	764c7ac792	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/websites/index.php	2017-07-22 20:46:02 +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	340203cc18	Fix vat label for India	2017-07-22 16:05:51 +02:00
Regis Houssin	26df1389f4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/install/mysql/migration/5.0.0-6.0.0.sql	2017-07-21 20:42:21 +02:00
Laurent Destailleur	d07741ada1	Merge branch 'develop' into patch-rib	2017-07-21 14:58:33 +02:00
Laurent Destailleur	6830fe4f91	Fix generic clone function	2017-07-21 13:39:06 +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	a416ec4258	Try to fix travis	2017-07-18 14:25:07 +02:00
Laurent Destailleur	5c296c679e	Enhance source code editor	2017-07-18 13:42:07 +02:00
Laurent Destailleur	97fe41d603	A info int smtp header	2017-07-18 12:49:19 +02:00
Laurent Destailleur	6db2aeff20	Fix source code editor	2017-07-18 12:00:18 +02:00
Laurent Destailleur	2a50a78497	Fix hack to solve link to restrictions	2017-07-18 10:15:48 +02:00
Laurent Destailleur	98ef978b2a	NEW Introduce code syntax coloration with mode 'ace' for DolEditor.	2017-07-18 03:18:16 +02:00
Laurent Destailleur	4582b54e91	Fix use command standard @... to mark a change in official code	2017-07-17 20:09:19 +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
Laurent Destailleur	312b153005	Fix phpcs	2017-07-13 23:46:01 +02:00
Laurent Destailleur	43f6eab2ea	FIX #7146	2017-07-13 15:16:17 +02:00
Laurent Destailleur	c434f72d31	Merge pull request #7146 from hregis/6.0_bug3 ... Fix: travis error (categorie)	2017-07-13 14:46:41 +02:00
Laurent Destailleur	85d9a2f790	Merge pull request #7145 from hregis/6.0_bug2 ... Fix: missing group name with dol_banner_tab	2017-07-13 14:36:17 +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	44b6b8cc65	Fix purge of log files was missing some log files.	2017-07-12 20:27:25 +02:00
Laurent Destailleur	a487492a7a	Fix purge of log files was missing some log files.	2017-07-12 20:23:35 +02:00
Regis Houssin	44a44ab0a2	Fix: travis error	2017-07-12 16:45:32 +02:00
Regis Houssin	d63e15f0c6	Fix: missing group name with dol_banner_tab	2017-07-12 15:52:58 +02:00
Laurent Destailleur	33ceb22b8b	Fix error management into modulebuilder	2017-07-12 13:25:18 +02:00
Laurent Destailleur	40b3ae2a15	Debug modulebuilder	2017-07-12 11:52:07 +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	c75db29ff2	Fix warning when module position is not correct	2017-07-11 12:54:49 +02:00
Laurent Destailleur	32d5edf5b9	Fix warning when module position is not correct	2017-07-11 12:54:03 +02:00
Laurent Destailleur	45d8fbb19e	Fix gravatar	2017-07-08 21:39:48 +02:00
Laurent Destailleur	f40afcf023	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php	2017-07-08 18:32:34 +02:00
Laurent Destailleur	cf6745b1ae	Debug module builder	2017-07-08 17:08:07 +02:00
Laurent Destailleur	8db4e91888	Debug modulebuilder	2017-07-08 15:43:36 +02:00
Laurent Destailleur	252d8da8fc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2017-07-07 15:11:53 +02:00
gauthier	a6f1e08c19	FIX : we have to check if contact doesn't already exist on add_contact() function	2017-07-07 11:48:30 +02:00
Laurent Destailleur	9baeee893f	Fix multicurrency (tags for odt)	2017-07-07 10:54:54 +02:00
phf	6ab0ec4b1b	Fix travis and rename 2 fields	2017-07-07 10:22:37 +02:00
Laurent Destailleur	2aaf8b22f2	Fix substitution var	2017-07-07 10:10:12 +02:00
phf	49b8689f2d	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-07-05 11:02:39 +02:00
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
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	ab0a730d4a	Fix bad GETPOST on 'action'	2017-06-29 02:54:56 +02:00
Laurent Destailleur	6f82837b0f	Fix GETPOST of lang_id	2017-06-27 17:27:01 +02:00
Laurent Destailleur	3fdfebf7ef	Fix position of top menu does not follow 'position' field.	2017-06-27 04:25:41 +02:00
Laurent Destailleur	59bd4749a8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php htdocs/product/class/product.class.php	2017-06-24 10:27:10 +02:00
Laurent Destailleur	1211e0d7ab	FIX vat code not saved during product creation.	2017-06-23 12:09:21 +02:00
Laurent Destailleur	693b2fe3b4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/ajax/ajaxdirpreview.php htdocs/core/class/conf.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/core/tpl/objectline_create.tpl.php	2017-06-23 11:20:29 +02:00
Laurent Destailleur	3a400c46ad	Fix preselected email not done	2017-06-23 10:15:32 +02:00
Laurent Destailleur	1b96bb4221	Fix usage of constant. No need to have a dedicated setup as it should be ... supported by the responsive design architecture.	2017-06-22 14:48:13 +02:00
Laurent Destailleur	474a2692fa	Fix missing /div	2017-06-22 13:54:03 +02:00
Laurent Destailleur	4102403482	Look and feel v6	2017-06-21 11:37:34 +02:00
Laurent Destailleur	3ec0e6f7ef	FIX #6885	2017-06-20 12:31:08 +02:00
Laurent Destailleur	d8b0199ba2	FIX #7040	2017-06-20 10:24:54 +02:00
Regis Houssin	909826e24f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-20 06:25:35 +02:00
Laurent Destailleur	658ba50aa8	Standardize picto status	2017-06-20 02:29:29 +02:00
Marcos García	eaaee59f92	FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working	2017-06-19 19:23:00 +02:00
Regis Houssin	d2371946ba	Fix: for avoid warning	2017-06-19 09:50:13 +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
Laurent Destailleur	b73228899a	Merge pull request #7024 from defrance/patch-14 ... Introduce weight conversion lb & oz	2017-06-17 17:52:20 +02:00
BENKE Charlene	fcdf68db6a	Update commonobject.class.php	2017-06-17 16:31:54 +02:00
Regis Houssin	a0299042e4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-17 12:05:33 +02:00
Laurent Destailleur	5b7a8e9c90	Fix missing signature when sending email from user card	2017-06-17 10:17:36 +02:00
BENKE Charlene	5320ebc051	getTotalWeightVolume : add conversion Lb & oz to KG ... New conversion value : Oz once Little az a wizzard...	2017-06-17 10:16:52 +02:00
Laurent Destailleur	26e80045a6	Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor ... NEW log download or preview event on a validate bill	2017-06-16 11:06:27 +02:00
Laurent Destailleur	343e8d8498	Debug accounting module with new structure v6 ... Make accounting module compatible with the new vat code to identify 2 vat code with same rate.	2017-06-16 00:49:52 +02:00
Laurent Destailleur	ac708a8ee9	Debug accounting module with new structure v6 ... Make accounting module compatible with the new vat code to identify 2 vat code with same rate.	2017-06-15 23:58:56 +02:00
Laurent Destailleur	f39fb5187a	Fix component to select journal	2017-06-15 20:27:40 +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	1b56e4a01c	Fix look and feel v6	2017-06-14 11:28:42 +02:00
alexis Algoud	ef0907d89e	NEW log download or preview event on a validate bill	2017-06-13 15:55:22 +02:00
Regis Houssin	773abff80e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict	2017-06-12 21:24:10 +02:00
Laurent Destailleur	ba3a74576c	Merge 5.0	2017-06-12 18:22:51 +02:00
Laurent Destailleur	5d9a84dedb	Fix sql syntax error	2017-06-12 15:35:50 +02:00
Laurent Destailleur	bf41056c68	Fix test on permission for widgets	2017-06-12 14:21:04 +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	4683ef41be	Fix hide search label on computed field into lists	2017-06-10 22:49:16 +02:00
Laurent Destailleur	6ab47a845e	Fix look and feel v6	2017-06-10 13:54:43 +02:00
Laurent Destailleur	a8e16910c0	Fix look and feel v6	2017-06-10 13:44:20 +02:00
Laurent Destailleur	884c6c674d	Fix css	2017-06-09 20:08:23 +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	62933e9a26	Fix sql syntax error in some cases	2017-06-09 11:22:42 +02:00
Laurent Destailleur	929946ad47	Fix several problem with hook printFieldListWhere	2017-06-09 10:12:01 +02:00
Regis Houssin	fa58f0f3e8	Fix: add entity filter	2017-06-09 09:25:15 +02:00
Regis Houssin	4c70908ea2	Fix: entity field in combobox	2017-06-08 18:52:01 +02:00
phf	d6d451b54a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact	2017-06-08 12:03:59 +02:00
phf	711f9696aa	New multi contacts on actioncomm	2017-06-08 12:02:39 +02:00
Laurent Destailleur	3e51d2f537	Fix backto link after creating a third party	2017-06-08 11:51:31 +02:00
Laurent Destailleur	a1144e1f66	Fix missing init of hookmanager	2017-06-08 11:18:41 +02:00
Laurent Destailleur	9c4a2594b1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-08 11:07:25 +02:00
Laurent Destailleur	832e288814	FIX #6955	2017-06-08 10:47:22 +02:00
Laurent Destailleur	7587a3d592	Merge branch 'develop' into develop_transverse	2017-06-08 10:25:04 +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
Laurent Destailleur	a0295821ba	Fix errors in extra computed field	2017-06-07 11:38:42 +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	7ed0643b52	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 10:54:16 +02:00
Laurent Destailleur	2f59525967	Merge pull request #6942 from hregis/develop_bug ... Fix: avoid warning "Undefined property: stdClass::$AGENDA_DEFAULT_FILTER_TYPE"	2017-06-06 10:47:20 +02:00
Regis Houssin	79a0b959d1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse	2017-06-06 10:36:37 +02:00
Laurent Destailleur	2510ec7015	Fix php error	2017-06-06 10:29:34 +02:00
Regis Houssin	b66da3d148	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
Laurent Destailleur	22efbabfa6	NEW Add hook doUpgrade2	2017-06-06 01:34:25 +02:00
Regis Houssin	74710827b2	Fix: avoid warning "Undefined property: ... stdClass::$AGENDA_DEFAULT_FILTER_TYPE"	2017-06-03 14:15:34 +02:00
Regis Houssin	a25facef7c	Fix: use 0 instead false	2017-06-03 11:49:59 +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	832e9ed15a	Merge pull request #6932 from atm-ph/fix_develop_get_extra_chkbxlst ... Fix get extrafields value from getOptionalsFromPost give an error wit…	2017-06-03 01:04:18 +02:00
Laurent Destailleur	e1b19b831a	NEW An external module can hook and add mass actions	2017-06-02 23:57:37 +02:00
Laurent Destailleur	66420d0e80	Restore lost file and better generation of modules	2017-06-02 23:02:48 +02:00
Laurent Destailleur	9e629bdb02	Work on modulebuilder	2017-06-02 20:01:25 +02:00
Laurent Destailleur	c59d216cf5	NEW Can read time spent of others (hierarchy only or all if granted)	2017-06-02 13:24:45 +02:00
phf	64cd1e0923	Fix get extrafields value from getOptionalsFromPost give an error with chkbxlst type on propaldet for exemple	2017-06-02 12:31:03 +02:00
Laurent Destailleur	c70beaa56b	Complete work for mutualizing generic substitution system.	2017-06-01 01:57:22 +02:00
Laurent Destailleur	10ac53077e	Code comment	2017-05-31 11:51:38 +02:00
Laurent Destailleur	292571688b	Fix error message not reported	2017-05-31 10:49:06 +02:00
Regis Houssin	aa780ea33b	Fix: missing dot	2017-05-30 19:15:37 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	df729d8889	Fix travis	2017-05-29 19:28:43 +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	ab5545d02d	Merge pull request #6898 from defrance/patch-12 ... $resaction need in 5.0.x too	2017-05-29 11:41:22 +02:00
BENKE Charlie	18799c3a7f	Changes Done ... question need to change $actionclassinstance->results in $actionclassinstance->resactionss ???	2017-05-29 11:00:08 +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	16456cf19f	Merge pull request #6891 from hregis/develop_api ... NEW add REST api "memberstypes"	2017-05-29 10:29:04 +02:00
Laurent Destailleur	d03d179fa3	FIX Fullname when member is a moral entity with no name.	2017-05-28 23:43:24 +02:00
Laurent Destailleur	c4f09b8894	Work on modulebuilder	2017-05-28 14:43:17 +02:00
BENKE Charlie	e4f7f2a0b2	$resaction need in 5.0.x too	2017-05-26 12:39:49 +02:00
Regis Houssin	18886849eb	New: add REST api "memberstypes"	2017-05-25 08:54:30 +02:00
Alexandre SPANGARO	e4f5d45c45	Remove old code (selectjournal_accountancy_bookkepping)	2017-05-25 07:10:09 +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	e5fe629a0e	NEW Extrafields support formulas to be computed using PHP expressions	2017-05-24 22:48:44 +02:00
Laurent Destailleur	aef9ef2d75	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-24 13:46:03 +02:00
Laurent Destailleur	6eeb82ec70	FIX dialog window with md theme must not be hidden by left menu part.	2017-05-24 13:45:26 +02:00
Laurent Destailleur	80ce8da7a3	Fix migration errors and responsive design	2017-05-23 15:13:52 +02:00
Laurent Destailleur	1a8884bbbe	NEW Can filter on year and product tags on the product statistic page	2017-05-22 15:20:52 +02:00
Laurent Destailleur	52b5a8ece7	More powerfull dol_move function.	2017-05-21 14:06:43 +02:00
Laurent Destailleur	2dd2ab1003	Look and feel v6	2017-05-20 20:59:54 +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	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +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
florian HENRY	82cac745e3	FIX 6863	2017-05-18 14:18:59 +02:00
Laurent Destailleur	0b52c43e05	Fix bad selection of progress when not known	2017-05-18 11:35:12 +02:00
Laurent Destailleur	1a1b27d68c	Fix input of duration	2017-05-18 11:13:18 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Laurent Destailleur	b29d0385e6	NEW Can send an email to a user from its card.	2017-05-15 00:15:56 +02:00
Alexandre SPANGARO	143c019905	Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-14 08:07:34 +02:00
Laurent Destailleur	e0abba5cf2	Merge pull request #6831 from Gecka-Apps/5.0-fixes ... Fix: when sending a mail the default template used should be the first positioned template	2017-05-13 19:35:58 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Dinclaux	8ae05a9651	Fix: when sending a mail the default template used should be the first positionned template	2017-05-11 13:38:17 +11:00
Laurent Destailleur	cd72c50356	Merge pull request #6799 from Dolibarr/scrutinizer-patch-2 ... Scrutinizer Auto-Fixes	2017-05-11 00:04:12 +02:00
Laurent Destailleur	30cf3f2bda	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql	2017-05-11 00:03:06 +02:00
Laurent Destailleur	922fa088b4	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/boxes/box_services_expired.php	2017-05-10 23:47:33 +02:00
Laurent Destailleur	b2e9d4cc21	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-05-10 23:42:49 +02:00
Laurent Destailleur	2da0a129d1	Multiple file upload on by default on desktop.	2017-05-10 23:41:43 +02:00
Laurent Destailleur	164f3954ee	Merge pull request #6824 from ATM-Marc/NEW_multiple_fileupload ... NEW permit multiple file upload in linked documents tab	2017-05-10 23:24:41 +02:00
Laurent Destailleur	2b64cf0ebe	Update html.formfile.class.php	2017-05-10 23:24:33 +02:00
Laurent Destailleur	1c7d9b9d9a	Merge pull request #6804 from aspangaro/6.0-multijournal ... New : Accountancy - Add a list to select the bank journal in bank card	2017-05-10 22:46:30 +02:00
jfefe	d410a320d7	WIP #6504: CVE-2017-7886 ... 'defaultlang' attribute was not filtered before database request which cause an SQL injection.	2017-05-10 20:32:54 +02:00
Laurent Destailleur	5a96ae54b9	FIX Link to files on bank account tab broken with multicompany ... FIX Link to preview on thirdparty broken with multicompany	2017-05-10 19:08:07 +02:00
Marc de Lima Lucio	984531411d	NEW: permit multiple file upload in linked documents	2017-05-10 15:01:27 +02:00
Laurent Destailleur	e5c898e0d6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/fichinter/list.php htdocs/product/list.php htdocs/projet/tasks/list.php	2017-05-10 00:48:27 +02:00
Laurent Destailleur	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
Alexandre SPANGARO	a3602ff6b4	Add journal list in new movement card	2017-05-08 06:20:17 +02:00
Alexandre SPANGARO	dd97bbdc82	Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal	2017-05-07 15:10:30 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +02:00
Alexandre SPANGARO	68aaef2f66	Add list to select journal in bank	2017-05-06 08:06:01 +02:00
Alexandre SPANGARO	a4defb8102	Add html form for accountancy journals list	2017-05-06 07:02:34 +02:00
Laurent Destailleur	d53654e64f	Look and feel v6	2017-05-05 20:45:06 +02:00
Scrutinizer Auto-Fixer	d93552c8c5	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-05-05 17:13:29 +00:00
Laurent Destailleur	2e5c32eb62	Merge pull request #6748 from atm-florian/5.0 ... FIX : #6747	2017-05-05 19:06:14 +02:00
Laurent Destailleur	806157ae40	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 17:52:22 +02:00
Laurent Destailleur	15d20497c8	FIX #6795 #6796	2017-05-05 17:46:22 +02:00
Laurent Destailleur	a8292ce990	Code comment	2017-05-05 17:27:16 +02:00
Laurent Destailleur	885a636351	Debug new journal list page	2017-05-05 16:35:05 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	eb2124bfc8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-05 14:14:53 +02:00
Laurent Destailleur	2120b9af85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/theme/eldy/style.css.php	2017-05-05 14:14:21 +02:00
Laurent Destailleur	a1ac3b470b	Change menu for setup of predefined emails	2017-05-05 14:01:20 +02:00
Laurent Destailleur	90542d119a	FIX trigger name and status set of setStatus for commercial proposal	2017-05-05 13:25:30 +02:00
Laurent Destailleur	9785e9b298	Update commonobject.class.php	2017-05-05 09:57:51 +02:00
Laurent Dinclaux	24a2fb57ea	Resolved merge conflict	2017-05-05 10:22:46 +11:00
Laurent Destailleur	089b882033	Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone ... FIX ajax autocomplete on clone	2017-05-04 21:05:40 +02:00
Laurent Destailleur	bf616cbe05	Fix bad var	2017-05-04 19:05:02 +02:00
florian HENRY	b8d63ae6c0	Better fix	2017-05-04 14:04:30 +02:00
florian HENRY	9958fcaa6f	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0	2017-05-04 14:02:28 +02:00
Laurent Destailleur	c196e79bf4	Merge branch 'develop' into FIX_inventory	2017-05-04 13:50:53 +02:00
Laurent Destailleur	0c76db7973	FIX #6698 #6742	2017-05-04 13:41:37 +02:00
Laurent Destailleur	7d5b5cf86a	Better behavior for tooltip on click	2017-05-04 13:09:42 +02:00
Laurent Destailleur	c7d736376f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-04 12:41:49 +02:00
Laurent Destailleur	7ec46b3bd6	Finished work to have substitution keys code mutualized.	2017-05-04 12:35:45 +02:00
Laurent Destailleur	f543461e9b	Complete the substitution array with substitution array with all ... possible keys	2017-05-04 11:21:28 +02:00
Laurent Destailleur	3871da0324	Merge pull request #6729 from atm-florian/dev_importexport_ressources ... NEW : Add module resources import/export	2017-05-04 09:43:00 +02:00
Laurent Dinclaux	f63f28c7fe	Fix vat_src_code propagation between post types	2017-05-03 21:37:30 +11:00
alexis portable	da4d179d36	fix travis	2017-05-02 23:20:23 +02:00
alexis portable	d1a443f0f0	fix camelcase for travis	2017-05-02 23:11:05 +02:00
Laurent Destailleur	3917bdfc79	Fix vat_src_code propagation.	2017-05-02 22:37:43 +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
Marcos García de La Fuente	166f2d262d	Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume	2017-05-02 14:00:27 +02:00
Laurent Destailleur	1e3384a842	Fix travis	2017-04-30 14:16:58 +02:00
Laurent Destailleur	58e2b49b1c	Clean code	2017-04-30 13:49:06 +02:00
Laurent Destailleur	865c8140d1	Clean code	2017-04-30 03:23:06 +02:00
Laurent Destailleur	4993a43025	Move new feature inventory into module stock.	2017-04-30 02:25:05 +02:00
Laurent Destailleur	92b5f8d85e	Move new feature inventory into module stock.	2017-04-29 21:53:01 +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
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	c722286bcb	Fix regressions	2017-04-28 13:37:36 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Quentin Vial-Gouteyron	4ab5674ffb	FIX ajax autocomplete on clone	2017-04-25 15:10:46 +02:00
florian HENRY	86338d1781	FIX : #6747	2017-04-24 09:03:25 +02:00
Laurent Destailleur	ec59f08e41	FIX extrafield css for boolean type	2017-04-24 00:46:27 +02:00
florian HENRY	213e0d2870	fix travis	2017-04-19 14:49:12 +02:00
florian HENRY	4efb1ba23a	update credentials	2017-04-18 15:27:18 +02:00
florian HENRY	a52db08cd6	NEW : Add module resources import/export	2017-04-18 15:25:04 +02:00
Laurent Destailleur	3da0aea168	Prepare code to use different SMTP servers.	2017-04-18 01:39:06 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	436f60a784	FIX Cache to load currencies was not working when loading all currencies	2017-04-14 18:08:02 +02:00
Laurent Destailleur	5931bc4068	NEW Feature to crop/resize images available on user and expense reports	2017-04-14 13:53:39 +02:00
Laurent Destailleur	e6e9b65594	NEW Reduce memory usage by removing deprecated constant loading.	2017-04-14 12:38:52 +02:00
Laurent Destailleur	4e021c123b	Fix travis error	2017-04-14 11:28:19 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	6c069e9a1a	Fix label of long status	2017-04-13 15:15:44 +02:00
Laurent Destailleur	3e9ccc186a	NEW Small PDF template for products	2017-04-13 10:26:12 +02:00
Laurent Destailleur	a6b05bb4da	Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0	2017-04-12 14:08:58 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	4eaa1d4f46	Add nb of generation into list of template invoices	2017-04-11 20:07:35 +02:00
Laurent Destailleur	8e33c8090d	FIX No filter on company when showing the link to elements.	2017-04-11 19:07:03 +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	81020cea77	Merge pull request #6660 from atm-florian/dev_contractselect ... NEW select2 for contract selector	2017-04-11 11:08:59 +02:00
Laurent Destailleur	d4de81ed6d	Merge pull request #6659 from altatof/fix_incoterm ... FIX: dont get empty "Incoterms : - " string if no incoterm	2017-04-11 11:08:17 +02:00
Laurent Destailleur	6aa56ce0fa	NEW Add a tracking id into mass emailing ... Prepare code to use a dedicated SMTP server according to context.	2017-04-11 10:57:17 +02:00
Marcos García de La Fuente	996b5e9f87	Corrected translation errors and little bug showing a non-available button to a restricted user	2017-04-09 18:17:46 +02:00
Laurent Destailleur	52c86cb3f5	NEW Bulk actions available on supplier orders	2017-04-09 13:12:25 +02:00
Laurent Destailleur	a0e75d0af0	Work on look and feel v6	2017-04-07 18:38:55 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
florian HENRY	e76a00845d	better test	2017-04-07 14:55:59 +02:00
florian HENRY	a1c1aa054f	new : select2 for contract selector	2017-04-07 14:55:14 +02:00
altatof	d892a89f45	FIX: dont get empty "Incoterms : - " string if no incoterm	2017-04-07 14:15:51 +02:00
Laurent Destailleur	60a54041c2	NEW Enable bulk actions delete on supplier invoices	2017-04-07 14:09:19 +02:00
Laurent Destailleur	ea44e14b60	Start debug the variant module	2017-04-07 11:01:12 +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	8363bee234	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/filefunc.inc.php	2017-04-06 21:56:48 +02:00
Laurent Destailleur	e2ea5945dd	Work on look and feel v6	2017-04-06 21:48:28 +02:00
Alexis ALGOUD	736800dd66	little fix ... for param into list pagination	2017-04-05 12:16:10 +02:00
Laurent Destailleur	1dc2cae3a5	NEW Show company into combo list of projects	2017-04-05 11:51:55 +02:00
Laurent Destailleur	7c868888a5	FIX Add option MAIN_MAIL_USE_MULTI_PART to include text content into ... HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to restore the inline images feature.	2017-04-05 01:02:03 +02:00
Laurent Destailleur	13333ffd73	Add multipart text version into html emails.	2017-04-05 00:39:32 +02:00
Laurent Destailleur	c4d4856997	FIX sql errors on user card	2017-04-04 12:23:44 +02:00
Laurent Destailleur	9df4bac202	NEW Bookmarks are into a combo list.	2017-04-04 11:56:19 +02:00
Laurent Destailleur	761ece3125	Remove $maxfilenamelength replace with auto overflow.	2017-04-03 16:59:22 +02:00
Laurent Destailleur	e8767122b0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/societe/list.php	2017-04-03 11:05:19 +02:00
Laurent Destailleur	13587fa13e	Fix key were not translated	2017-04-03 10:51:35 +02:00
Laurent Destailleur	6a69f9349b	Fix too much logs in list	2017-04-03 10:43:04 +02:00
Laurent Destailleur	a5a0995313	More comments	2017-04-03 10:11:29 +02:00
Laurent Destailleur	17a1874e36	FIX Counter of notification of a thirdparty	2017-04-01 13:43:05 +02:00
Laurent Destailleur	d975e7f442	Work on 6.0 look and feel	2017-04-01 12:46:47 +02:00
Laurent Destailleur	88017f5707	Merge pull request #6369 from atm-florian/dev_replace_extrefield_checkboxByMultiSelect ... NEW : change render extrafields checkbox list for multiselectarray	2017-03-31 18:12:58 +02:00
Laurent Destailleur	7bcd4d74ef	Merge pull request #6617 from dolibarr95/patch-9 ... Display mobile icon	2017-03-31 17:43:01 +02:00
Laurent Destailleur	01a74a8d23	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
Laurent Destailleur	8e70c4a0b7	Work on 6.0 new look and feel	2017-03-30 15:39:50 +02:00
Marcos García de La Fuente	cd5b074a48	FIX #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled	2017-03-30 15:21:20 +02:00
dolibarr95	1489847a74	Display mobile icon ... Display a specific icon when mobile	2017-03-30 09:49:34 +02:00
Laurent Destailleur	fbca800246	FIX Detection of color brightness	2017-03-29 11:46:13 +02:00
Laurent Destailleur	4fa5448aab	FIX Detection of color brightness	2017-03-29 10:34:33 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
phf	fe1b1ede0f	Fix remove filter on date	2017-03-28 17:35:51 +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	31bde1ae74	Code for 6.0 new look and feel	2017-03-28 17:12:15 +02:00
phf	5decbde79b	Fix search by date does not work	2017-03-28 17:06:22 +02:00
phf	df170769c9	Update function module inventory	2017-03-28 16:05:18 +02:00
phf	70743e1f68	Update list header to be print with Dolibarr functions	2017-03-28 13:48:33 +02:00
Laurent Destailleur	f843f8a93d	Start to move search bar before table titles	2017-03-27 00:48:50 +02:00
atm-ph	ed27b44f62	Add TODO to print header table as Dolibarr	2017-03-26 14:58:59 +02:00
atm-ph	ae2ab3276d	Refactoring and class/method documentation	2017-03-26 14:37:25 +02:00
Laurent Destailleur	e38ad37ce3	FIX #6517 #6525 Autocompletion of thirdparty after n chars not ... implemented	2017-03-26 05:02:06 +02:00
atm-ph	09f645fc9f	Fix travis	2017-03-25 23:21:49 +01:00
atm-ph	76b95aeec0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-25 19:15:25 +01:00
atm-ph	2fc74b4962	Refactoring class	2017-03-25 18:53:14 +01:00
atm-ph	cb576e6c99	Refactoring class	2017-03-25 18:26:10 +01:00
atm-ph	fce8e08b51	Refactoring and fix	2017-03-25 18:13:39 +01:00
atm-ph	ae33e40dc8	Refactoring and add method comments	2017-03-25 17:32:42 +01:00
atm-ph	269645dfc7	Add method documentations	2017-03-25 10:48:06 +01:00
atm-ph	de832d90a9	Refactoring	2017-03-25 00:50:53 +01:00
Laurent Destailleur	292bcae592	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-25 00:05:04 +01:00
Laurent Destailleur	d1a988a0be	Fix document_preview is possible on files with + chars inside.	2017-03-24 17:32:38 +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	38660418b4	Include preview of pdf into dol_banner	2017-03-23 22:27:44 +01:00
Laurent Destailleur	664380d304	Css enhancement	2017-03-23 21:24:57 +01:00
Laurent Destailleur	eb145faffd	Replace parameter mixte with textselect	2017-03-23 19:57:45 +01:00
Laurent Destailleur	d1c29bf698	Merge pull request #6552 from defrance/patch-91 ... NEW : introducing "mixte" mode for select_duration	2017-03-23 19:54:33 +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
BENKE Charlie	7999cb9a46	introducing "mixte" mode for select_duration ... If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a text, if 'mixte' input hour is in text and input min is a combo	2017-03-21 23:48:06 +01:00
Laurent Destailleur	acdfd6ab9e	css enhancement	2017-03-21 18:23:58 +01:00
Laurent Destailleur	e7a45a7f6a	NEW Use html5 type "number" on select field for year and duration.	2017-03-21 17:50:43 +01:00
Laurent Destailleur	68257283e4	Enhance select list	2017-03-21 13:39:42 +01:00
Laurent Destailleur	1b0b4c9609	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-20 23:53:47 +01:00
Laurent Destailleur	b9a9997688	Page societe/soc.php and compta/facture.php was renamed into card.php ... to match page naming conventions.	2017-03-20 21:29:22 +01:00
Laurent Destailleur	b169f93abc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-19 14:27:12 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
Laurent Destailleur	b9d6122c53	Add comments	2017-03-18 19:56:53 +01:00
Laurent Destailleur	f7e71d1de2	FIX LOG_ERROR does not exists. Use LOG_ERR.	2017-03-18 11:48:02 +01:00
Laurent Destailleur	597fb11d08	Fix error management in duplicate trigger	2017-03-18 11:36:48 +01:00
Laurent Destailleur	35b79818b7	Uniformize css rules	2017-03-16 20:33:51 +01:00
Laurent Destailleur	dba6d99686	Minor look enhancement	2017-03-16 17:02:30 +01:00
Laurent Destailleur	6f25d6de24	Fix bad management of PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY	2017-03-15 12:33:06 +01:00
Laurent Destailleur	4c0ff38020	Fix closing boxes	2017-03-15 11:58:13 +01:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +01:00
arnaud	192a825de8	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
Alexandre SPANGARO	c6c07bf9f4	New : Add project to social contributions	2017-03-12 14:32:49 +01:00
Laurent Destailleur	4bf0e31299	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-11 02:40:42 +01:00
Laurent Destailleur	47dd53abbe	NEW The substitution keys available for emailing edition is now into a ... popup	2017-03-11 02:36:22 +01:00
Laurent Destailleur	4737c62394	FIX Avoid flash on screen	2017-03-11 00:52:35 +01:00
Laurent Destailleur	2054ce0aab	FIX Avoid flash on screen	2017-03-11 00:50:55 +01:00
Laurent Destailleur	209bd0b3e4	2nd try to fix better compatibility	2017-03-10 16:53:26 +01:00
Laurent Destailleur	2a3d3b4b50	Fix dol_banner for agenda	2017-03-10 16:40:38 +01:00
Laurent Destailleur	a9b39f3028	Fix dol_banner for agenda	2017-03-10 16:27:28 +01:00
Laurent Destailleur	57c2971175	Fix dol_banner for agenda	2017-03-10 16:19:18 +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
Laurent Destailleur	de2558c907	Fix useless lines	2017-03-10 12:47:51 +01:00
Laurent Destailleur	50044ed21e	FIX #6499	2017-03-10 12:45:56 +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
arnaud	1d31603ad2	Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo	2017-03-10 11:46:59 +01:00
Laurent Destailleur	46eedeafe8	Fix message shown to many times	2017-03-10 11:30:46 +01:00
Laurent Destailleur	8389db18bf	Fix solution for comaptibility	2017-03-10 10:07:09 +01:00
Laurent Destailleur	d241adc201	NEW Use autocompletion on the "Add widget list".	2017-03-09 13:22:43 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
Laurent Destailleur	8ac1aab45a	Uniformize look and feels	2017-03-07 18:34:57 +01:00
florian HENRY	fc63008485	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect	2017-03-06 15:35:29 +01:00
Laurent Destailleur	4e4045d18a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:12:08 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	52a4863ed8	Merge pull request #6480 from dolibarr95/patch-2 ... Add label tag	2017-03-05 21:40:31 +01:00
Laurent Destailleur	5fa6592d6e	Fix bad conf used	2017-03-04 20:10:50 +01:00
Laurent Destailleur	379e0083ab	Fix bad help	2017-03-03 18:00:53 +01:00
Laurent Destailleur	6c91cb4f90	Fix it was not possible to create/edit a new chart of account	2017-03-03 17:59:49 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
Laurent Destailleur	85518c6a54	FIX #6479	2017-03-03 14:04:40 +01:00
Laurent Destailleur	07c828d38f	Introduce method loadLangs to save code lines	2017-03-03 13:27:51 +01:00
arnaud	cff9fa0e6b	FIX user odt	2017-03-03 12:01:58 +01:00
arnaud	abeba95de9	New USER odt	2017-03-02 15:13:42 +01:00
dolibarr95	d3a80795ce	Add label tag ... Add a label html tag for the input radio extrafield tag.	2017-03-02 11:40:43 +01:00
Laurent Destailleur	d202003e29	Fix translation	2017-03-01 18:12:06 +01:00
Laurent Destailleur	8487f0fc96	Fix missing setup of new option	2017-03-01 11:18:11 +01:00
Laurent Destailleur	3c54cb5ba9	Fix avoid trigger during migration	2017-02-28 20:55:14 +01:00
Laurent Destailleur	9648f20a2e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-28 12:08:41 +01:00
Laurent Destailleur	59d2943d8d	Fix context must be provided to triggers using ->context no a dedicated ... property.	2017-02-28 12:07:05 +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
Laurent Destailleur	43f3e46aac	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-27 01:23:48 +01:00
Laurent Destailleur	4f24613de0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/class/expensereport.class.php	2017-02-27 01:19:03 +01:00
Laurent Destailleur	92acbbd8a8	Fix parameters	2017-02-27 00:22:11 +01:00
Ion	320da17c78	Add object extrafields to mail form	2017-02-26 03:42:42 +01:00
Laurent Destailleur	1ef899dacc	Prepare database to follow supplier discounts	2017-02-24 15:22:32 +01:00
Laurent Destailleur	baa1f3ed2b	Clean doc about changes in external libraries	2017-02-24 14:35:20 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Laurent Destailleur	92d9eb3c5d	Several fix for a better management of #6424	2017-02-22 17:46:54 +01:00
Laurent Destailleur	24c2675705	Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email ... NEW : Can send email to multiple destinaries from mail form	2017-02-22 14:39:35 +01:00
Laurent Destailleur	ba03b17354	Fix css	2017-02-22 14:30:39 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Laurent Destailleur	cbe855370b	Merge pull request #6451 from laudeco/feature/list_user_by_firstname ... FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users	2017-02-22 14:17:00 +01:00
Laurent Destailleur	3f3b82ed64	Merge pull request #6454 from atm-florian/dev_fix_unittrad ... fix unit trad	2017-02-22 14:16:28 +01:00
Laurent Destailleur	1681445427	Remove useless line	2017-02-22 00:08:25 +01:00
florian HENRY	c8de648924	fix unit trad	2017-02-21 19:07:57 +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
De Coninck Laurent	33d1d78329	FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users	2017-02-21 09:22:50 +01:00
Alexis ALGOUD	4a97864d23	change for tms	2017-02-20 15:54:02 +01:00
Alexis ALGOUD	07d6bbf835	change for tms	2017-02-20 15:53:43 +01:00
Laurent Destailleur	a8129ce46e	Fix transaction/sql error	2017-02-20 11:49:27 +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
Laurent Destailleur	2dbae7b808	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 17:14:00 +01:00
Laurent Destailleur	fd111cb1c6	NEW tooltip can be on hover or on click with textwithpicto function.	2017-02-17 17:11:14 +01:00
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	1f156c1716	Merge pull request #6436 from defrance/patch-79 ... on list, preview tooltip is not displayed correctly	2017-02-17 13:27:31 +01:00
florian HENRY	f7e1927b43	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect	2017-02-17 13:25:19 +01:00
florian HENRY	4836fa8f76	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email	2017-02-17 13:24:06 +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	a91d57037e	FIX #6433	2017-02-17 13:09:28 +01:00
BENKE Charlie	b94312162e	on list, preview tooltip is not displayed correctly ... it's a problem of alignment, the tooltip is cut by the left part on list (ex : comm/propal/list.php) think we can do better	2017-02-17 12:05:24 +01:00
Laurent Destailleur	afa5ef2913	NEW Introduce fields that can be computed during export in export ... profiles.	2017-02-17 00:19:28 +01:00
florian HENRY	a98e5b7290	fix syntax	2017-02-15 11:46:36 +01:00
florian HENRY	5ec01b3175	NEW : Can send email to multiple destinaries from mailform	2017-02-15 11:41:09 +01:00
florian HENRY	a26081d352	Merge branch 'develop' of local repository into dev_replace_extrefield_checkboxByMultiSelect	2017-02-15 09:10:49 +01:00
Laurent Destailleur	eb70d6eea1	Debug of feature for browser notifications	2017-02-14 18:20:01 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +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
arnaud	4230b075c2	INIT pdf supplier payment	2017-02-10 17:28:00 +01:00
Laurent Destailleur	ad361d6d45	Merge pull request #6394 from aspangaro/6.0-fiscalyear ... [FP17] Accountancy - Prepare fiscal year	2017-02-08 19:25:02 +01:00
Laurent Destailleur	596c092ec8	Merge pull request #6219 from atm-florian/dev_changelistchild ... NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list	2017-02-08 16:49:18 +01:00
Laurent Destailleur	d5b10a18b7	Debug module variant	2017-02-08 12:52:31 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr ... Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	b611c5ca53	Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received ... NEW Develop new reduc on excess received	2017-02-08 11:16:10 +01:00
Alexandre SPANGARO	4126dcff03	[FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed.	2017-02-08 06:51:42 +01:00
Laurent Destailleur	fcbc12ce31	Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project ... New link movement stock to project	2017-02-06 20:45:04 +01:00
Laurent Destailleur	d230883638	Merge pull request #6367 from gnovaro/patch-2 ... Code style	2017-02-06 20:25:16 +01:00
Laurent Destailleur	a673afe601	NEW Description of feature of a module into a dedicated popup	2017-02-04 14:16:17 +01:00
BENKE Charlie	3f236b1ebf	FIX : $resaction not used in all case ... Please integrate on next 5.0	2017-02-03 12:14:29 +01:00
Laurent Destailleur	53661e1e4f	Merge pull request #6211 from GPCsolutions/optimizetranslate ... [Qual] Optimize language file loading	2017-02-03 11:55:29 +01:00
Laurent Destailleur	3dea950c24	Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project ... New htmlid can be use instead of htmlname for select projects	2017-02-03 11:44:54 +01:00
florian HENRY	dccddf5c7e	NEW : change render extrafields checkbox list for multiselectarray	2017-02-03 09:25:26 +01:00
Gustavo Novaro	f815d1bed3	Code style	2017-02-02 17:30:06 -03:00
atm-ph	ac20a1a874	Fix remove param htmlid in ajax_combobox	2017-02-02 20:47:45 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	c3fb559d3b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modProduct.class.php	2017-02-01 20:58:17 +01:00
Laurent Destailleur	9a9b31c9c0	Fix cancel button + logic to close project when setting opp to WON/LOST.	2017-02-01 13:25:16 +01:00
phf	aea6a8f9ec	Fix (	2017-01-31 14:03:54 +01:00
phf	e73c60b526	New htmlid can be use instead of htmlname for select projects	2017-01-31 12:20:45 +01:00
Laurent Destailleur	756919de2a	Fix deadlock feature: could not solve a situation where an emailing was ... validated by error.	2017-01-29 16:08:45 +01:00
atm-ph	ccad6d6dde	New show on project "overview" tab the informations about movements stock	2017-01-29 13:36:33 +01:00
Laurent Destailleur	fd90bf466b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/societe/soc.php	2017-01-28 15:12:14 +01:00
Laurent Destailleur	c88e63ecc9	FIX #6259	2017-01-28 15:01:17 +01:00
Laurent Destailleur	bc8ccd8ec5	Fix bad var set	2017-01-28 13:01:10 +01:00
florian HENRY	055a00a338	fix travis	2017-01-27 15:18:12 +01:00
florian HENRY	cb6209de31	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_changelistchild Conflicts: htdocs/core/class/commonobject.class.php	2017-01-27 15:16:28 +01:00
Laurent Destailleur	29df2c9115	Merge branch 'develop' into mail-lines	2017-01-27 01:29:58 +01:00
Laurent Destailleur	70091eceed	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php	2017-01-27 01:26:11 +01:00
Laurent Destailleur	0c14e1d233	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-27 01:24:55 +01:00
Laurent Destailleur	3c86507ce6	FIX #6328	2017-01-27 00:51:22 +01:00
Laurent Destailleur	1239e8600a	Merge pull request #6326 from altatof/fix_entity_thirdpart_files ... Fix entity thirdparty files links	2017-01-27 00:30:03 +01:00
Laurent Destailleur	053afe21dd	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/class/user.class.php	2017-01-26 23:40:16 +01:00
Laurent Destailleur	c1b59b1950	Fix several security bugs on expense report	2017-01-26 18:08:00 +01:00
Laurent Destailleur	c39fcce9f1	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-26 10:45:38 +01:00
Laurent Destailleur	9889f0a4a2	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/modules/modProjet.class.php htdocs/filefunc.inc.php	2017-01-26 10:44:50 +01:00
florian HENRY	13917cebdc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild	2017-01-25 11:02:23 +01:00
altatof	d65cb29536	FIX: use param for http links	2017-01-25 09:25:06 +01:00
Laurent Destailleur	755d353dfa	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/class/html.formprojet.class.php	2017-01-24 18:41:29 +01:00
Laurent Destailleur	84fec7c5c7	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 ... Conflicts: htdocs/core/class/html.formprojet.class.php	2017-01-24 18:40:01 +01:00
Laurent Destailleur	b1e5d8ce98	FIX Combo list of VAT is wrong on POS	2017-01-24 14:33:49 +01:00
Laurent Destailleur	f591e2b1b1	FIX Combo list of VAT is wrong on POS	2017-01-24 14:29:05 +01:00
Laurent Destailleur	1878647d26	NEW Add statistics on supplier tab.	2017-01-23 20:54:52 +01:00
Laurent Destailleur	9a59fbada7	Fix missing info admin picto. Fix colspan.	2017-01-23 17:31:39 +01:00
florian HENRY	d714a52f95	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_changelistchild Conflicts: htdocs/core/class/commonobject.class.php	2017-01-23 11:35:11 +01:00
Laurent Destailleur	7622d3b2fb	Fix missing info admin picto. Fix colspan.	2017-01-23 10:23:24 +01:00
Laurent Destailleur	daf40ed573	NEW Direct open of card after a search if on record only found.	2017-01-22 23:35:32 +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	5362d10c0d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/hookmanager.class.php	2017-01-21 21:56:24 +01:00
Laurent Destailleur	6ab9ba3284	Fix management of alternative language for Greek (el_CY)	2017-01-21 21:52:42 +01:00
Laurent Destailleur	b8a80f9311	Fix code comment and missing showLinkToObjectBlock hook declaration as ... an addreplace hook.	2017-01-21 17:30:35 +01:00
Laurent Destailleur	3a2d9c8610	Fix for rtl languages	2017-01-21 16:12:25 +01:00
Laurent Destailleur	9a5670787f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-21 12:26:50 +01:00
Laurent Destailleur	fc4aa96cd7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fichinter/card.php htdocs/fourn/commande/dispatch.php	2017-01-20 21:02:05 +01:00
Laurent Destailleur	6780b20968	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-20 14:11:55 +01:00
Laurent Destailleur	2f4ff66c43	Minor fixes	2017-01-20 14:10:57 +01:00
Laurent Destailleur	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	4047de82bd	Fix navigation on projects	2017-01-20 10:27:37 +01:00
Laurent Destailleur	03c1521cde	Merge pull request #6271 from altatof/fix_extra_input ... FIX: extrafield input for varchar was not working with special char	2017-01-18 16:53:43 +01:00
Laurent Destailleur	562bdbc9f5	Merge pull request #6291 from gnovaro/patch-1 ... Improve code style	2017-01-18 16:44:56 +01:00
Laurent Destailleur	2566df8252	Merge pull request #6298 from benlo06/fix_shipping_contactid ... FIX getIdContact for shipping	2017-01-18 15:53:32 +01:00
Benoit	73852beb4e	FIX contactid for shipping pdf	2017-01-17 21:55:21 +01:00
arnaud	39f35bbaab	FIX all dolibarr versions about project list and ajax completion bug	2017-01-17 11:17:40 +01:00
Gustavo Novaro	0f6cb52376	Improve code style ... Replace var for public and private.	2017-01-16 17:40:13 -03:00
altatof	3dd160c663	use dol_escape_htmltag	2017-01-16 09:17:37 +01:00
Laurent Destailleur	36bd63c1a7	NEW PHP 7.1 compatibility	2017-01-16 09:05:18 +01:00
Laurent Destailleur	6bfd534a36	NEW PHP 7.1 compatibility	2017-01-16 01:21:33 +01:00
Laurent Destailleur	846e827e09	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:49:11 +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	4ecd657f34	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:02:43 +01:00
Laurent Destailleur	0671f75417	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-16 00:01:37 +01:00
Regis Houssin	fd4a19855d	Fix: preview image not show with multicompany product sharing	2017-01-15 12:09:26 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Laurent Destailleur	1fd9f5e1fb	Fix: host was twice into message id for smtp driver and swiftmailer was ... not using dol_getprefix() to build host.	2017-01-14 13:27:44 +01:00
altatof	55c0a99bce	fix was not at the right place	2017-01-13 15:42:07 +01:00
altatof	487b5b25db	FIX: extrafield input for varchar was not working with special char ... within (ie double quotes)	2017-01-13 15:37:33 +01:00
Laurent Destailleur	2c6672d17a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/login.tpl.php	2017-01-12 11:32:51 +01:00
Laurent Destailleur	c42b48636a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/commande/class/api_commande.class.php htdocs/core/class/CMailFile.class.php htdocs/societe/class/api_contact.class.php	2017-01-12 11:06:24 +01:00
Laurent Destailleur	5e71ff816f	Increase limit for better backward compatibility without loosing minimum ... security.	2017-01-12 10:51:31 +01:00
Regis Houssin	5898d27609	Fix: avoid errors if constants values not exists	2017-01-11 16:47:17 +01:00
Laurent Destailleur	5553be4aa9	Fix code comment	2017-01-11 16:08:04 +01:00
Laurent Destailleur	1559c45a61	FIX link for not found photo when using gravatar. Must use external url	2017-01-10 09:24:55 +01:00
Laurent Destailleur	5c233a41b3	NEW Add hook "formatNotificationMessage"	2017-01-09 23:55:53 +01:00
Laurent Destailleur	93ab224614	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-09 23:33:36 +01:00
Laurent Destailleur	decbda3e23	Fix inversion application name - company name	2017-01-09 23:26:31 +01:00
Laurent Destailleur	a9354e5f27	Fix generic text must be set before specific for notification	2017-01-09 21:07:54 +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	51b9802de4	NEW Hook to allow inserting custom product head #6001	2017-01-07 20:42:35 +01:00
Laurent Destailleur	4c4aeba855	Fix project on loans	2017-01-07 17:54:47 +01:00
Laurent Destailleur	e9853f3cd7	Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into ... Franck-MOREAU-develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql htdocs/loan/card.php htdocs/loan/class/loan.class.php htdocs/projet/element.php	2017-01-07 17:45:05 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Laurent Destailleur	e57f834434	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-01-04 17:06:02 +01:00
Laurent Destailleur	71e368aa83	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-04 17:04:25 +01:00
Laurent Destailleur	2aae4ea6ea	FIX We must not drop column if there is still record on other entities.	2017-01-04 15:05:13 +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
Laurent Destailleur	f46ce68d08	NEW Can sort thumbs visible on product card	2016-12-31 16:16:20 +01:00
Laurent Destailleur	f1961b0207	Work on sorting/indexing upload files	2016-12-31 03:43:22 +01:00
Marcos García de La Fuente	47a444b2ab	Merge branch 'develop' into prod-attr	2016-12-27 15:54:53 +01:00
Laurent Destailleur	b5c815367c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-26 15:44:31 +01:00
Laurent Destailleur	bbd3734a21	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/filefunc.inc.php	2016-12-26 12:42:23 +01:00
Laurent Destailleur	e297b64722	Several security fix in using mailings.	2016-12-26 12:35:10 +01:00
Laurent Destailleur	c9c8079c3d	Can add additionnal paramon mail to solve rare sendmail problems	2016-12-26 00:00:28 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
florian HENRY	337897e0a1	NEW : Allow extrafields list select to be dependands on other standard ... list and not only other extrafields list	2016-12-23 15:01:49 +01:00
Laurent Destailleur	a2133f391f	Complete work on dol_banner	2016-12-23 14:52:25 +01:00
Laurent Destailleur	43942e6ea2	Fix css and fix navigation on resource tab.	2016-12-23 13:04:46 +01:00
Raphaël Doursenaud	ac92e23b59	[Qual] Optimize language file loading ... Using fscanf() and the proper format is about twice as fast as using fgets() followed by explode() and trim(). This is a small optimization per se but since this code is called often it yields about 33% rendering time improvement on the homepage where about 50% of the time is spent on loading the translation files.	2016-12-23 01:11:50 +01:00
Laurent Destailleur	ba7ca3da6e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop6 Conflicts: htdocs/core/photos_resize.php htdocs/install/mysql/data/llx_c_action_trigger.sql	2016-12-22 17:57:42 +01:00
Laurent Destailleur	b4ed0a1e12	Fix nb of lat approvals wrong	2016-12-22 17:30:39 +01:00
Laurent Destailleur	081d3f0814	Quick hack by adding hidden constant to solve a locking feature (how to ... add project if likned to another third on project view)	2016-12-22 16:52:03 +01:00
Laurent Destailleur	d66bc10d05	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/list.php	2016-12-22 15:54:01 +01:00
Laurent Destailleur	574f84bb84	Fix warning for approval delay.	2016-12-22 15:49:06 +01:00
Laurent Destailleur	77c320a092	Fix warning for expense report late	2016-12-22 15:33:43 +01:00
Laurent Destailleur	26098082d0	NEW Uploaded files are indexed into database	2016-12-20 22:14:27 +01:00
Laurent Destailleur	ed0ffd6f5a	NEW Uploaded files are indexed into database	2016-12-20 19:42:25 +01:00
Laurent Destailleur	0ef963604f	Fix option moreinheader not correctly supported with smtps	2016-12-20 12:38:24 +01:00
Laurent Destailleur	3c79f3acb5	Minor fixes or code comment	2016-12-20 12:06:26 +01:00
Laurent Destailleur	be19a999f5	Fix regression losing warning on not defined emails	2016-12-19 18:11:53 +01:00
Laurent Destailleur	0eded9a8b7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-19 02:36:10 +01:00
Laurent Destailleur	0d1d68d5d9	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/admin/dict.php htdocs/product/price.php	2016-12-19 02:34:29 +01:00
Laurent Destailleur	74e00c4d80	More comment and hidden option to solve problems when sending emails.	2016-12-19 01:04:17 +01:00
Laurent Destailleur	dbf96b8f59	Log at wrong place	2016-12-18 23:32:31 +01:00
Laurent Destailleur	54aa8696ad	Fix regression	2016-12-18 13:01:26 +01:00
Laurent Destailleur	9d3bd9d36f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/errors.lang	2016-12-18 11:57:04 +01:00
Laurent Destailleur	0988a2f173	Merge pull request #6187 from gnovaro/patch-5 ... var to public	2016-12-18 11:30:24 +01:00
Laurent Destailleur	3d57a457eb	Merge pull request #6176 from gnovaro/patch-2 ... Replace attributes var for public	2016-12-18 11:28:04 +01:00
Laurent Destailleur	4ece746437	Merge pull request #6168 from defrance/patch-61 ... FIX navigation field is always ref	2016-12-18 11:02:14 +01:00
Laurent Destailleur	27785323ae	Merge pull request #6164 from hregis/4.0_bug ... Fix: missing date locale and date rfc	2016-12-18 10:57:29 +01:00
Laurent Destailleur	12e919b99d	Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin ... Fix user right write margin	2016-12-18 10:53:34 +01:00
Laurent Destailleur	78bf209119	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-18 02:21:57 +01:00
Laurent Destailleur	394e284a4a	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/class/CMailFile.class.php htdocs/langs/en_US/errors.lang	2016-12-18 02:16:40 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
Laurent Destailleur	c5db333af8	Fix translation of error message when sending email	2016-12-17 14:00:39 +01:00
Gustavo Novaro	7728576f19	var to public ... Improve code style	2016-12-17 03:49:28 -03:00
Alexis Algoud	f0ea610401	change date value	2016-12-16 17:06:05 +01:00
Alexis Algoud	41ddaf5d9b	fix but major bug on date name, as to seach a solution	2016-12-16 16:28:10 +01:00
Alexis Algoud	79867a85d0	fix list issue	2016-12-16 16:09:02 +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
Alexis Algoud	4d375bcf95	debug translate	2016-12-16 11:31:14 +01:00
Alexis Algoud	1596760d21	fix regulate / apply new PMP / add or remove line	2016-12-15 17:02:20 +01:00
phf	cca7967144	Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin	2016-12-15 16:19:54 +01:00
Gustavo Novaro	54b433ff6b	Replace attributes var for public ... Improve code style.	2016-12-15 09:54:45 -03:00
Alexis Algoud	9f6f874655	fix	2016-12-15 12:33:26 +01:00
Laurent Destailleur	8f3ce46c50	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-12-15 12:12:36 +01:00
Laurent Destailleur	2c4c48ad6f	Better fix to add server name into email id.	2016-12-15 12:11:39 +01:00
phf	21a648a052	Fix user right on margin module to write buyprice	2016-12-15 12:01:46 +01:00
Alexis Algoud	81b01cd055	fix	2016-12-15 11:23:13 +01:00
Alexis Algoud	703b8708e3	fix create	2016-12-15 10:39:59 +01:00
Alexis Algoud	a463759ba3	init query builder into db	2016-12-14 16:54:05 +01:00
Alexis Algoud	565bcf2332	debug fetch method	2016-12-14 16:11:37 +01:00
BENKE Charlie	2cebeb72aa	FIX navigation field is always ref	2016-12-14 15:04:07 +01:00
Alexis Algoud	a636d27ccb	Div	2016-12-14 14:34:12 +01:00
Laurent Destailleur	ecab7cb70e	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/class/product.class.php	2016-12-14 12:29:41 +01:00
Laurent Destailleur	d2e4888bdd	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-12-14 12:21:33 +01:00
Laurent Destailleur	e4dd020887	Fix bad concat	2016-12-14 11:23:55 +01:00
Laurent Destailleur	af407a094a	FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of ... tracking email.	2016-12-14 11:20:44 +01:00
Alexis Algoud	efc22a4cd8	include default list conception	2016-12-13 09:49:59 +01:00
Regis Houssin	337509d40f	Fix: missing date locale and date rfc	2016-12-13 09:40:08 +01:00
Alexis Algoud	baf1acb4fd	debug	2016-12-13 09:17:43 +01:00
Laurent Destailleur	d2d0e66c5c	Fix style fo ECM module	2016-12-13 01:19:33 +01:00
Laurent Destailleur	902169cb66	Can sort on position on list of documents	2016-12-13 00:40:12 +01:00
Laurent Destailleur	e1a5a90f0a	NEW Uploaded files are indexed into database	2016-12-13 00:15:21 +01:00
Alexis Algoud	dfb9ae234c	debug	2016-12-12 19:03:02 +01:00
Alexis Algoud	cdfbed5d08	new listview	2016-12-12 17:36:22 +01:00
Alexis Algoud	a7813c37a1	init inventory integration	2016-12-12 12:36:00 +01:00
Laurent Destailleur	0c84a0f9af	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-11 22:10:34 +01:00
Laurent Destailleur	6c4f15df63	Fix lot of fix in css look to match v5 rules.	2016-12-11 16:11:42 +01:00
aspangaro	b7babb8a48	Problem of traduction	2016-12-11 14:13:48 +01:00
Laurent Destailleur	190f432c23	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-11 11:07:22 +01:00
Laurent Destailleur	4969af8c74	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: ChangeLog htdocs/product/card.php	2016-12-11 11:04:15 +01:00
Laurent Destailleur	9b436ce871	Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/product/class/product.class.php	2016-12-11 02:51:32 +01:00
Maxime Kohlhaas	f7524b93ad	Actualize currency on supplier order and invoice	2016-12-11 02:50:21 +01:00
Maxime Kohlhaas	177ec97689	Actualize currency on propal, order and invoice	2016-12-11 01:04:58 +01:00
Maxime Kohlhaas	7c82b18da0	New : allow to actualize currency rate	2016-12-10 22:07:25 +01:00
Maxime Kohlhaas	1f48e0486f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug	2016-12-10 21:50:31 +01:00
Maxime Kohlhaas	eb8f89119f	Dynamic select currency	2016-12-10 16:20:37 +01:00
Laurent Destailleur	50bc65ce77	Add css to help debug	2016-12-10 13:05:38 +01:00
Regis Houssin	239e42faa0	Fix: contract use "total_vat" instead "total_tva"	2016-12-09 13:04:05 +01:00
Laurent Destailleur	d23604701c	Fix responsive	2016-12-07 15:00:20 +01:00
Laurent Destailleur	083aef9b90	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-07 14:27:07 +01:00
Laurent Destailleur	1583d0e49f	Fix linkof mass action for pdf merge	2016-12-07 14:14:03 +01:00
Laurent Destailleur	9efcda6714	Merge pull request #6086 from fappels/develop-work-on-warehouse-status ... New continue work on warehouse status #5115	2016-12-07 13:06:07 +01:00
Laurent Destailleur	c2bee0f937	FIX #6088	2016-12-07 12:44:56 +01:00
Laurent Destailleur	455a9ed4da	FIX security in import of files	2016-12-07 12:41:48 +01:00
fappels	085d44eaba	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-12-06 20:15:45 +01:00
fappels	bbbc768fa7	Change filter parameter to string with comma seperated values ... Change warehousefilter from int to string with comma seperated values for selectWarehouses and select_produits form functions.	2016-12-06 20:07:19 +01:00
Laurent Destailleur	017e384f16	FIX Preselected value for extrafield link was not correctly set	2016-12-06 13:10:44 +01:00
fappels	c911f906c8	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-12-05 11:36:20 +01:00
Laurent Destailleur	788cbf9a01	Complete work on dol_banner on contracts	2016-12-04 13:30:17 +01:00
fappels	af5eb00933	Ignore filtering if service	2016-12-02 12:18:36 +01:00
fappels	b21fd14a11	Ignore Service, only filter warehouse if parameter set	2016-12-02 12:17:33 +01:00
fappels	2d4807190e	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-11-30 13:03:24 +01:00
fappels	49442c0b7f	Add filter on warehouse status to object line product list	2016-11-30 13:03:17 +01:00
Laurent Destailleur	874bb488da	Fix bad comment	2016-11-29 23:42:56 +01:00
Laurent Destailleur	bd8f923cee	Several fixes in filter on lists	2016-11-29 22:52:16 +01:00
gauthier	9a1309256d	Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received	2016-11-28 17:13:09 +01:00
Laurent Destailleur	5e5ce0043e	Debug module ECM.	2016-11-28 12:03:33 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	e4a8342aef	Fix div-table-form balance on all lists (solve responsive design)	2016-11-27 11:41:10 +01:00
Laurent Destailleur	16ce156631	Fix responsive design	2016-11-25 18:32:52 +01:00
gauthier	c433829d27	NEW : interface	2016-11-25 11:04:42 +01:00
Laurent Destailleur	60b1591f0e	Fix the notes must not be into the tooltip of ref.	2016-11-23 20:30:43 +01:00
Laurent Destailleur	2043c279b0	Merge remote-tracking branch 'origin/4.0' into develop	2016-11-20 15:47:40 +01:00
Laurent Destailleur	cb99113ab0	Css	2016-11-20 15:47:14 +01:00
Laurent Destailleur	e6894eda0e	Better responsive	2016-11-20 10:58:28 +01:00
Laurent Destailleur	b538f13efb	FIX Module gravatar was not triggered on thirdparty and contact card	2016-11-19 19:43:55 +01:00
Laurent Destailleur	e9b78db1ac	Several bug fixes: ... missing import_key field, ref generator parameter must be task not project, import must use css, serious database integrity problem accepting duplicate tasks.	2016-11-19 02:16:12 +01:00
Laurent Destailleur	9b88ae145b	Fix mass action when using no javascript	2016-11-17 19:04:10 +01:00
florian HENRY	afd17feffe	Merge remote-tracking branch 'origin/develop' into franck_develop	2016-11-16 09:38:50 +01:00
Laurent Destailleur	5539415354	FIX Remove hard coded value '1' for default payment term id. Use quick ... hack by adding hidden constant to avoid this.	2016-11-15 10:43:03 +01:00
moreauf	081be37787	NEW: Add project and Hook to Loan ... BUG: Correct discard_closed parametters management in project	2016-11-14 19:25:50 +01:00
Laurent Destailleur	381b77850c	Fix do not show cloning of virtual product if option is off	2016-11-14 02:08:41 +01:00
Laurent Destailleur	04063a62a8	Better responsive	2016-11-12 15:18:38 +01:00
Laurent Destailleur	4bcc7dc8a0	CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu	2016-11-12 14:36:52 +01:00
Laurent Destailleur	b1bd9e4930	Responsive design	2016-11-11 23:17:37 +01:00
Laurent Destailleur	cd9f1db229	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php	2016-11-11 15:12:30 +01:00
Laurent Destailleur	e4617ec76c	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/filemanagerdol/connectors/php/config.php htdocs/viewimage.php	2016-11-11 15:03:05 +01:00
Laurent Destailleur	360d697fc3	Add missing field to store result of email sending	2016-11-11 13:45:18 +01:00
Laurent Destailleur	b20c4bdfe4	Responsive design	2016-11-11 12:55:03 +01:00
Laurent Destailleur	ab269bd7a6	Better responsive	2016-11-11 01:15:41 +01:00
Laurent Destailleur	fe9c880984	NEW Add missing unique key on table llx_links	2016-11-10 14:24:29 +01:00
Laurent Destailleur	eaa2125373	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/card.php htdocs/projet/class/project.class.php htdocs/projet/list.php	2016-11-10 11:40:39 +01:00
Laurent Destailleur	cc64994f30	Better responsive design	2016-11-10 11:33:25 +01:00
Laurent Destailleur	e30622cbd8	FIX Bcc must not appears to recipient when using SMTPs lib	2016-11-09 00:10:02 +01:00
Laurent Destailleur	d1446bb7ef	NEW Show subtotal into list of linked elements	2016-11-08 19:19:30 +01:00
Laurent Destailleur	3346fb1c75	Fix can change type from url to other string	2016-11-08 17:30:48 +01:00
Laurent Destailleur	fcca3d6be1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-11-08 17:21:41 +01:00
Laurent Destailleur	6d70d39bbd	NEW Add type "url" as possible extrafield.	2016-11-08 17:21:26 +01:00
Laurent Destailleur	a28e2a7fb6	Merge pull request #5863 from benlo06/fr_total_tva ... New: Permit to print TotalTTC price in objectline_view	2016-11-08 14:46:16 +01:00
Laurent Destailleur	9bff6f966b	NEW Can add event from the card listing events	2016-11-08 14:08:48 +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	b4c20f1b1a	Fix regression in creation of invoice ... Uniformize code	2016-11-08 11:23:40 +01:00
Laurent Destailleur	9b64fbaa98	Fix having the css of extrafield on td is not enough to detect it. We ... must have it on tr too.	2016-11-06 16:26:18 +01:00
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
Laurent Destailleur	0fea6f22a9	Change code to reduce need of jmobile	2016-11-05 03:27:56 +01:00
Regis Houssin	718adef600	Fix: external access of fkeditor image with multicompany	2016-11-04 10:21:20 +01:00
Laurent Destailleur	59291be6e0	NEW Can filter on status on objects on the "statistics" page.	2016-11-03 19:50:04 +01:00
Laurent Destailleur	a3607fff77	Fix customer ref of shipment	2016-10-30 16:34:46 +01:00
Laurent Destailleur	b4303470f8	Fix do not update instance status if method used to update other element	2016-10-30 15:42:43 +01:00
Laurent Destailleur	3fbba59f69	Better management of status of events	2016-10-30 13:12:35 +01:00
Laurent Destailleur	aec0e79653	Normalize constant name.	2016-10-29 21:47:10 +02:00
Laurent Destailleur	e9edbba093	NEW Usage of vat code seems ok everywhere.	2016-10-29 21:02:08 +02:00
Laurent Destailleur	03b882d095	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php	2016-10-29 19:12:58 +02:00
Laurent Destailleur	17c1b3f1d2	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-10-29 19:00:43 +02:00
Laurent Destailleur	cc43732c56	Responsive enhancements	2016-10-29 17:02:48 +02:00
Laurent Destailleur	32b6660f63	Uniformize code	2016-10-29 16:18:39 +02:00
Laurent Destailleur	4f5c5a2b0e	NEW Function "crop" images available on project, product and holiday ... attachment tab.	2016-10-28 19:42:04 +02:00
Regis Houssin	d0bd1d5d36	Fix: missing path of user photo	2016-10-28 14:22:06 +02:00
Laurent Destailleur	6938b05219	Mutualize code to show files generated for mass actions	2016-10-28 12:00:30 +02:00
Laurent Destailleur	27808b7f81	Merge pull request #5915 from aspangaro/5.0-p29 ... NEW Expense report documents are now available in ECM module	2016-10-26 10:57:23 +02:00
Laurent Destailleur	7d182c286c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/step1.php htdocs/projet/tasks/time.php	2016-10-26 10:40:03 +02:00
Laurent Destailleur	5d655d47fe	Enhance css	2016-10-25 12:36:14 +02:00
Laurent Destailleur	6ef74b33c9	Uniformize code	2016-10-25 11:09:26 +02:00
Laurent Destailleur	b15535c1f1	Uniformize code	2016-10-25 02:04:46 +02:00
Laurent Destailleur	36c2b5afcd	Responsive	2016-10-24 18:43:17 +02:00
Laurent Destailleur	3b05d00163	Better responsive design	2016-10-24 12:06:33 +02:00
Benoit	a46e7d8e1a	Change inputalsopricetotalwithtax to outputalsopricetotalwithtax	2016-10-24 10:18:24 +02:00
aspangaro	d0544b0aea	Merge remote-tracking branch 'Upstream/develop' into 5.0-p29	2016-10-24 05:27:49 +02:00
aspangaro	337e9db046	New: Expense report documents are now available in ECM module	2016-10-24 05:26:19 +02:00
Laurent Destailleur	b284bdd953	NEW #5896 More complete data on event sent by email (name in title, ... emails list in details)	2016-10-24 02:02:30 +02:00
Laurent Destailleur	35601775e0	By default we open a new tab on external url link	2016-10-22 17:05:47 +02:00
Laurent Destailleur	1c59721294	FIX Solve backup when using mysqldump that return warning	2016-10-22 16:20:51 +02:00
Laurent Destailleur	629af89986	FIX Solve backup when using mysqldump that return warning	2016-10-22 16:18:28 +02:00
Laurent Destailleur	f93bca9be9	NEW Can see/make bank conciliation from transaction list	2016-10-21 17:00:31 +02:00
Laurent Destailleur	434b3ef643	Uniformize code and look and feel	2016-10-17 17:52:58 +02:00
Laurent Destailleur	fe471c43d1	Minor css enhancement	2016-10-16 18:28:09 +02:00
Laurent Destailleur	48ce299a38	NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities.	2016-10-15 03:45:23 +02:00
Laurent Destailleur	dfbca2d0ad	Merge pull request #5868 from olsesacl/#5830 ... NEW: #5830 Allow Generic E-mail Sender	2016-10-15 02:43:19 +02:00
Laurent Destailleur	1f6ddb485f	Fix missing module supplier proposal for external users	2016-10-14 18:22:07 +02:00
Laurent Destailleur	b134f853e5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-10-13 21:25:48 +02:00
Laurent Destailleur	78e8ab64aa	Debug multicurrency	2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent	8556dab68e	NEW: #5830	2016-10-13 16:44:17 +02:00
Benlo	4ebd1ff8a2	Permit to print Total TTC price in objectline	2016-10-12 12:30:22 +02:00
Laurent Destailleur	92dc385307	Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card ... Develop new filter by supplier on replenishment card	2016-10-11 20:04:02 +02:00
BENKE Charlie	9663883ae4	Unactive user place on bottom list ... More usefull	2016-10-10 18:15:46 +02:00
Laurent Destailleur	6489cd6164	Debug accounting module	2016-10-07 12:10:16 +02:00
gauthier	fee0a88d27	Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card	2016-10-07 09:25:18 +02:00
gauthier	18496f9159	FIX : params order	2016-10-07 09:19:10 +02:00
Laurent Destailleur	c908af6758	Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month ... NEW Develop new cdr (current or next month) for payment terms.	2016-10-07 00:06:59 +02:00
Laurent Destailleur	db3e3642b0	NEW Can generate SEPA mandate for each bank account of your customers	2016-10-06 00:14:25 +02:00
Laurent Destailleur	e79a84a89b	Uniformize code	2016-10-05 21:49:04 +02:00
gauthier	ee014681b0	Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card	2016-10-05 15:30:23 +02:00
gauthier	9c8ecdc8d8	NEW : filter by supplier on replenish.php	2016-10-05 15:06:30 +02:00
Laurent Destailleur	9ec520a37a	Fix link to on proposal	2016-10-04 20:52:15 +02:00
gauthier	b35a4eb1b2	Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month	2016-10-04 16:01:26 +02:00
gauthier	1c98979ca1	NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month	2016-10-04 15:45:23 +02:00
Laurent Destailleur	b607fb6be2	Fix do not show link to for disabled modules	2016-10-04 12:52:00 +02:00
Laurent Destailleur	3599f2c840	Uniformize code for recurring invoices	2016-10-04 12:31:45 +02:00
Laurent Destailleur	e37e30cc39	Better responsive	2016-10-04 11:29:48 +02:00
Laurent Destailleur	7967c80179	Code comment	2016-10-03 12:16:32 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +02:00
Laurent Destailleur	0d9f28bd61	Fix dash in incoterm label	2016-10-02 16:50:28 +02:00
Laurent Destailleur	f92ca518f7	Uniformize look and feel	2016-10-02 16:38:58 +02:00
Laurent Destailleur	2579cb35dd	Minor fix	2016-10-02 11:03:36 +02:00
Laurent Destailleur	e62a12ebe9	Merge pull request #5817 from atm-arnaud/FIX_develop_maxwidthonsmartphone_on_extrafields ... Fix Extrafields edit crashed by maxwidthonsmartphone ...	2016-10-01 18:59:37 +02:00
Laurent Destailleur	ee252f549a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog dev/skeletons/skeleton_list.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/lib/cron.lib.php htdocs/core/tpl/admin_extrafields_add.tpl.php	2016-10-01 18:42:50 +02:00
Laurent Destailleur	cf7327a2a2	FIX #5750 Bug: CmailFile::server_parse enters an infinite loop if ... $server_response is false	2016-10-01 16:41:12 +02:00
arnaud	0bb7aaa62f	Fix Extrafields edit crashed by maxwidthonsmartphone ...	2016-09-30 14:26:04 +02:00
Laurent Destailleur	5c9fa28e79	Fix search on invoice type	2016-09-29 10:38:15 +02:00
Laurent Destailleur	6232e59fd2	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-26 14:17:36 +02:00
Laurent Destailleur	fac946dbb8	FIX The email test sender in email setup was broken	2016-09-26 14:08:14 +02:00
Laurent Destailleur	48b188d200	Merge pull request #5785 from EuskalMoneta/rest-api-add-countries-and-towns ... NEW Add Countries and Towns to the REST API.	2016-09-26 01:33:56 +02:00
Laurent Destailleur	100312aac2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/adherents/class/cotisation.class.php	2016-09-26 01:32:50 +02:00
Laurent Destailleur	ea09eb13da	Uniformize code	2016-09-26 00:10:29 +02:00
Xebax	d5ee73a1b7	Add Countries to the REST API.	2016-09-25 17:43:15 +02:00
aspangaro	2dbeeedd14	Move tab menu for subscription in member.lib ... Move all pages for subscription member in adherent/subscription (Card / Info / List) Rename llx_cotisation in llx_subscription Rename all db field cotisation in subscription Rename class Cotisation in class Subscription	2016-09-24 06:48:40 +02:00
florian HENRY	984a56adc5	FIX : #5776	2016-09-23 10:51:31 +02:00
Laurent Destailleur	d4e324d15a	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/facture.php	2016-09-21 18:38:30 +02:00
Laurent Destailleur	9c12444a03	Fix size of warehouse and height of confirm box	2016-09-21 18:20:18 +02:00
Laurent Destailleur	39c4feaef7	Enhancement for usage on smartphone	2016-09-21 03:54:54 +02:00
Laurent Destailleur	133657a8c7	Uniformize code	2016-09-21 01:25:34 +02:00
Laurent Destailleur	c4c7ccc226	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/societe/note.php htdocs/societe/rib.php	2016-09-19 14:05:16 +02:00
Laurent Destailleur	4f842fd2cb	Uniformize look and feel	2016-09-19 13:57:50 +02:00
Laurent Destailleur	079ed88119	Fix missing css	2016-09-19 13:57:18 +02:00
Laurent Destailleur	af28a67803	Uniformize look using dol_banner	2016-09-19 10:43:30 +02:00
Laurent Destailleur	c8b8e13014	Work on dol_banner for proposals.	2016-09-18 21:38:20 +02:00
Laurent Destailleur	6093dfe333	Uniformize code	2016-09-18 12:33:30 +02:00
Laurent Destailleur	72aacb81ae	NEW Can use native php and dolibarr object on pages of module website.	2016-09-16 01:13:52 +02:00
Laurent Destailleur	68b3de5b37	NEW ckeditor accept a parameter to disable all html filtering	2016-09-15 23:23:10 +02:00
Sergio Sanchis Climent	93b216e628	FIX: #5699	2016-09-15 05:18:08 +02:00
Laurent Destailleur	39d47eab18	NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment ... term on company level.	2016-09-14 11:17:44 +02:00
phf	0cf5ee2f28	Fix clone object with "link" as extrafield	2016-09-13 10:12:55 +02:00
Laurent Destailleur	0ab377440d	Complete param of setValueFrom	2016-09-12 20:16:39 +02:00
Laurent Destailleur	5c1127fc54	NEW Enhance function setValueFrom so we can use it for "edit in form" ... feature.	2016-09-12 20:00:47 +02:00
Laurent Destailleur	efb05fda6a	Cleaner code to avoid to log when nothing is done	2016-09-12 19:58:43 +02:00
Laurent Destailleur	1f9aa856d5	NEW the list of linked files on card does not forget external links.	2016-09-12 18:37:40 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
Laurent Destailleur	9ff1809f85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php	2016-09-12 02:05:38 +02:00
Laurent Destailleur	1bb278a587	Fix #5712	2016-09-11 23:01:04 +02:00
Laurent Destailleur	6d6eceb0ca	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-08 11:39:38 +02:00
Laurent Destailleur	5fdca121aa	NEW Can renamed attached files on products and expense reports	2016-09-07 01:54:16 +02:00
Marcos García de La Fuente	05728075d6	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-09-06 21:06:33 +02:00
Laurent Destailleur	666c62af04	Fix http into https	2016-09-06 00:59:31 +02:00
Laurent Destailleur	d24045d831	NEW Editing translation GUI become easier with search translation tool.	2016-09-04 14:45:43 +02:00
Laurent Destailleur	cb27b01812	Work on feature to find a translation key	2016-09-03 18:47:04 +02:00
Laurent Destailleur	0e4b4ee321	Merge branch 'develop-external-logging' of ... https://github.com/GPCsolutions/dolibarr into GPCsolutions-develop-external-logging Conflicts: composer.json	2016-09-02 21:51:25 +02:00
Laurent Destailleur	524dd79198	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/bank/search.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/projet/tasks/time.php	2016-08-31 00:16:07 +02:00
Laurent Destailleur	5e88de7e2c	Fix field customer/prospect/supplier in list of thirdparties	2016-08-28 15:21:09 +02:00
Laurent Destailleur	2e7e5151b7	Merge pull request #5463 from hregis/develop_origin ... New: Add entity field in llx_societe_remise_except and llx_societe_remise	2016-08-28 12:23:04 +02:00
Laurent Destailleur	fac28f9589	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php	2016-08-28 02:40:20 +02:00
Regis Houssin	6e40f9e700	Merge remote-tracking branch 'dolibarr/develop' into develop_origin ... Conflicts: htdocs/core/class/html.form.class.php Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59	2016-08-25 10:15:26 +02:00
Maxime Kohlhaas	52cbdf04c3	Allow to use textwithpicto with a custom picto	2016-08-23 11:03:47 +02:00
Laurent Destailleur	83107746ad	Fix no way to fix the ref of recurring invoice when an error was done ... into typing.	2016-08-19 16:18:39 +02:00
Laurent Destailleur	fead7967f2	Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/commande/list.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/resource/class/resource.class.php	2016-08-17 16:55:39 +02:00
Laurent Destailleur	282c50ef34	Merge pull request #5631 from atm-florian/4.0 ... FIX #5594	2016-08-17 14:08:06 +02:00
Laurent Destailleur	caa0dd75aa	Fix responsive design on small smartphone	2016-08-17 11:47:39 +02:00
florian HENRY	0ac090e959	FIX : #5629 DoliDBPgsql::query SQL Error message: ERROR: 22P02: invalid ... input syntax for integer: ""	2016-08-16 09:07:08 +02:00
florian HENRY	3932a32399	FIX : #5629 PgSQL Interger string stylish error	2016-08-16 09:00:52 +02:00
florian HENRY	aa17564e93	FIX: #5594	2016-08-16 08:54:12 +02:00
Raphaël Doursenaud	49cb61b530	CLOSE #5627 Allowed external logging modules. ... Removed Sentry logging.	2016-08-16 03:24:04 +02:00
Laurent Destailleur	6b6ee8795c	Button filter on boxes is at end of title line	2016-08-11 19:55:29 +02:00
florian HENRY	321814fae3	better fix for #5594	2016-08-09 15:17:19 +02:00
Laurent Destailleur	4d4fc87e2b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/dispatch.php htdocs/product/stock/productlot_list.php htdocs/websites/index.php	2016-08-09 13:26:08 +02:00
florian HENRY	90cb71f341	revert better fix	2016-08-08 13:54:51 +02:00
florian HENRY	15f187c466	better test	2016-08-08 13:54:03 +02:00
florian HENRY	94487cf411	FIX #5594	2016-08-08 13:43:44 +02:00
Laurent Destailleur	bcd055b378	Move button to link to, in same part of code than code to output links.	2016-08-05 15:30:28 +02:00
Laurent Destailleur	890e6f59c8	NEW Support mass actions for proposals	2016-08-05 13:08:23 +02:00
Laurent Destailleur	e168888c59	NEW Reduce nb of picto on ref into list, merging preview and download	2016-08-05 12:20:11 +02:00
Laurent Destailleur	e1e8254bcf	Fix thumbs are using same extension than original.	2016-08-05 04:31:19 +02:00
Laurent Destailleur	544d5af49b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-05 01:15:35 +02:00
Laurent Destailleur	33d12a4492	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/admin.lang	2016-08-05 01:15:19 +02:00
Laurent Destailleur	7211542e41	Merge pull request #5569 from olsesacl/develop-show-preview-documents ... NEW Preview documents	2016-08-05 01:13:35 +02:00
Laurent Destailleur	4e483c675e	Merge branch 'dev_add_color_on_select_product' of ... https://github.com/atm-florian/dolibarr into atm-florian-dev_add_color_on_select_product Conflicts: htdocs/core/class/html.form.class.php	2016-08-05 00:44:24 +02:00
Laurent Destailleur	26f553a1a8	Fix bad position of test	2016-08-04 12:04:43 +02:00
Laurent Destailleur	7a7e7b330f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-04 11:58:11 +02:00
Laurent Destailleur	7f6e2a277a	NEW Link between objects can be done on both side and on all objects	2016-08-04 11:57:37 +02:00
Laurent Destailleur	e0b9496f9e	Fix link sometimes fails because of id not defined	2016-08-04 10:44:17 +02:00
florian HENRY	13f33ab9c7	syntax	2016-08-04 09:23:10 +02:00
florian HENRY	a013e84e0e	NEW : Add color regarding stock even on ajax autocompleter product ... selector	2016-08-04 09:21:04 +02:00
Laurent Destailleur	b97223edd7	Fix: link to link to objects not visible	2016-08-03 19:01:51 +02:00
Laurent Destailleur	6ae8d26a89	Fix max width on combo of tasks	2016-08-03 00:04:38 +02:00
Laurent Destailleur	f0c75388cb	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/api_commande.class.php htdocs/compta/facture/class/api_invoice.class.php htdocs/product/class/api_product.class.php htdocs/societe/class/api_contact.class.php htdocs/societe/class/api_thirdparty.class.php	2016-08-02 17:43:12 +02:00
Sergio Sanchis Climent	5fe0d601da	New: Preview documents	2016-08-02 03:35:22 +02:00
Laurent Destailleur	e335ce6f45	Fix bad var declared	2016-08-01 19:54:03 +02:00
Laurent Destailleur	b267402df6	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/main.lang htdocs/societe/rib.php	2016-08-01 15:15:32 +02:00
Laurent Destailleur	51e941b9b4	Fix for option MAIN_OPTIMIZEFORTEXTBROWSER	2016-07-31 13:07:55 +02:00
Laurent Destailleur	79222c732d	Fix bad var	2016-07-31 02:56:08 +02:00
Laurent Destailleur	d60ac77ad3	NEW The autofill zip/town table option is on by default.	2016-07-30 15:49:39 +02:00
Laurent Destailleur	45e37c82cd	FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/fourn/facture/list.php	2016-07-29 16:29:31 +02:00
Laurent Destailleur	b85bb8c0f8	Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2016-07-29 16:24:02 +02:00
Laurent Destailleur	b3cdb1f163	FIX tag for date rfc in odt substitution	2016-07-29 16:21:28 +02:00
Laurent Destailleur	9ca7f2cb66	Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by ... default).	2016-07-28 19:02:23 +02:00
Laurent Destailleur	00118610bb	A fix to make editinplace working better	2016-07-28 15:29:46 +02:00
Laurent Destailleur	aae2086ada	Move notes on dedicated tabs like other elements. ... Rename also the note available into translation tab into "other" to avoid confusion because it was not the same usage.	2016-07-28 13:53:17 +02:00
Regis Houssin	6bf655c882	Merge remote-tracking branch 'dolibarr/develop' into develop_origin ... Conflicts: htdocs/societe/class/societe.class.php Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb	2016-07-28 09:53:10 +02:00
Laurent Destailleur	8b3136cb96	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/companies.lang	2016-07-27 19:04:55 +02:00
Sergio Sanchis Climent	3b57727542	PHP7 warnings on project module's configuration page	2016-07-26 22:22:55 +02:00
Regis Houssin	4b8f42949c	# WARNING: head commit changed in the meantime ... Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670	2016-07-25 21:05:11 +02:00
Marcos García de La Fuente	3029fd0fe1	FIX #5540 getFormMail is not registered as addReplace hook	2016-07-25 13:18:41 +02:00
Marcos García de La Fuente	3ef3a038cf	Merge branch '3.9' into bug-5537	2016-07-25 11:50:08 +02:00
Marcos García de La Fuente	a9d75b2c91	FIX #5537 AJAX project search does not work properly	2016-07-25 11:49:04 +02:00
BENKE Charlie	415bdbe9b5	Update html.formfile.class.php	2016-07-25 11:22:53 +02:00
Marcos García de La Fuente	b1c552ee9d	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/install/mysql/tables/llx_product_attribute.key.sql # htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql	2016-07-24 11:54:38 +02:00
Marcos García de La Fuente	c082505021	NEW Added product attributes feature	2016-07-24 11:27:52 +02:00
Laurent Destailleur	08d23b482b	NEW Introduce mass action "delete" on sales orders.	2016-07-23 12:17:47 +02:00
Laurent Destailleur	af09528738	NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and ... __AMOUNT_WO_TAX__ into emails templates.	2016-07-21 20:45:30 +02:00
Laurent Destailleur	93bb929219	Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type ... NEW : Add new password extrafields type	2016-07-21 14:01:07 +02:00
Laurent Destailleur	058c431483	FIX The project was lost when creating the event "sent by email". Also, ... event company "create" was not tracked by default like others.	2016-07-21 13:49:10 +02:00
Laurent Destailleur	34d1c0af72	Merge pull request #5321 from frederic34/patch-7 ... Fix quotes not required on int	2016-07-20 19:09:09 +02:00
Laurent Destailleur	e2a03d18dd	Merge remote-tracking branch 'origin/4.0' into develop	2016-07-16 19:58:36 +02:00
Laurent Destailleur	553981426e	Several minor fixes in expense reports	2016-07-16 15:21:38 +02:00
Laurent Destailleur	6fcd9e8dbf	Merge pull request #4612 from bafbes/abb-1 ... FIX Target object does not need to have all extrafields of source object.	2016-07-15 17:41:29 +02:00
Laurent Destailleur	9ba1ca5acb	Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 ... Conflicts: htdocs/langs/en_US/companies.lang	2016-07-15 17:05:12 +02:00
Laurent Destailleur	1b070babc8	Merge remote-tracking branch 'origin/4.0' into develop	2016-07-15 14:23:44 +02:00
Laurent Destailleur	fdfe4d9ac5	Fix missing getFormMail as "addreplace" hook	2016-07-15 14:21:07 +02:00
Bahfir Abbes	5966170a0d	Done, thanks	2016-07-15 10:43:01 +01:00
Laurent Destailleur	a5123c06db	Save the virtualhost so we can test without entering it each time.	2016-07-14 19:42:04 +02:00
Laurent Destailleur	fabd74169f	Fix: missing 'Maximize' button on full toolbar set of ckeditor.	2016-07-14 11:46:32 +02:00
Laurent Destailleur	329bdfc9fd	FIX We must take last recent price when using several level of prices	2016-07-11 11:35:38 +02:00
Laurent Destailleur	0367cee671	FIX We must take the last recent defined price when using price level	2016-07-11 11:34:11 +02:00
Laurent Destailleur	a258663175	Fix edition of status were loosing old percent. We show it to allow user ... to keep it if required.	2016-07-09 14:58:51 +02:00
Laurent Destailleur	93c9e81c33	Fix better size on list	2016-07-09 12:05:09 +02:00
Laurent Destailleur	d8d938e82c	Fix performance problems Enter new time spent duration becoma < 1s ... instead of 30s with 5000 tasks.	2016-07-08 17:06:12 +02:00
Laurent Destailleur	a95335d869	Fix missing ref of task	2016-07-08 16:20:11 +02:00
Laurent Destailleur	d940cc392a	FIX Several fix to exclude WON/LOST of reporting of opportunities amount ... (sometimes we need, sometimes not).	2016-07-08 10:59:13 +02:00
Laurent Destailleur	5ebbe02853	Fix missing trackid into parameters of hooks	2016-07-07 16:26:00 +02:00
Regis Houssin	ee02ff43d7	Fix: add entity field in llx_societe_remise_except, useful when ... third-sharing is used with multicompany	2016-07-07 12:26:30 +02:00
florian HENRY	2d932066c7	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type	2016-07-07 09:17:39 +02:00
Laurent Destailleur	f756f3db0e	Fix hook context 'all'	2016-07-07 01:23:20 +02:00
Laurent Destailleur	8505c5db09	Code comment	2016-07-06 13:26:49 +02:00
Laurent Destailleur	759b265eeb	Merge pull request #5447 from atm-florian/dev_fix5446 ... FIX #5446 Extrafields select list filter on other select list do not work	2016-07-06 11:46:21 +02:00
Laurent Destailleur	c360189d94	Code comment	2016-07-06 11:14:17 +02:00
Laurent Destailleur	b4c8822281	Fix style of text after ref on invoices	2016-07-05 16:27:14 +02:00
florian HENRY	fc2e7fb1ad	FIX #5446	2016-07-05 15:45:33 +02:00
Laurent Destailleur	525b2cf297	Fix: Edition of contract on intervention failed	2016-07-02 12:02:51 +02:00
Laurent Destailleur	59f86a12d2	Fix delete of documents generated on project. ... Fix missin translation	2016-07-01 17:49:13 +02:00
Laurent Destailleur	62d7303d8f	Add comment	2016-07-01 03:40:48 +02:00
Laurent Destailleur	05384b2f88	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/list.php htdocs/projet/card.php htdocs/societe/consumption.php	2016-07-01 02:39:29 +02:00
Laurent Destailleur	29e26c2342	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/lib/sendings.lib.php	2016-07-01 02:06:30 +02:00
florian HENRY	215f397f33	Cannot reproduce 4793 still fix other bug on PgSQL	2016-06-30 17:28:13 +02:00
fmarcet	e4a2b5abb3	Fix: Incorrect document link on supplier invoices's list	2016-06-30 11:27:29 +02:00
Laurent Destailleur	dcfc385645	Fix to avoid blocking error in auto upgrade process	2016-06-29 12:26:01 +02:00
florian HENRY	52f2e228f1	Add new password extrafields type	2016-06-28 10:21:10 +02:00
Laurent Destailleur	5aa561598f	Fix exit into functions	2016-06-28 02:22:01 +02:00
Laurent Destailleur	d6e15fe8f3	Increase max size of number of product into list	2016-06-26 23:15:20 +02:00
Laurent Destailleur	f021a8ca31	FIX Bad error management into trigger of mailmanspip	2016-06-25 18:48:50 +02:00
Laurent Destailleur	2767df2e01	FIX Solve problem of sending joinded files of another email when several ... tabs are opened on form to send emails.	2016-06-24 16:10:52 +02:00
Laurent Destailleur	6033b09344	FIX: A constructor must not return a value. ... FIX: A topic is required to send an email (probability to be spam of 99%)	2016-06-24 15:36:20 +02:00
Laurent Destailleur	0bf0937cc6	FIX: disabled templates must be not visible.	2016-06-24 13:08:34 +02:00
Laurent Destailleur	453c6264bf	FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly	2016-06-24 02:19:41 +02:00
Laurent Destailleur	227bdb9838	FIX extrafields was not visible on tab "subscription" ... FIX Link between membership and invoice was not saved	2016-06-24 00:45:35 +02:00
Laurent Destailleur	d72d22cda4	Fix confusing translation	2016-06-23 23:22:30 +02:00
Laurent Destailleur	91e13d23fe	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-23 20:20:16 +02:00
Scrutinizer Auto-Fixer	23620e3133	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-06-23 18:19:43 +00:00
Laurent Destailleur	2223ec15d1	Fix doxygen errors	2016-06-23 20:19:35 +02:00
Laurent Destailleur	4a408e76e7	Fix download of mass generated files.	2016-06-22 21:06:08 +02:00
Laurent Destailleur	52f414ad73	Fix selection of visible fields on customer and supplier lists. Filters ... are ok now. Order of list of fields in selection is same than in output array.	2016-06-21 15:16:33 +02:00
Laurent Destailleur	6317cb53f2	FIX Merge of 2 thirdparties when there is one common tag.	2016-06-20 15:42:16 +02:00
Laurent Destailleur	7f4e163a52	Fix scrutinizer reports	2016-06-20 02:37:02 +02:00
Laurent Destailleur	8187dc2006	Fix css	2016-06-19 16:07:34 +02:00
Laurent Destailleur	34c741bf0d	FIX CSS and responsive behaviour (feature with a menu hider is on on ... smarpthone)	2016-06-17 16:28:16 +02:00
Laurent Destailleur	5b5b7a2bf9	FIX Bad value used for task warning delay ... FIX Compatibility datee and date_end for warning of tasks	2016-06-15 14:05:48 +02:00
Laurent Destailleur	aed2c5cb30	Clean css	2016-06-10 18:41:18 +02:00
Frédéric FRANCE	262dcbea2c	Update commonobject.class.php	2016-06-07 18:08:33 +02:00
Laurent Destailleur	9019576394	Fix css class opacitymedium was not used everywhere.	2016-06-07 15:58:02 +02:00
Laurent Destailleur	c7065cc3b8	Minor esthetic fixes	2016-06-07 13:15:38 +02:00
Laurent Destailleur	293c8e145a	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/imports/import.php htdocs/langs/en_US/admin.lang	2016-06-05 02:20:27 +02:00
Laurent Destailleur	c09dbe05b3	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/class/ldap.class.php htdocs/expensereport/card.php htdocs/langs/en_US/admin.lang	2016-06-05 00:25:08 +02:00
Laurent Destailleur	db2269b9dd	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/class/ldap.class.php htdocs/langs/en_US/admin.lang	2016-06-05 00:12:34 +02:00
Maxime Kohlhaas	3ef9fe2c40	Fix product supplier price modification with multicompany	2016-06-04 18:10:40 +02:00
BENKE Charlie	d86f89a8fa	fix : #4853 ... append if not contact type for the element	2016-06-04 17:55:28 +02:00
phf	8ccda16ef3	Fix call function ldap_connect but not exists	2016-06-04 14:50:32 +02:00
Laurent Destailleur	bfb7923d4c	Merge pull request #5268 from atm-ph/fix_multicurrency_conf ... Fix conf useful has been commented	2016-06-04 11:37:01 +02:00
Laurent Destailleur	b57476153f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/societe/consumption.php	2016-06-04 01:14:36 +02:00
phf	495ce2463d	Fix switch currency on document do not get the associate rate	2016-06-04 01:13:23 +02:00
phf	cd79675f7a	Fix using extrafield type "link to object" show error on edit card	2016-06-03 21:16:25 +02:00
Laurent Destailleur	5106f40a56	Merge branch 'develop_NEW_decrease_stock_expedition_classify' of ... https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_decrease_stock_expedition_classify Conflicts: htdocs/expedition/class/expedition.class.php	2016-06-02 11:23:49 +02:00
Laurent Destailleur	c663ca13b8	Fix edit left menu	2016-06-01 21:41:47 +02:00
Laurent Destailleur	028ff5e84c	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/card.php htdocs/langs/en_US/products.lang htdocs/societe/list.php	2016-06-01 17:59:50 +02:00
Laurent Destailleur	40005b8f65	FIX Missing search on barcode, only if defined	2016-06-01 12:15:54 +02:00
Laurent Destailleur	1bc6c4ffa3	Clean code	2016-05-30 20:50:49 +02:00
Laurent Destailleur	460d7ce915	FIX Split of credit note into discount page generates records not ... correctly recognised as credit note.	2016-05-30 19:38:28 +02:00
Laurent Destailleur	22d6d9497e	Fix ambiguous test on ldap return of getAttributes	2016-05-29 11:20:12 +02:00
Laurent Destailleur	9bd9cda224	Move to HTML5	2016-05-24 16:02:43 +02:00
Laurent Destailleur	3119d77565	Add warning on deprecated param	2016-05-22 16:36:48 +02:00
Laurent Destailleur	634ebaa3b6	Fix into conf.class.php file we must use $this and not $conf	2016-05-21 16:01:14 +02:00
Laurent Destailleur	e6a78739bd	Fix translation from a key that is a numeric	2016-05-19 21:12:09 +02:00
Laurent Destailleur	901c7c9517	Link "Backtolist" was missing on products	2016-05-17 02:16:28 +02:00
Alexis Algoud	8d0e5479a0	Rename var	2016-05-14 19:22:27 +02:00
Alexis Algoud	e74e70287f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/product/stock/replenish.php	2016-05-14 19:14:39 +02:00
Laurent Destailleur	d1d1b824b4	Better coding of #5181. I removed need of external lib.	2016-05-13 20:20:48 +02:00
Laurent Destailleur	698b93cf1e	FIX #5179	2016-05-08 12:38:30 +02:00
Laurent Destailleur	5cf8612c58	Fix scrutinizer errors	2016-05-08 12:08:23 +02:00
Juanjo Menent	ae6e233781	Merge pull request #5176 from Dolibarr/scrutinizer-patch-3 ... Scrutinizer Auto-Fixes	2016-05-07 00:49:57 +02:00
Laurent Destailleur	d484383467	Minor errors	2016-05-06 22:06:23 +02:00
Scrutinizer Auto-Fixer	9508d8a5c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-05-06 19:10:59 +00:00
Laurent Destailleur	aa55cdadac	Merge pull request #4944 from FHenry/develop_advtargetemailiing ... NEW : Advance target emailing	2016-05-05 23:18:27 +02:00
Laurent Destailleur	d2df537d43	Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project ... NEW allow a document to be linked to project from another customer	2016-05-05 22:24:32 +02:00
Laurent Destailleur	461f62c200	Use the new global search form	2016-05-05 13:29:42 +02:00
Florian HENRY	3d57e83094	Merge branch 'develop' into develop_advtargetemailiing ... Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/install/mysql/tables/llx_c_accounting_category.sql	2016-05-02 20:40:42 +02:00
Florian HENRY	fda5e6002f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/websites/index.php	2016-05-02 20:27:34 +02:00
abb	23c0a0a64e	conflict solved Merge branch 'develop' into abb-14 ... Conflicts: htdocs/langs/en_US/companies.lang	2016-05-02 01:28:46 +01:00
abb	9ba129aa0c	Merge branch 'develop' into abb-1	2016-05-02 01:17:27 +01:00
Laurent Destailleur	46e2ed2810	NEW: All variant of ckeditor config can be tested into the setup page of ... module.	2016-05-01 20:36:42 +02:00
Laurent Destailleur	f59f3032c6	NEW: Rename path for generic medias files into '/medias' instead of ... fckeditor. Add location of medias into title of media browser of ckeditor. Work on website module	2016-05-01 16:34:50 +02:00
Laurent Destailleur	6a123c91b5	Solve warnings that appears because code is using statically a mehtod ... that can't be static yet.	2016-04-30 19:30:28 +02:00
Laurent Destailleur	97bf91cc5d	Show both currency symbol and code	2016-04-30 14:09:00 +02:00
Laurent Destailleur	0cde6ad98f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/filefunc.inc.php	2016-04-29 20:43:42 +02:00
Laurent Destailleur	3d9456b202	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/fourn/facture/list.php	2016-04-29 20:42:35 +02:00
Laurent Destailleur	53386e22ea	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/expedition/class/expedition.class.php htdocs/index.php	2016-04-29 20:39:17 +02:00
Laurent Destailleur	0735413e7c	Merge pull request #5101 from altatof/fix_fournprice_select ... FIX: end of select when no fournprice	2016-04-29 20:36:44 +02:00
BENKE Charlie	31a9acc77d	</option> not present in some select list	2016-04-29 20:18:26 +02:00
Laurent Destailleur	db4024035e	Merge pull request #5092 from defrance/patch-1 ... </option> not present in some select list	2016-04-29 20:17:56 +02:00
esprit libre	f5a541d469	Fix problem about unit buy price fetching ... To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price. Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges	2016-04-29 19:41:47 +02:00
Laurent Destailleur	b17b30f5a2	Merge pull request #5114 from esprit-libre/develop ... FIX When buy price not explicetly defined, it is return by defineBuyPrice function that return total price instead of unit price	2016-04-29 19:40:29 +02:00
Alexis Algoud	e5b6d39e51	NEW allow a document to be linked to project from another customer on config	2016-04-29 18:04:59 +02:00
Florian HENRY	6ff71792a0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-29 09:00:42 +02:00
Laurent Destailleur	2ea5bf3d5e	FIX: Pre selected value was not used on supplier list ouput	2016-04-28 20:04:48 +02:00
esprit libre	75a9178549	Fix problem about unit buy price fetching ... To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price. Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges	2016-04-27 16:42:59 +02:00
Florian HENRY	1d75c5f720	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/commonobject.class.php	2016-04-27 09:41:42 +02:00
Laurent Destailleur	78cda5dc07	Fix problem with code of reccuring invoices	2016-04-26 22:00:41 +02:00
Florian HENRY	b82a216879	fix confilct	2016-04-26 14:21:40 +02:00
Florian HENRY	c7a9f26ee5	NEW : continue hidden extrafield feature	2016-04-26 14:17:19 +02:00
Alexis Algoud	b46c14812c	Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop	2016-04-25 18:37:47 +02:00
Alexis Algoud	b472a244db	NEW decrease stock on expedition closing/classifying	2016-04-25 18:33:39 +02:00
Christophe Battarel	2a0c508d47	FIX: end of select when no fournprice	2016-04-25 11:26:13 +02:00
Laurent Destailleur	c73f4e5d7b	FIX Project was lost when creating invoice from a template ... Can set project on invoice during creation of invoice from a template Replace duplicated code to show lines with mutualized code	2016-04-24 20:00:00 +02:00
Laurent Destailleur	bcb4b2b607	Work on website module	2016-04-23 21:34:10 +02:00
BENKE Charlie	961c086be3	</option> not present in some select list	2016-04-23 20:17:45 +02:00
Laurent Destailleur	b639849a47	Page for proposals must be called card.php (one of last architecture ... change before the freeze)	2016-04-23 15:37:22 +02:00
Laurent Destailleur	3278c8245b	Merge pull request #5020 from frederic34/swiftmailer ... Add Swift Mailer to send mails	2016-04-22 20:12:58 +02:00
Laurent Destailleur	284622edbd	Merge pull request #5062 from bafbes/abb-18 ... fix:missing quote in query in commonobject updatefield function	2016-04-22 19:51:11 +02:00
Laurent Destailleur	7e047ada2b	Merge pull request #5064 from aspangaro/4.0-p21 ... FIX: Accountancy - Road to stable version	2016-04-22 19:21:18 +02:00
Laurent Destailleur	bfc5be1aad	FIX Fix and move dolGetFirstLine function into main ... FIX Hang on ->client not defined	2016-04-22 19:07:32 +02:00
Laurent Destailleur	1de36d6501	Merge pull request #5011 from altatof/supplierorder_noprice ... NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED	2016-04-22 18:27:42 +02:00
Laurent Destailleur	a99b7ddee6	Fix PHPCS	2016-04-22 18:12:31 +02:00
Laurent Destailleur	c939273fd5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-22 13:38:56 +02:00
Laurent Destailleur	7515b2ba7b	NEW Add a parameter on graph function to show a generic graph when no ... data are available.	2016-04-22 12:11:57 +02:00
aspangaro	8f3a254259	FIX: Bug with category functionnality	2016-04-22 06:31:40 +02:00
abb	a0f57e6a91	fix:add escape function to query in updatefield function	2016-04-21 14:49:46 +01:00
abb	4406cfcbb8	fix:missing quote in query in updatefield function	2016-04-21 14:32:51 +01:00
Laurent Destailleur	7adf3a4789	Merge pull request #5043 from bafbes/abb-15 ... new function updateExtraField to update one particular extrafield	2016-04-21 02:58:39 +02:00
Laurent Destailleur	1e5ff7388c	Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client ... NEW Removed deprecated CommonObject::client property	2016-04-21 01:49:12 +02:00
Laurent Destailleur	533391f846	Merge pull request #5030 from frederic34/patch-7 ... FIX Using $user that was not imported	2016-04-21 01:25:59 +02:00
Laurent Destailleur	30f7d4cd52	Merge pull request #5027 from marcosgdf/refactor-option ... Refactored Form classes to use Form::selectarray instead of HTML code	2016-04-21 01:15:59 +02:00
Laurent Destailleur	08c379ad58	Fix submit photo is no more hidden on smartphone.	2016-04-19 19:15:31 +02:00
abb	62aa628524	fixmycommit:new function updateExtraField to update one particular extrafield	2016-04-19 07:49:05 +01:00
abb	f0f4933905	new function updateExtraField to update one particular extrafield ... Conflicts: htdocs/core/class/commonobject.class.php	2016-04-19 07:47:29 +01:00
Laurent Destailleur	a88b3a8cc4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-18 21:02:34 +02:00
Laurent Destailleur	f68f5677bb	Start to use the vat code to identify a vat into combo list instead of ... just "rate" and "npr".	2016-04-18 21:02:14 +02:00
frederic34	60ebc6fa11	Some correction for testconnect	2016-04-18 00:47:08 +02:00
aspangaro	b59c94e056	NEW: Accountancy - Add Result page ... & review	2016-04-17 15:44:04 +02:00
Marcos García de La Fuente	e2c86d3fd8	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00
Frédéric FRANCE	d5980a5bf8	Update html.formmail.class.php	2016-04-17 12:20:45 +02:00
frederic34	75127638a4	Embed images	2016-04-17 10:28:21 +02:00
frederic34	8428b791f8	Add logger to dump smtp dialog	2016-04-16 22:25:47 +02:00
Marcos García de La Fuente	863efcbc5d	NEW Removed unused FormOrder::selectSourcesCommande function ... Also refactored select functions to avoid using HTML and encourage using Form::selectarray function	2016-04-16 21:33:23 +02:00
frederic34	567dc1734e	Add Swift Mailer to send mails	2016-04-16 18:15:03 +02:00
Christophe Battarel	c3d4cd85f1	NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier ... order even if no supplier price defined	2016-04-15 12:28:35 +02:00
Laurent Destailleur	8d46d76f96	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:05:18 +02:00
Laurent Destailleur	e61c83d708	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:03:19 +02:00
Laurent Destailleur	357877b1fe	Debug multicurrency and clean properties of some modules	2016-04-12 14:45:59 +02:00
Florian HENRY	8035742779	FIX fetchAllEMailTemplate	2016-04-11 14:52:22 +02:00
Marcos García de La Fuente	b2f922291f	FIX #4851 Project selector in supplier invoices shows the project label twice ... Close #4851	2016-04-09 22:38:58 +02:00
Laurent Destailleur	acf546d982	Move a not used function into a better place.	2016-04-09 19:42:34 +02:00
Scrutinizer Auto-Fixer	051ccf30a1	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-04-09 17:32:05 +00:00
Laurent Destailleur	83644dcb93	Fix errors reported by scrutinizer	2016-04-09 15:38:15 +02:00
Laurent Destailleur	475c11ca8f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-09 15:08:29 +02:00
Laurent Destailleur	724610ba5b	Quality fixes reported by scrutinizer	2016-04-09 15:07:55 +02:00
Scrutinizer Auto-Fixer	c2243909e9	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-04-09 13:07:33 +00:00
Laurent Destailleur	5b55af4d66	NEW Mutualize code: Use one call of function "addThumbs", when possible, ... to generate thumbs files instead of several call of "vignette" function.	2016-04-09 14:12:21 +02:00
Laurent Destailleur	cd13c942ed	FIX When editing a numeric that is not defined, we must not show 0 but ... an empty field.	2016-04-09 10:40:56 +02:00
Laurent Destailleur	448758bbf4	Merge branch 'develop_NEW_supplier_price_reputation' of ... https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_supplier_price_reputation Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-04-08 22:01:55 +02:00
Laurent Destailleur	92f1092f5c	Fix remove warnings	2016-04-08 19:46:56 +02:00
Laurent Destailleur	80caf58866	FIX Default vat is not set correctly when an error occured and we use ... VAT identified by a code.	2016-04-08 19:19:13 +02:00
Laurent Destailleur	cfcbc34972	FIX Default vat is not set correctly when an error occured and we use ... VAT identified by a code.	2016-04-08 19:16:40 +02:00
Laurent Destailleur	b1c2198154	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/ajax/selectsearchbox.php htdocs/core/lib/price.lib.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/modCommande.class.php htdocs/core/modules/modFacture.class.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-07 20:01:52 +02:00
Laurent Destailleur	d7f669b918	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-07 19:28:18 +02:00
Laurent Destailleur	39b61d6924	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/boxes/box_task.php htdocs/core/lib/files.lib.php	2016-04-07 19:27:53 +02:00
Laurent Destailleur	086345490d	Generalize the set of trackid for everyemail sent by dolibarr.	2016-04-07 14:29:07 +02:00
Florian HENRY	1f723cb8d0	FIX : Template email must take care of positino column	2016-04-07 14:16:10 +02:00
Laurent Destailleur	7f129d14d7	Better responsive design	2016-04-07 14:08:38 +02:00
Laurent Destailleur	1a1dc39a6b	Mark a duplicate function as deprecated	2016-04-06 14:53:14 +02:00
Alexis Algoud	a2c5bfa72c	FIX parse error	2016-04-06 10:20:38 +02:00
Alexis Algoud	11bb4d1cfb	Show in select	2016-04-06 10:17:13 +02:00
Juanjo Menent	b59b758016	Merge pull request #4943 from atm-gauthier/NEW_multientity_for_project ... NEW : project sharing in select_projetcs_list function	2016-04-05 17:48:23 +02:00
Laurent Destailleur	43165bab02	FIX Filter/search on extrafields on lists ... Conflicts: dev/skeletons/skeleton_list.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-04 16:22:26 +02:00
Florian HENRY	344a87f970	Merge branch 'develop' into develop_advtargetemailiing ... Conflicts: htdocs/admin/dict.php htdocs/core/class/html.formaccounting.class.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/install/mysql/tables/llx_c_accounting_category.sql	2016-04-04 14:43:17 +02:00
gauthier	e043aebfa1	NEW : project sharing in select_projetcs_list function	2016-04-04 11:05:12 +02:00
Laurent Destailleur	cea48a8dd6	FIX bad translation language loaded ... FIX When changing thirdparty on event card, the showempty option of contact was lost. FIX Bad placeholder shown on combo to select a thirdparty.	2016-04-03 20:02:02 +02:00
Juanjo Menent	8f2fb64efb	Merge pull request #4929 from aspangaro/4.0-p12 ... FIX: Problem with dolibarr installation/migration script. Range is a reserved name...	2016-04-03 16:20:31 +02:00
Florian HENRY	0ab40f11be	Merge branch 'develop' into develop_advtargetemailiing	2016-04-03 11:29:17 +02:00
Laurent Destailleur	10f639507f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/lib/files.lib.php	2016-04-02 15:54:51 +02:00
Laurent Destailleur	066c793de2	FIX image extension must be in lower case ... Conflicts: htdocs/core/lib/files.lib.php	2016-04-02 15:46:01 +02:00
Laurent Destailleur	281b06a2d3	NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and ... MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.	2016-04-01 18:44:23 +02:00
Florian HENRY	081c7824d2	FIX : range is MySQL reserved word, cannot be used as column names	2016-04-01 14:00:14 +02:00
aspangaro	84d326e036	FIX: Problem with dolibarr installation/migration script. Range is a reserved name.	2016-04-01 06:41:49 +02:00
Laurent Destailleur	54f3005666	NEW Can select fields to show on proposal lists.	2016-03-31 11:58:05 +02:00
Laurent Destailleur	2d9c53fc26	NEW Merge all boxes "related objects" into one. This save a lot of room ... on most card and avoid often horizontal scoll.	2016-03-30 19:18:31 +02:00
aspangaro	26e017f4ef	Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 ... Conflicts: htdocs/accountancy/admin/card.php	2016-03-30 06:05:38 +02:00
Laurent Destailleur	ff96ebf381	Enahnce navigation	2016-03-29 22:09:13 +02:00
aspangaro	c9271e04a0	Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 ... Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-03-29 19:54:41 +02:00
Laurent Destailleur	4d37c47990	NEW Can select language from combo list on page to overwrite a ... translation	2016-03-29 18:05:03 +02:00
Laurent Destailleur	6188c3fced	NEW Introduce a predefined job to run database backup	2016-03-29 14:52:27 +02:00
aspangaro	2be979569d	Debug II	2016-03-28 21:03:47 +02:00
aspangaro	cbecb37c59	debug	2016-03-28 15:32:57 +02:00
aspangaro	436fb91901	Uniformize name of table	2016-03-28 14:50:51 +02:00
aspangaro	432cc44ab6	NEW: Accountancy - Add category	2016-03-28 13:51:19 +02:00
Laurent Destailleur	40e0347bb5	More complete dependencies	2016-03-26 12:27:34 +01:00
Laurent Destailleur	0715353960	FIX A not enabled field for list must not into fields to add	2016-03-25 19:44:18 +01:00
Laurent Destailleur	d213002892	FIX A not enabled field for list must not into fields to add	2016-03-25 19:42:42 +01:00
Laurent Destailleur	7def29301a	Merge pull request #4893 from defrance/patch-113 ... FIX : add line of separation between left menu	2016-03-25 18:21:52 +01:00
Laurent Destailleur	423120db17	Merge pull request #4876 from atm-alexis/NEW_multientity_for_project ... # New # multientity for project	2016-03-25 18:01:45 +01:00
Laurent Destailleur	00bf8caa8c	FIX #4870	2016-03-25 17:55:58 +01:00
Laurent Destailleur	30aea901b8	Merge pull request #4855 from marcosgdf/account-oop ... NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country	2016-03-25 17:41:39 +01:00
BENKE Charlie	bf2d52894a	correct travis too	2016-03-25 16:48:45 +01:00
Laurent Destailleur	61bc8fc9ef	NEW Can edit value date of a vat payment after recording it. ... Conflicts: htdocs/compta/localtax/card.php htdocs/core/class/html.form.class.php	2016-03-25 16:01:45 +01:00
Juanjo Menent	aa9a39cab5	NEW #3510 : Standardize module	2016-03-25 15:59:44 +01:00
Laurent Destailleur	91caea5707	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
Laurent Destailleur	a2e9832c8d	Revert "Corrected non-static usages of Form::multiselectarray function" ... This reverts commit 0a53cdd88f.	2016-03-25 15:34:43 +01:00
Laurent Destailleur	630f5a632d	Revert "Corrected non-static usages of Form::selectarray function" ... This reverts commit 87cd6e1e40.	2016-03-25 15:34:37 +01:00
Laurent Destailleur	68e06a4634	Revert "NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions" ... This reverts commit 4d78932fe8.	2016-03-25 15:34:23 +01:00
Laurent Destailleur	4dc6acafe0	Revert "NEW Converted Form::selectyesno to a static function" ... This reverts commit 5a9e686bf9.	2016-03-25 15:34:06 +01:00
Laurent Destailleur	2220f7f6f2	Revert "NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm" ... This reverts commit a0926abd13.	2016-03-25 15:31:28 +01:00
Laurent Destailleur	e7a02d77a6	Revert commit	2016-03-25 15:31:17 +01:00
Laurent Destailleur	8ecfca5a9e	Revert change that break compatiblity with 100% of modules	2016-03-25 15:26:46 +01:00
Laurent Destailleur	26de415b77	Revert commit that break compatibility of 100% of modules	2016-03-25 15:24:57 +01:00
Laurent Destailleur	46613cd72b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-03-25 14:50:00 +01:00
Laurent Destailleur	4ec41bc33b	NEW Can edit value date of a vat payment after recording it.	2016-03-25 14:49:48 +01:00
Juanjo Menent	922c57da76	NEW #3510 : Standardize module	2016-03-23 22:45:04 +01:00
Alexis Algoud	c3bdc6372d	NEW allow project to be shared across entities	2016-03-22 16:48:51 +01:00
Marcos García de La Fuente	89bd173c2f	NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate	2016-03-21 21:51:29 +01:00
Bahfir Abbes	a1ed41646e	moved userid parameter to end of list in getNotificationArray function	2016-03-21 19:15:01 +01:00
Marcos García de La Fuente	5a046125db	Missing changes from previous commits	2016-03-20 14:24:49 +01:00
Marcos García de La Fuente	a0926abd13	NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm	2016-03-20 14:15:22 +01:00
Marcos García de La Fuente	5bdc3b9a1e	NEW Converted Form::selectyesno, Form::showrefnav, Form::select_date, Form::showbarcode, Form::showfilterAndCheckAddButtons, Form::editfieldkey, Form::editfieldnav, Form::editInPlace, Form::selectMassActions to static functions	2016-03-20 14:15:22 +01:00
Marcos García de La Fuente	5a9e686bf9	NEW Converted Form::selectyesno to a static function	2016-03-20 14:15:22 +01:00
Marcos García de La Fuente	ff6b187ef3	NEW Converted Form::showLinkedObjectBlock to a static function	2016-03-20 14:15:21 +01:00
Marcos García de La Fuente	4d78932fe8	NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions	2016-03-20 14:15:21 +01:00
Marcos García de La Fuente	0a53cdd88f	Corrected non-static usages of Form::multiselectarray function	2016-03-20 14:15:18 +01:00
Marcos García de La Fuente	87cd6e1e40	Corrected non-static usages of Form::selectarray function	2016-03-20 14:15:17 +01:00
Laurent Destailleur	8689240b7f	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-19 21:37:08 +01:00
Laurent Destailleur	af3256f84a	Fix first change to fix serious pb with vat definition when using the ... POS.	2016-03-19 21:35:03 +01:00
Marcos García de La Fuente	1be9c53b6c	NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country	2016-03-19 19:39:18 +01:00
Laurent Destailleur	2b1f57f01e	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: dev/initdata/savedemo.sh htdocs/filefunc.inc.php htdocs/user/card.php	2016-03-18 11:54:14 +01:00
Laurent Destailleur	44dc07a61b	Merge pull request #4807 from bafbes/abb-13 ... added handle to trigger FICHINTER_ADD_CONTACT in notify module	2016-03-18 02:40:27 +01:00
Laurent Destailleur	c20124e369	Merge pull request #4829 from jtisseau/starttls ... NEW Sending email can also use the STARTTLS protocol.	2016-03-18 00:48:13 +01:00
Laurent Destailleur	7692c39879	Merge pull request #4614 from bafbes/abb-3 ... include expense reports in linked objects section and provide template for them in this section	2016-03-18 00:26:24 +01:00
philippe grand	d434cee3fa	[Qual] Typo	2016-03-17 09:40:05 +01:00
jtisseau	d7b0e41271	Added the STARTTLS connection mode ... Adds the STARTTLS connection mode in function _server_authenticate. It's use by Microsoft Hotmail and Exchange servers. I use the MAIN_MAIL_EMAIL_STARTTLS const introduced in admins/mails.php retrieved from the $conf object which is not used anywhere else in the file so it may not be the right way to do it. Maybe this value should be passed in constructor but it would then imply more changes around multiple files calling smtps class.	2016-03-16 01:54:45 +01:00
abb	b6e39960b4	new:handle user notification in notification module ... Conflicts: htdocs/core/lib/usergroups.lib.php	2016-03-13 20:08:27 +01:00
abb	d35f728fad	added handle to trigger FICHINTER_ADD_CONTACT in notify module	2016-03-13 19:58:39 +01:00
Laurent Destailleur	a12d81cbda	Fix PHPCS	2016-03-10 12:36:25 +01:00
Laurent Destailleur	d8045e33bb	FIX Option FCKEDITOR_ENABLE_MAIL was no used into dictionnary page to ... edit email templates	2016-03-05 12:37:09 +01:00
Laurent Destailleur	446a080c75	NEW Mutualize code to manage email substitution variables. Show ... available variables into page to edit email templates.	2016-03-05 12:20:58 +01:00
Laurent Destailleur	109eefaf03	Merge pull request #4723 from IonAgorria/default-date-selector ... New: Default values in date selector	2016-03-04 16:31:42 +01:00
Laurent Destailleur	cbd102fa45	Merge and rename method into camel format	2016-03-04 16:28:38 +01:00
Laurent Destailleur	6e8b176d8d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-03-04 16:24:03 +01:00
Laurent Destailleur	87093c79f9	Merge pull request #4708 from marcosgdf/account-constants ... Started using Account TYPE and STATUS constants	2016-03-04 16:23:50 +01:00