4970 Commits

Author	SHA1	Message	Date
Laurent Destailleur	fda84995e8	If manage zero is set, we must NOT set length. So we can here make a ... shortcut to avoid useless code.	2017-03-10 11:50:57 +01:00
Laurent Destailleur	c962daabac	NEW add property to show warnings when activating modules	2017-03-09 15:16:16 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
arnaud	abeba95de9	New USER odt	2017-03-02 15:13:42 +01:00
Laurent Destailleur	0f22beb774	Upgrade to ckeditor 4.6.2.	2017-02-28 10:49:58 +01:00
Laurent Destailleur	74e8fb9c19	NEW Can set number of dump to keep with job "local database backup"	2017-02-27 02:04:25 +01:00
BENKE Charlie	a2611e31fe	add selectform choice for private mailing ... better usability than enter 0 ou 1 value	2017-02-24 11:12:14 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Laurent Destailleur	86c399db70	Clean admin menu entries	2017-02-22 02:32:35 +01:00
Laurent Destailleur	d5bb208957	Clean admin menu entries	2017-02-22 02:19:50 +01:00
Laurent Destailleur	eef3824f8c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang	2017-02-21 10:34:52 +01:00
Laurent Destailleur	89d10ae5aa	Fix the accounting account groups must be editable by book keeper, not ... admin user.	2017-02-20 11:21:38 +01:00
arnaud	4ec664029d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment	2017-02-17 16:40:14 +01:00
Laurent Destailleur	8d03f86f45	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 13:10:46 +01:00
Laurent Destailleur	bde6815e5d	Merge pull request #6425 from GPCsolutions/5.0-multicurrency-error ... Fix: [Multicurrency] properly display API error	2017-02-17 10:45:45 +01:00
Laurent Destailleur	c3d78bf1b4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/tools/update.php	2017-02-16 22:09:37 +01:00
Laurent Destailleur	a1ba4aa941	NEW: No external check of version without explicit click in about page.	2017-02-16 02:27:07 +01:00
Laurent Destailleur	ea4a83838c	Missing not visible paramater	2017-02-15 18:30:27 +01:00
Raphaël Doursenaud	d9f32f7ae1	Fix: [Multicurrency] properly display API error	2017-02-15 13:20:38 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +01:00
Laurent Destailleur	bcd624e5a5	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-13 01:37:53 +01:00
Laurent Destailleur	25e8caa64e	Fix reversing test for a test	2017-02-13 01:37:12 +01:00
Laurent Destailleur	868f2e5473	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/tools/update.php htdocs/core/lib/functions.lib.php	2017-02-13 01:36:02 +01:00
Laurent Destailleur	ae740b7c1b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/langs/en_US/errors.lang	2017-02-13 01:19:30 +01:00
Laurent Destailleur	bf32acaadd	Fix control of module format.	2017-02-13 01:13:41 +01:00
Laurent Destailleur	cda301f6b7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-12 20:51:52 +01:00
Laurent Destailleur	d4fd9bd71e	Merge pull request #6414 from laudeco/fix/dictionnary_without_rowid ... [FIX] Dictionaries without rowid	2017-02-12 20:46:43 +01:00
Laurent Destailleur	a8c5ba2983	Fix php7 error	2017-02-12 20:40:20 +01:00
Laurent Destailleur	5233b8c87f	Fix support for option MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES	2017-02-12 18:38:24 +01:00
Laurent Destailleur	05c9f57fd4	Move edition of emails templates out of dictionaries so we would be able ... to have templates per user (not reserved to admin).	2017-02-12 18:13:49 +01:00
Laurent Destailleur	f34e0b1bdb	NEW Can deploy an external module from the module setup area.	2017-02-11 15:41:01 +01:00
Laurent Destailleur	4723eac227	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-11 13:56:39 +01:00
Laurent Destailleur	f6a8aacc8d	Fix: deployement of a module	2017-02-10 18:42:59 +01:00
arnaud	4230b075c2	INIT pdf supplier payment	2017-02-10 17:28:00 +01:00
Laurent Destailleur	44ab6ad9b7	NEW Can control constants values into file integrity checker	2017-02-10 17:05:45 +01:00
De Coninck Laurent	4fb4bc6f6c	[FIX] Dictionnaries without rowid ... It's possible to create a dictionnary without the key rowid. But in that case it's impossible to enable/disable the value because the dictionnary fonctionality uses always rowid even another primary key is defined. By this fix, the id property uses is the primary key defined on the dictionnary creation.	2017-02-10 10:29:08 +01:00
Laurent Destailleur	488d68113d	Add total in the file integrity checker	2017-02-09 12:56:39 +01:00
Laurent Destailleur	fbe0b13706	Add parameter to set the url to use for the file integrity checker	2017-02-09 01:07:54 +01:00
Laurent Destailleur	b250485efd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-08 11:00:19 +01:00
Laurent Destailleur	31c3398b7f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/modules.php	2017-02-08 10:59:05 +01:00
Laurent Destailleur	dc0856413c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-08 10:57:02 +01:00
florian HENRY	7fcf598c78	Fix travis	2017-02-08 08:52:58 +01:00
Laurent Destailleur	d56b5f30c8	FIX #6330	2017-02-07 01:34:21 +01:00
Laurent Destailleur	e58743ea5b	Fix regression: Textarea to enter data was crushed.	2017-02-07 01:13:04 +01:00
Laurent Destailleur	74992ee53f	Merge pull request #6375 from marcosgdf/admin-view ... Little improvements to admin pages where a FREE_TEXT or a watermark constant was set	2017-02-06 20:11:22 +01:00
Laurent Destailleur	9220a638b5	NEW Filechecker can include custom dir and report added files.	2017-02-06 15:29:07 +01:00
Laurent Destailleur	fea2b081f9	Fix: The long description feature will be available with 6.0. Large ... content creates problem with tooltip.	2017-02-04 14:17:55 +01:00
Laurent Destailleur	a673afe601	NEW Description of feature of a module into a dedicated popup	2017-02-04 14:16:17 +01:00
Marcos García de La Fuente	a94a951a89	Little improvements to admin pages where a FREE_TEXT or a watermark constant was set	2017-02-03 19:38:33 +01:00
Laurent Destailleur	c48400331f	Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date ... NEW get multicurrency rate from document date (propal, order)	2017-01-27 01:32:52 +01:00
Laurent Destailleur	29df2c9115	Merge branch 'develop' into mail-lines	2017-01-27 01:29:58 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	809e3ce4d5	Debug browser notification	2017-01-20 20:10:16 +01:00
Juanjo Menent	2374aa351e	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-20 15:55:51 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
Laurent Destailleur	bb95f139a8	Fix responsive	2017-01-17 20:04:41 +01:00
BENKE Charlie	e701ea0b2f	Add dictionnary mail for contract	2017-01-16 14:06:34 +01:00
Laurent Destailleur	f5458b4337	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/admin/modules.php htdocs/core/class/html.formfile.class.php htdocs/product/stats/card.php	2017-01-16 00:48:37 +01:00
Laurent Destailleur	d14e4dbaba	Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on	2017-01-15 20:49:20 +01:00
Regis Houssin	f9ed1592e1	Fix: search problem if name contains accents	2017-01-15 16:07:04 +01:00
Juanjo Menent	3a40d5a4f1	NEW: Events notifications in browser	2017-01-13 16:13:01 +01:00
Juanjo Menent	6cc3ef0c99	NEW: Events notifications in browser	2017-01-13 16:08:49 +01:00
Alexis Algoud	8b4a43ec77	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-09 10:31:05 +01:00
Laurent Destailleur	b21998d506	Fix global checksum not visible on old versions. Link with checksum file ... to check was hardcoded.	2017-01-07 15:56:04 +01:00
Laurent Destailleur	358616cda2	Fix link should be https	2017-01-07 15:18:57 +01:00
Laurent Destailleur	680c48d90a	Fix error on expired tokens	2017-01-07 14:48:05 +01:00
Laurent Destailleur	9cfc8d4095	Fix several problems into OAuth2 module.	2017-01-06 19:58:46 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Alexis Algoud	370be70e46	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-03 16:30:50 +01:00
Ion Agorria	522fb4cf7a	Add email template for each line in object	2016-12-31 17:39:01 +01:00
Rabouin Geoffroy	a277a6f190	Typo in SQL request	2016-12-28 10:26:31 +01:00
Laurent Destailleur	c5850d29e7	Fix checksum integrity. Also add a global checksum.	2016-12-26 19:51:24 +01:00
Laurent Destailleur	83a8fcb7f9	Fix filecheck tool.	2016-12-26 19:01:24 +01:00
Laurent Destailleur	374a6d7783	Fix filecheck tool.	2016-12-26 18:50:20 +01:00
Laurent Destailleur	c16489a3c0	Fix add message to explain why some emails fails	2016-12-25 23:14:51 +01:00
Laurent Destailleur	7e2b41402e	Fix bad balance of form	2016-12-23 16:24:07 +01:00
Laurent Destailleur	77c320a092	Fix warning for expense report late	2016-12-22 15:33:43 +01:00
Laurent Destailleur	3c79f3acb5	Minor fixes or code comment	2016-12-20 12:06:26 +01:00
Laurent Destailleur	4d624fd875	Debug feature to choose email "from"	2016-12-20 11:23:44 +01:00
Laurent Destailleur	b3d5f40f37	Merge pull request #6166 from atm-gauthier/3.9_fix_wrong_test ... FIX : wrong test on dict.php	2016-12-18 10:58:32 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
Laurent Destailleur	c750ba8b99	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/install/mysql/data/llx_c_payment_term.sql htdocs/langs/en_US/bills.lang htdocs/langs/en_US/mails.lang	2016-12-16 13:56:55 +01:00
Laurent Destailleur	929904041d	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/conf/conf.php.example htdocs/langs/en_US/mails.lang	2016-12-16 13:53:34 +01:00
Laurent Destailleur	534e2b1282	FIX Security to restrict email sending was not efficient	2016-12-16 13:46:39 +01:00
Alexis Algoud	b7a6a71dff	move file to core	2016-12-15 17:20:46 +01:00
gauthier	4dd740fe2f	FIX : wrong test on dict.php	2016-12-13 11:41:26 +01:00
Laurent Destailleur	5187ffcc9a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-12 13:03:37 +01:00
Laurent Destailleur	4e86e59fb3	Fix responsive	2016-12-12 13:02:54 +01:00
Laurent Destailleur	7077b4931c	Add dump v5	2016-12-12 11:57:50 +01:00
tarrsalah	eb6620f6f6	fix (#6158)default localtax1 and localtax2 values.	2016-12-11 17:56:49 +01:00
phf	f5bffeb535	New get multicurrency rate from document date (propal, order)	2016-12-11 16:30:01 +01:00
Maxime Kohlhaas	194639c30e	Missing lang in admin	2016-12-10 22:41:57 +01:00
Maxime Kohlhaas	3ab23ecb7e	Better currency rate setup	2016-12-10 22:40:25 +01:00
BENKE Charlie	b74071dc73	Better display on internal/external module info	2016-12-10 19:35:58 +01:00
Laurent Destailleur	211436b436	Better responsive	2016-12-04 01:14:09 +01:00
Laurent Destailleur	8c428ac5b7	Fix responsive design	2016-12-04 00:51:15 +01:00
Laurent Destailleur	81a3235cf6	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/list.php htdocs/fourn/facture/card.php htdocs/fourn/facture/list.php	2016-12-03 16:01:18 +01:00
Laurent Destailleur	711961ed18	Fix missing translation	2016-11-29 17:24:40 +01:00
Laurent Destailleur	c33e486828	Fix order of option and picto	2016-11-29 10:42:10 +01:00
Laurent Destailleur	2e5634e60f	Fix responsive design	2016-11-27 14:21:23 +01:00
Laurent Destailleur	60c494fd5f	Missing dolibarr version in dump file	2016-11-26 17:48:06 +01:00
aspangaro	638563dc5d	Fix missing language key in holiday type dictionary	2016-11-22 05:54:44 +01:00
aspangaro	6e66d529f0	Fix missing language key for lead status dictionary	2016-11-22 05:33:33 +01:00
aspangaro	38a31cbd28	Fix missing key language in dictionary email models	2016-11-22 05:25:08 +01:00
aspangaro	213e7d1cd7	Fix Missing language key for dictionary format card	2016-11-21 21:49:08 +01:00
aspangaro	31dd20ec7c	Spaces	2016-11-20 22:59:13 +01:00
Laurent Destailleur	ad981a0f07	FIX the key for getEntity was different for same element.	2016-11-18 12:54:08 +01:00
Laurent Destailleur	bfd1ce0095	Fix translation	2016-11-14 15:25:45 +01:00
Laurent Destailleur	b44c746c2e	Fix table disabled	2016-11-13 18:31:22 +01:00
Laurent Destailleur	6d70d39bbd	NEW Add type "url" as possible extrafield.	2016-11-08 17:21:26 +01:00
Laurent Destailleur	7a94cfc994	NEW Better filtering of automatic/manually inserted events.	2016-11-08 13:03:20 +01:00
Laurent Destailleur	341e014a3d	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/don/document.php	2016-11-08 11:36:31 +01:00
Laurent Destailleur	bcd3a1a888	NEW Default collation for mysql is now utf8_unicode_ci	2016-11-07 01:53:34 +01:00
Laurent Destailleur	961f7a4e48	Fix label on tab	2016-11-07 00:32:28 +01:00
Laurent Destailleur	4681c84e1d	Better responsive	2016-11-06 12:16:10 +01:00
Laurent Destailleur	a658b7cc3d	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/comm/card.php	2016-10-31 21:31:57 +01:00
Laurent Destailleur	ffe4ae5915	Fix php7 compatibility	2016-10-31 21:24:23 +01:00
Laurent Destailleur	32b6660f63	Uniformize code	2016-10-29 16:18:39 +02:00
Laurent Destailleur	38e6c9cc57	Fix multientity on overwritting translation not yet supported.	2016-10-28 22:47:37 +02:00
Laurent Destailleur	0847dba26d	Keep option hidden	2016-10-26 12:43:05 +02:00
Laurent Destailleur	d27ffd4194	Merge pull request #5393 from frederic34/patch-10 ... NEW Add admin parameter BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDE for supplier order	2016-10-26 11:48:02 +02:00
Laurent Destailleur	f1421a2ee4	Rename constant with english name	2016-10-24 13:10:35 +02:00
Laurent Destailleur	fdcc858008	Merge branch 'dev_resource_extrafields' of ... https://github.com/atm-florian/dolibarr into atm-florian-dev_resource_extrafields Conflicts: htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-10-24 02:05:34 +02:00
Laurent Destailleur	c8c5ce3760	Merge pull request #5890 from mrsof/patch-4 ... Fix : Custom menu handler is not accessible for editing	2016-10-24 01:09:27 +02:00
Laurent Destailleur	f0365e49e2	Fix book keeper can edit accounting account of taxes	2016-10-21 18:05:26 +02:00
Laurent Destailleur	9eafff4a97	Debug module accounting	2016-10-21 17:41:05 +02:00
Laurent Destailleur	16a3ba148a	Fix edit of vat	2016-10-21 14:47:29 +02:00
florian HENRY	5bf03de3fb	Fix setup page	2016-10-19 22:24:04 +02:00
florian HENRY	54a154fa4f	NEW : Add ressource extrafields	2016-10-19 22:14:51 +02:00
Sof	a30d4a0a38	Fix : Custom menu handler is not accessible for editing	2016-10-18 16:58:50 +02:00
Laurent Destailleur	c1bf7c52f4	Add a line of filter in list of events related to thirdparty or projects	2016-10-18 00:02:18 +02:00
Laurent Destailleur	c689248211	The setup that must be done by the bookkeeper is removed from admin ... setup and move into setup of accountancy	2016-10-15 14:38:43 +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	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
Laurent Destailleur	89d08eadce	Better explanation of option	2016-10-09 20:35:24 +02:00
Laurent Destailleur	74f2a4d597	Enable feature to check online signature	2016-10-09 20:20:24 +02:00
Laurent Destailleur	ba52eb870c	Enhancement of Oauth module	2016-10-07 18:43:44 +02:00
Laurent Destailleur	77e87b3c07	NEW Add tooltip in payment term edition in dictionnary	2016-10-07 00:37:06 +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	fc65d5fb79	NEW Start to introduce search filters on dictionnaries for vat list	2016-10-03 13:42:27 +02:00
Laurent Destailleur	6ac39b97e4	Fix restore list of attached files into action report	2016-10-03 00:38:28 +02:00
Laurent Destailleur	a52ad545eb	Enhancement on module Direct Debit SEPA.	2016-10-02 13:03:45 +02:00
Laurent Destailleur	2579cb35dd	Minor fix	2016-10-02 11:03:36 +02:00
Laurent Destailleur	e3aa84ff5a	NEW Add last activation date as info in module list.	2016-10-02 10:41:22 +02:00
Laurent Destailleur	2668cb20cc	Work on SEPA mandate	2016-10-01 20:45:50 +02:00
Laurent Destailleur	c9792ff047	Fix translation	2016-10-01 20:12:00 +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	ea0687f613	FIX Vat not visible in dictionnary	2016-10-01 18:22:39 +02:00
Laurent Destailleur	ed56ea4ac0	Style on title	2016-09-30 18:31:04 +02:00
Laurent Destailleur	20ad359c9b	FIX Warning to grant permission must be visible only if one module add ... some permissions	2016-09-30 18:26:32 +02:00
Laurent Destailleur	287f9972a8	Merge branch 'new_no_default_rights' of ... https://github.com/atm-maxime/dolibarr into atm-maxime-new_no_default_rights Conflicts: htdocs/langs/en_US/admin.lang	2016-09-30 13:04:14 +02:00
Laurent Destailleur	94dbe3da3f	Fix the info if module are provided by module or not was wrong	2016-09-30 13:02:13 +02:00
Laurent Destailleur	504ee9c73e	NEW Add system tool "Files integrity checker" to detect modified files ... for packaged versions.	2016-09-30 12:01:06 +02:00
Laurent Destailleur	4b4931f5ea	Add separator in list of dictionaries	2016-09-28 20:01:56 +02:00
Laurent Destailleur	86d86f8442	NEW #5801 More complete change to allow to disable supplier invoice ... document generation	2016-09-28 18:59:44 +02:00
Laurent Destailleur	586b223221	Work on remote integrity checker	2016-09-26 15:24:43 +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	17f3e09689	Fix link https	2016-09-26 01:04:48 +02:00
gauthier	a0ec91cb94	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse	2016-09-20 12:03:55 +02:00
gauthier	7a0577ccfc	NEW : add limit stock product by warehouse	2016-09-16 17:09:38 +02:00
BENKE Charlie	3d8f756646	prevent space separator in module definition ... If we type in definition of dictionnary "code,libelle, color" we can't insert/update value... propose to allow typing space bettween field (better lisibility) and remove space after	2016-09-15 10:51:48 +02:00
Juanjo Menent	6e39d83480	Merge remote-tracking branch 'upstream/3.9' into develop ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-09-09 16:51:41 +02:00
Juanjo Menent	d8f50f9acd	Merge remote-tracking branch 'upstream/3.9' into 4.0 ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-09-09 16:34:02 +02:00
Laurent Destailleur	0debcf745a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/cron/card.php htdocs/cron/list.php htdocs/filefunc.inc.php	2016-09-09 09:32:14 +02:00
Juanjo Menent	e3c2299c67	Merge remote-tracking branch 'upstream/3.8' into 3.9 ... Conflicts: htdocs/admin/dict.php htdocs/fourn/class/fournisseur.commande.class.php	2016-09-08 18:52:44 +02:00
Laurent Destailleur	2b7ef01e42	FIX SEC for HTB23302	2016-09-08 11:09:38 +02:00
florian HENRY	d6be1cebcb	work on going	2016-09-07 12:41:32 +02:00
Juanjo Menent	3078e6fa4b	FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15)	2016-09-06 13:44:07 +02:00
Laurent Destailleur	898bbd6031	NEW Support extrafields for expense reports	2016-09-06 13:00:32 +02:00
Laurent Destailleur	8419202588	NEW Support free bottom text and watermark on expense report template	2016-09-06 12:47:18 +02:00
Laurent Destailleur	84ec5757a1	Uniformize look and feel	2016-09-04 15:06:34 +02:00
Laurent Destailleur	6da7410c18	Show warning for overwritten translation	2016-09-04 14:58:58 +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	cd1a12c686	NEW Can edit a label for each price segment when using several segment ... prices for products.	2016-08-29 16:30:31 +02:00
Laurent Destailleur	330e494eda	NEW Can filter on fields on admin translation page	2016-08-28 22:46:09 +02:00
Laurent Destailleur	4215ec3ca9	FIX usage of sepa generation setup.	2016-08-28 20:12:25 +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
Laurent Destailleur	0d992b2b99	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/cron/class/cronjob.class.php htdocs/install/pgsql/functions/functions.sql	2016-08-28 02:17:04 +02:00
philippe grand	919b73b4c4	fix : translation	2016-08-19 16:29:54 +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	6c5849fc87	Fix field too small	2016-08-09 15:56:39 +02:00
Laurent Destailleur	034b08ce56	NEW Add option "Hide images in Top menu".	2016-08-05 23:40:00 +02:00
florian HENRY	0780188f4e	taking account @eldy remarks	2016-08-05 09:46:17 +02:00
florian HENRY	a39290022f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_NEW_ClassOrderDeliverStatusOnStockVentil Conflicts: htdocs/langs/en_US/workflow.lang	2016-08-05 09:34:27 +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	c73f962b28	Merge pull request #5585 from atm-florian/dev_NEW_workflow_ClassPropalBillOnBillValidation ... NEW : Add workflow to classifed propal bill on invoice validation	2016-08-05 00:46:12 +02:00
Laurent Destailleur	5126786d60	NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED	2016-08-04 15:48:34 +02:00
florian HENRY	4001bc474e	NEW : Add workflow to calculated supplier order status on stock dispatch	2016-08-04 11:37:32 +02:00
Laurent Destailleur	af150c35fc	Fix no picto on setup pages	2016-08-04 10:19:30 +02:00
florian HENRY	f0622139ff	NEW : Add workflow to classifed propal bill on invoice validation	2016-08-04 09:55:16 +02:00
Laurent Destailleur	88dcb27981	Fix option not visible when it should	2016-08-02 21:24:14 +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	1e037a9b95	Fix pb of responsive design	2016-07-31 18:28:59 +02:00
Laurent Destailleur	5b4c215526	Fix size of field too small and bad translation	2016-07-30 10:31:56 +02:00
Laurent Destailleur	a7b21db210	Fix code is not mandatory on vat table	2016-07-29 17:22:02 +02:00
Laurent Destailleur	f54946bacb	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql	2016-07-28 10:10:58 +02:00
Laurent Destailleur	0334b58a4b	Hide feature not yet validated to be ready for a stable 4.0	2016-07-27 20:24:30 +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
Laurent Destailleur	3b1d6818b8	Update ldap translation	2016-07-27 17:26:04 +02:00
Laurent Destailleur	eddac89bad	FIX Fatal error if curl not installed	2016-07-27 16:45:13 +02:00
Laurent Destailleur	a1c959e9d6	Merge pull request #5536 from defrance/patch-17 ... NEW add edition feature on action/agenda element	2016-07-26 15:29:45 +02:00
Juanjo Menent	0459c6f682	Merge pull request #5545 from GPCsolutions/develop-orderinterfix ... Fix: Fixed interventions from order.	2016-07-26 12:01:09 +02:00
Laurent Destailleur	3265b7028d	Merge remote-tracking branch 'origin/4.0' into develop	2016-07-25 19:53:28 +02:00
Raphaël Doursenaud	052a11a5c0	Fixed interventions from order. ... Handling of predefined services was buggy and resulted in an SQL error because of uninitialized duration. Generalized services duration handling and exposed it in the module's admin page.	2016-07-25 17:24:57 +02:00
BENKE Charlie	6acff5dcb5	Update agenda_other.php	2016-07-25 11:31:10 +02:00
BENKE Charlie	cba9bae124	Update agenda_other.php	2016-07-25 11:30:05 +02:00
Laurent Destailleur	59e9d7f397	Fix the repositioning works better with new system class="reposition" ... compared to old system (#tag)	2016-07-23 13:41:06 +02:00
Laurent Destailleur	343561be7a	Fix colspan	2016-07-23 13:37:17 +02:00
Laurent Destailleur	867a0072e3	Fix forcing on module setup was not working	2016-07-23 13:20:34 +02:00
Laurent Destailleur	a290757d2d	Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany ... NEW Option to allow payment on bills of different companies (with same parent company)	2016-07-20 19:34:51 +02:00
Laurent Destailleur	e2a03d18dd	Merge remote-tracking branch 'origin/4.0' into develop	2016-07-16 19:58:36 +02:00
Laurent Destailleur	4b854fb33d	Fix better error message when possible refering objects list is empty.	2016-07-16 14:37:35 +02:00
Laurent Destailleur	28d86bc5a0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-07-15 19:57:46 +02:00
Laurent Destailleur	97b03e225b	NEW Add option "Stock can be negative". Off by default.	2016-07-15 19:57:35 +02:00
Juanjo Menent	d932bb9532	Merge pull request #5488 from simnandez/develop ... NEW Do not use Functions Aliases	2016-07-15 18:44:22 +02:00
Laurent Destailleur	7263b29cb4	Merge pull request #5301 from atm-ph/fix_develop_issue_2858 ... NEW issue 2858 - Option to allow negative transfer	2016-07-15 18:15:20 +02:00
Juanjo Menent	62c1302a27	NEW Do not use Functions Aliases	2016-07-15 17:58:14 +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
appchecker	4b1dfbc2fb	replace intval with GETPOST	2016-07-11 12:56:05 +03:00
appchecker	9895084627	prevent SQLi	2016-07-07 20:23:38 +03:00
Laurent Destailleur	23cac5b157	FIX link to check prof id was hardcoded instead of using dedicated ... function	2016-07-04 10:28:11 +02:00
Laurent Destailleur	91d2d573c3	Fix NNE has been replaced with ICS	2016-07-02 11:26:55 +02:00
phf	8c133d8546	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858 ... Conflicts: htdocs/core/class/ldap.class.php	2016-06-30 17:09:22 +02:00
Laurent Destailleur	5f5328c3d8	FIX Link in menu when using left menu editor was wrong. ... FIX Updating an entry with menu editor did not save fk_leftmenu.	2016-06-29 14:09:18 +02:00
Laurent Destailleur	ab444af8c2	Fix bad css	2016-06-29 13:38:19 +02:00
Laurent Destailleur	266fef40ad	Add a way to enhance security check.	2016-06-25 15:16:32 +02:00
Laurent Destailleur	5222b78e95	FIX property of bank account were lost if an error occured during ... saving.	2016-06-25 14:20:23 +02:00
Frédéric FRANCE	e7b49a4fca	Update supplier_order.php	2016-06-23 18:20:03 +02:00
philippe grand	cc4fe87e13	internationalization of code comment	2016-06-21 17:00:52 +02:00
philippe grand	0cc990402e	internationalization of code comment	2016-06-19 17:39:40 +02:00
Laurent Destailleur	8187dc2006	Fix css	2016-06-19 16:07:34 +02:00
Laurent Destailleur	de76f2a9aa	Clean language files	2016-06-18 15:50:37 +02:00
gauthier	427695d869	FIX : New conf must be in payments tab	2016-06-17 17:26:49 +02:00
Laurent Destailleur	e4923fa18a	Merge pull request #5346 from damirugrin/develop ... Conflict with ModSecurity solved in facture.php.	2016-06-16 20:21:24 +02:00
Laurent Destailleur	3720c95a52	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2016-06-16 09:50:45 +02:00
Laurent Destailleur	2395099d0f	Debug Oauth	2016-06-15 17:20:00 +02:00
gauthier	a0051a856a	NEW : conf to allow payments on different thirdparties bills but same parent company	2016-06-15 17:10:42 +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
damirugrin	ec6dd0c42f	Update facture.php	2016-06-13 18:48:10 +02:00
damirugrin	c5dcebb58e	Conflict with ModSecurity solved. ... When ModSecurity is enabled on apache server then "scandir" is forbidden word. When changing numbering model then you will find following error in apache log: ModSecurity: Access denied with code 403 (phase 2). Pattern match "(?i)(?:\\\\b(?:f(?:tp_(?:nb_)?f?(?:ge|pu)t|get(?:s?s|c)|s(?:ession_start|candir) I have changed "scandir" to "scan_dir".	2016-06-13 18:13:41 +02:00
Laurent Destailleur	9019576394	Fix css class opacitymedium was not used everywhere.	2016-06-07 15:58:02 +02:00
phf	c62a69ccc8	Merge branch 'fix_3.7_issue_2858' into develop	2016-06-04 18:54:55 +02:00
phf	3cbbdf5e20	Fix #2858	2016-06-04 18:23:22 +02:00
Maxime Kohlhaas	d777fca0b9	Warning messages after module activation and for user with no permission	2016-06-04 13:25:39 +02:00
Juanjo Menent	baa6dd84cf	Fix better perfomance in for	2016-06-04 13:12:05 +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
phf	b000ccf2e2	Fix traduction for multicurrency module	2016-06-04 01:46:10 +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	e3a5af6ad4	Fix clean multicurrency admin	2016-06-04 00:42:01 +02:00
phf	923952fb25	Fix conf useful has been commented	2016-06-03 23:36:58 +02:00
Frédéric FRANCE	19f6aa805b	select engine for code 128 didn't work	2016-06-02 11:41:26 +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	bf5fbd3a80	FIX Infinite loop on menu tree output for edition ... FIX Can show tree of entries added by external modules using fk_mainmenu and fk_leftmenu instead of fk_menu.	2016-06-01 21:14:28 +02:00
Laurent Destailleur	0b6bda910b	Removed scrutinizer warning	2016-05-29 11:23:32 +02:00
Laurent Destailleur	c653acd4ce	Minor fixes	2016-05-27 14:56:59 +02:00
Laurent Destailleur	a587ba496c	NEW Can select fields on supplier orders	2016-05-24 18:43:35 +02:00
Laurent Destailleur	3df464270c	Remove useless code	2016-05-22 16:12:42 +02:00
Laurent Destailleur	b86b464931	Merge pull request #5233 from IonAgorria/email-template-hook ... NEW Hook for adding new email templates on list	2016-05-22 14:25:06 +02:00
Laurent Destailleur	5fd64c81a6	Missing translation	2016-05-21 12:21:17 +02:00
Ion Agorria	651b1e1d3a	Hook for adding new email templates on list	2016-05-21 03:32:36 +02:00
Laurent Destailleur	92e7177bcb	Fix New into new	2016-05-17 19:58:29 +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	7c3c8f70be	Fix not initialized variables	2016-05-08 12:32:18 +02: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	a41403c594	Merge pull request #5144 from frederic34/patch-7 ... select engine for code 128 didn't work	2016-05-05 22:32:20 +02:00
Laurent Destailleur	7e34581952	Merge pull request #5139 from aspangaro/4.0-p25 ... FIX: Accountancy - Chart of accounts are limited on only one country	2016-05-05 22:27:05 +02:00
Laurent Destailleur	d50e9cde34	Merge pull request #5090 from atm-maxime/fix_pdffoot_details ... PDF foot details	2016-05-05 21:09:46 +02:00
Laurent Destailleur	5040fe46b0	FIX Missing number total of modules	2016-05-05 11:15:53 +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
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
Frédéric FRANCE	ffd80e3f8f	select engine for code 128 didn't work	2016-04-30 18:56:16 +02:00
Laurent Destailleur	97bf91cc5d	Show both currency symbol and code	2016-04-30 14:09:00 +02:00
aspangaro	7041a041ce	FIX: Accountancy - Chart of accounts are limited on only one country	2016-04-30 06:52:21 +02:00
Laurent Destailleur	19162fc8d5	Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into ... PeartreeG-patch-1 Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/resource/element_resource.php	2016-04-29 18:31:11 +02:00
Laurent Destailleur	466404d968	Fix missing dol_fiche_xxx	2016-04-29 17:58:39 +02:00
Laurent Destailleur	26b4a5a1e0	Merge pull request #4267 from bafbes/patch-12 ... allow cherry-pick of a sub-menu by changing its parent identifier	2016-04-29 17:55:29 +02:00
Juanjo Menent	206dee7106	Merge pull request #5086 from aspangaro/4.0-p23 ... NEW: Loan - Add list to select accounting account in admin	2016-04-29 12:01:44 +02:00
Juanjo Menent	d6b1cd8a1c	Merge pull request #5083 from aspangaro/4.0-p22 ... FIX: Accountancy - Work on categories for report - Add french example & other	2016-04-29 11:59:41 +02:00
Florian HENRY	bfbb1c20bc	FIX bug on email template	2016-04-27 09:27:59 +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
Laurent Destailleur	bcb4b2b607	Work on website module	2016-04-23 21:34:10 +02:00
Maxime Kohlhaas	2c6f58e689	Add choices in PDF admin page	2016-04-23 17:37:12 +02:00
aspangaro	c652d5b02d	NEW: Loan - Add list to select accounting account in admin	2016-04-23 16:06:33 +02:00
aspangaro	04fd5a20ef	FIX: Accountancy Work on categories for Report - Add french example	2016-04-23 15:43:28 +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	d40e659b30	Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring ... NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown	2016-04-19 19:11:54 +02:00
Laurent Destailleur	4619040983	Work on website module	2016-04-19 18:41:05 +02:00
frederic34	1a552cbd16	typo	2016-04-19 18:27:56 +02:00
frederic34	60ebc6fa11	Some correction for testconnect	2016-04-18 00:47:08 +02:00
frederic34	75127638a4	Embed images	2016-04-17 10:28:21 +02:00
frederic34	567dc1734e	Add Swift Mailer to send mails	2016-04-16 18:15:03 +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	fedcad31e0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/admin/multicurrency.php	2016-04-12 14:47:16 +02:00
Laurent Destailleur	357877b1fe	Debug multicurrency and clean properties of some modules	2016-04-12 14:45:59 +02:00
Laurent Destailleur	7ce82aaf16	Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be ... implemented with pure CSS/Jquery so no more need of not maintained external library.	2016-04-12 13:38:41 +02:00
Laurent Destailleur	b71c6a8a54	Merge pull request #4800 from atm-ph/new_multicurrency_sync_rates ... New multicurrency sync rates	2016-04-11 19:20:59 +02:00
Florian HENRY	23bb2eaf8a	remove debug	2016-04-11 14:27:17 +02:00
Florian HENRY	b7275edfb8	FIX #4989	2016-04-11 14:24:31 +02:00
Marcos García de La Fuente	a41a80b8fe	Merge branch 'develop' into oop-refactor-bankaccount-tostring	2016-04-09 23:17:09 +02:00
phf	a33472942d	Fix synchronize rates for multicurrency module	2016-04-09 22:12:33 +02:00
Laurent Destailleur	c2fc9ecf68	Fix scrutinizer warning	2016-04-09 16:12:53 +02: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	1b04eabf1f	Merge log with events tabs	2016-04-08 14:28:49 +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	2c829e7cb6	NEW Add picto on module list to show warning and if module is an ... external module.	2016-04-07 11:50:45 +02:00
Laurent Destailleur	ee53a8b1a8	NEW Can filter modules on publisher	2016-04-06 16:45:22 +02:00
Laurent Destailleur	4e3985fbc5	NEW If option to see non stable modules is on, add a filter into module ... list to filter on level (deprecated, experimental, development)	2016-04-06 13:27:46 +02:00
Laurent Destailleur	a0a31a3c94	Better responsive design for dictionnaries	2016-04-05 11:24:58 +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
Juanjo Menent	b3a5c8bae2	Merge pull request #4937 from simnandez/dolibarr-3510 ... Close #3510 Add a numbering module for check deposits	2016-04-03 16:22:34 +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
Juanjo Menent	9d189b3c04	NEW #3510 : Working	2016-04-03 12:14:51 +02:00
Juanjo Menent	d55d12baeb	NEW #3510 : Working	2016-04-03 11:56:31 +02:00
Florian HENRY	0ab40f11be	Merge branch 'develop' into develop_advtargetemailiing	2016-04-03 11:29:17 +02:00
Laurent Destailleur	e954fc07b3	Use natural_search for sql search forging	2016-04-02 16:30:17 +02:00
Laurent Destailleur	127ceeac8c	Uniformize code for list of audit events	2016-04-02 16:12:48 +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
Laurent Destailleur	9c394b58b5	Move help text at better place.	2016-04-01 12:40:34 +02:00
aspangaro	e118aad95f	Space	2016-04-01 06:48:17 +02:00
aspangaro	620e03337a	Merging problem	2016-04-01 06:45:46 +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	b367c9daac	Enhance picto for setup	2016-03-30 16:07:48 +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	32080e99dd	Fix dolistore url	2016-03-29 21:14:12 +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	3142fd3d84	Merge pull request #4899 from aspangaro/4.0-p7 ... Correct problem of merging with my last commits	2016-03-29 19:41:50 +02:00
Laurent Destailleur	718e9a7226	Filter on module origin	2016-03-29 19:18:53 +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	436fb91901	Uniformize name of table	2016-03-28 14:50:51 +02:00
aspangaro	85d51b0d6f	Correct of problem of merging with my last commits	2016-03-28 07:46:55 +02:00
Laurent Destailleur	22bed60a07	Remove manually other PR that should not be validated (travis errors ... reported on PR with serious mysql error in migration due to use of reserved keyword "range" as a name of a field).	2016-03-26 11:19:45 +01:00
Laurent Destailleur	6a58b025f8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-03-25 18:10:50 +01:00
Laurent Destailleur	bc1b2d048b	Uniformise option name	2016-03-25 18:09:42 +01:00
Laurent Destailleur	6aba69c69c	Merge pull request #4885 from aspangaro/4.0-p6 ... NEW: Move HRM dictionary from module to core dictionaries	2016-03-25 18:06:57 +01:00
Laurent Destailleur	46fe16be0b	Merge pull request #4871 from sbechet/develop ... Postgresql compatibility patch + cosmetic	2016-03-25 17:57:29 +01:00
Laurent Destailleur	85cd0038f5	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-25 16:10:10 +01:00
aspangaro	05df3408f2	Debug works	2016-03-25 15:59:38 +01:00
aspangaro	1d780e7e77	NEW: Accountancy - Add category to manage the display of the income ... statement and the balance sheet Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-03-25 15:59:31 +01:00
aspangaro	f8f55e05d0	NEW: Accountancy Add a way to initialize chart of accounts	2016-03-25 15:57:54 +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	630f5a632d	Revert "Corrected non-static usages of Form::selectarray function" ... This reverts commit 87cd6e1e40.	2016-03-25 15:34:37 +01:00
Laurent Destailleur	26de415b77	Revert commit that break compatibility of 100% of modules	2016-03-25 15:24:57 +01:00
aspangaro	bec5e5958a	NEW: Move HRM dictionary from module to core dictionaries	2016-03-24 06:28:12 +01:00
aspangaro	1712ad04cc	Debug works	2016-03-23 22:23:59 +01:00
aspangaro	252f37b363	NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet	2016-03-23 21:36:52 +01:00
Regis Houssin	b38e75c404	Merge branch '3.8_fix_merge' into 3.9_fix_merge	2016-03-23 14:03:35 +01:00
fmarcet	b8bc881e5a	FIX: Email templates not compatible with Multicompany ... Conflicts: htdocs/admin/dict.php	2016-03-23 13:57:17 +01:00
fmarcet	84e5c8b437	FIX: Email templates not compatible with Multicompany ... Conflicts: htdocs/admin/dict.php	2016-03-23 13:56:06 +01:00
fmarcet	e2b4d39292	FIX: Email templates not compatible with Multicompany ... Conflicts: htdocs/admin/dict.php	2016-03-23 13:54:39 +01:00
fmarcet	52d88db5c3	FIX: Email templates not compatible with Multicompany ... Conflicts: htdocs/admin/dict.php	2016-03-23 13:53:18 +01:00
aspangaro	923b5930ec	NEW: Accountancy Add a way to initialize chart of accounts	2016-03-23 06:05:48 +01:00
Sebastien Bechet	82f74ceb38	Postgresql compatibility patch + cosmetic	2016-03-22 10:09:41 +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
phf	600abc9794	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates	2016-03-20 15:56:54 +01:00
phf	661ee72d55	UPDATE move ajax request in js file and call a new php file to update all rates	2016-03-20 15:17:30 +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	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	87cd6e1e40	Corrected non-static usages of Form::selectarray function	2016-03-20 14:15:17 +01:00
Marcos García de La Fuente	eff5e2ebd7	Replaced old AccountNumber key with BankAccountNumber key	2016-03-19 23:02:09 +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	7528af5569	warning moved into info	2016-03-16 11:18:23 +01:00
jtisseau	a98e19a143	Adds a STARTTLS option ... Adds a STARTTLS authentification option. This is used by Microsoft Hotmail and Exchange. This commit includes a new constant named MAIN_MAIL_EMAIL_STARTTLS, a view and edit view for it and the edit action needed to modify value in DB. It also updates the js function initFields to make it behave like the standard TLS option and adds two jQuery function respectively to set TSL off when STARTTLS is selected and to set STARTTLS off when TLS is selected. Unselecting one of those won"t select the other.	2016-03-16 02:09:55 +01:00
Laurent Destailleur	12bb3932d0	NEW Add filter on a keyword, status and nature into list of modules	2016-03-14 19:40:52 +01:00
abb	d35f728fad	added handle to trigger FICHINTER_ADD_CONTACT in notify module	2016-03-13 19:58:39 +01:00
phf	3134af5013	Fix sync with currencylayer	2016-03-11 23:42:02 +01:00
phf	da17e6e676	New add sync with api to create/update all rates	2016-03-10 23:52:06 +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	3a58613e45	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/accountancy/bookkeeping/listbyyear.php htdocs/accountancy/journal/bankjournal.php htdocs/compta/facture/list.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/projet/activity/index.php	2016-03-02 23:40:11 +01:00
Laurent Destailleur	846d78dfba	FIX Edition of delay (nb of days) for payment term "Immediate" was ... broken.	2016-02-29 15:43:00 +01:00
Juanjo Menent	852f82e55c	Merge pull request #4687 from defrance/patch-106 ... NEW add $scandir GETPOST	2016-02-26 19:52:46 +01:00
Laurent Destailleur	1fa94e4d6a	NEW Introduce position of records into dictionnary of type of contacts	2016-02-26 15:03:07 +01:00
BENKE Charlie	8c85f17379	Update supplier_invoice.php	2016-02-26 12:02:53 +01:00
BENKE Charlie	145a87030c	Update supplier_order.php	2016-02-26 12:01:55 +01:00
Laurent Destailleur	0f49bb8645	Clean code	2016-02-24 17:09:04 +01:00
Sof	e6d06a67b4	FIX : Fatal error: Class 'FormVentilation' not found	2016-02-23 13:00:52 +01:00
Laurent Destailleur	f6d1913bb7	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-02-22 13:35:46 +01:00
Laurent Destailleur	a08fa814ec	Better filter to exclude mysqldump warning	2016-02-22 13:32:01 +01:00
Laurent Destailleur	6181ab4149	FIX Avoid to return an error due to mysql warning	2016-02-22 09:32:42 +01:00
Laurent Destailleur	7765e37101	Better support of option SOCIETE_SORT_ON_TYPEENT	2016-02-19 21:09:36 +01:00
Laurent Destailleur	da284cda8c	Add category Supplier Relationship Manager	2016-02-19 19:20:21 +01:00
Laurent Destailleur	dbb8460180	Fix avoid false warning	2016-02-19 19:11:31 +01:00
Laurent Destailleur	9c8d69eaa9	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2016-02-19 04:46:11 +01:00
Laurent Destailleur	79bc7cf085	Fix showing description	2016-02-19 04:05:08 +01:00
Laurent Destailleur	761ad0114c	Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order ... New add multicurrency on supplier proposal/order	2016-02-19 03:36:23 +01:00
phf	e24a35b904	New add multicurrency on supplier proposal/order	2016-02-16 23:58:21 +01:00
phf	6d095fce9f	Fix replace dol_include_once() function by require_once for internal module	2016-02-16 20:44:23 +01:00
Laurent Destailleur	fad09357f4	NEW Show total number of modules into the module list	2016-02-16 12:54:42 +01:00
Laurent Destailleur	36b0cb5b23	NEW Merge all admin tools (system and module admin tools) into same ... entry "Admin tools", so now things are clear: All features restricted to an admin user is inside "setup" (for setup) or "admin tools" (for action tools) instead of 3 different entries.	2016-02-16 12:50:15 +01:00
Laurent Destailleur	353fa7c2fc	Little cleaning on how options ar shown	2016-02-15 07:12:23 +01:00
Laurent Destailleur	a138c1503a	Little cleaning on how options ar shown	2016-02-15 07:04:07 +01:00
Laurent Destailleur	7aaae143fc	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/expedition/card.php	2016-02-15 02:01:58 +01:00
Laurent Destailleur	0d5f30f627	Merge pull request #4589 from frederic34/patch-8 ... Update google_oauthcallback.php	2016-02-15 00:34:22 +01:00
Laurent Destailleur	1cb6c7f3e9	Merge pull request #4603 from GPCsolutions/3.9-4597 ... FIX #4597 PHP 7 Uniform Variable Syntax	2016-02-15 00:32:11 +01:00
Laurent Destailleur	71a12824c9	Merge branch 'new_numbering_module_supplier_payment' of ... https://github.com/atm-ph/dolibarr into atm-ph-new_numbering_module_supplier_payment Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 00:31:33 +01:00
aspangaro	47f60e1f8d	Add function img_weather	2016-02-13 07:53:50 +01:00
Laurent Destailleur	ecc338b1eb	Clean module	2016-02-13 03:25:20 +01:00
Laurent Destailleur	1c6d154a77	Fix: disabling option lead in not working dolibarr	2016-02-12 12:19:11 +01:00
Raphaël Doursenaud	d038ca1875	FIX #4597 PHP 7 Uniform Variable Syntax ... PHP7 compatibility with the new Uniform Variable Syntax. This change is compatible with both PHP 5 and PHP 7. See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes	2016-02-11 20:01:51 +01:00
Frédéric FRANCE	ffccd43aab	Update oauth.php	2016-02-09 14:08:50 +01:00
Laurent Destailleur	fcf1e20d5b	Merge pull request #4578 from frederic34/sticker ... Dictionnary for label sticker and card format	2016-02-08 14:49:31 +01:00
Laurent Destailleur	d2708a4225	Merge pull request #4475 from atm-ph/new_multicurrency_module ... New multicurrency module	2016-02-08 14:44:49 +01:00
Laurent Destailleur	99c59c8c6b	Missing translation	2016-02-07 23:01:21 +01:00
Laurent Destailleur	c1a6a2880b	Debug numbering module for customer payment	2016-02-07 14:22:52 +01:00
phf	d66bc6f1b3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2016-02-06 12:57:30 +01:00
frederic34	9c74af63af	Dictionnary for label sticker and card format	2016-02-06 12:06:05 +01:00
phf	a8e480e392	FIX #3509 payment ref for suppliers	2016-02-04 23:15:06 +01:00
phf	1b552a0b3b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module ... Conflicts: htdocs/core/class/link.class.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-03 18:30:59 +01:00
Laurent Destailleur	47e2e33fb7	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/accountancy/admin/index.php htdocs/accountancy/admin/productaccount.php htdocs/accountancy/class/html.formventilation.class.php htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/menus/init_menu_auguria.sql	2016-02-03 03:27:17 +01:00
Laurent Destailleur	19300a2d82	Fix warning when javascript disabled	2016-02-03 03:10:58 +01:00
Laurent Destailleur	1fb1da5be4	Work on website module	2016-02-02 16:24:12 +01:00
Laurent Destailleur	928336c835	NEW Clean and enhance code for cron engine	2016-01-31 15:14:50 +01:00
Laurent Destailleur	426e9297ea	Prepare code to match cron rule: 0 if ok, !=0 if error	2016-01-31 14:20:02 +01:00
PeartreeG	581ea0f36b	adding resource in contact type list	2016-01-31 12:17:45 +01:00
Laurent Destailleur	eee0037a5b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-01-30 14:32:47 +01:00
Laurent Destailleur	c4d8c20abb	Fix missing include	2016-01-30 14:32:20 +01:00
Laurent Destailleur	1854f07e5c	Move code to purge files into a dedicated utils class (cron job need ... class)	2016-01-30 00:12:58 +01:00
phf	8e933ebb2d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module	2016-01-25 19:31:35 +01:00
Laurent Destailleur	ba833dc412	Work on CMS module	2016-01-24 21:35:41 +01:00
Laurent Destailleur	8d46a56dac	Work on CMS module	2016-01-24 21:17:11 +01:00
Laurent Destailleur	097251ec7f	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-23 12:29:22 +01:00
Laurent Destailleur	615ffe5417	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-23 12:28:34 +01:00
Laurent Destailleur	a841db1eeb	FIX Purge of temp files was broken	2016-01-23 12:24:46 +01:00
Laurent Destailleur	93b2013aa7	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/projet/tasks/list.php	2016-01-22 03:29:55 +01:00
Laurent Destailleur	cceeefb7c2	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/societe/index.php	2016-01-22 03:25:30 +01:00
Laurent Destailleur	cbd01bae49	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/admin/dict.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/societe/index.php	2016-01-22 03:18:51 +01:00
Laurent Destailleur	d7847a8ec8	Merge pull request #4256 from GPCsolutions/dolibarr-mysqli ... [Qual] mysqli code review	2016-01-22 02:22:47 +01:00
Laurent Destailleur	e1ac249d18	Increase size of field	2016-01-21 23:28:14 +01:00
phf	f7afbcff68	NEW integration of multicurrency module (creation fields in database and admin) ... NEW add multicurrency_code on create, update and fetch company object NEW add multicurrency on propal FIX travis FIX back quote into sql file	2016-01-21 21:38:52 +01:00
Laurent Destailleur	8e882b4cc2	NEW Add warning on tasks when they are late (add also the warning ... tolerance parameter)	2016-01-18 15:56:51 +01:00
Laurent Destailleur	2386b79dfc	FIX Option to disable meteo was not set correctly in edit mode	2016-01-18 14:49:15 +01:00
Laurent Destailleur	4a009d2ad2	NEW On translation admin page, admin can overwrite a translation value.	2016-01-16 00:48:14 +01:00
Raphaël Doursenaud	daa3ce3591	[Qual] Mysqli: set charset with recommended method	2016-01-13 11:55:59 +01:00
Laurent Destailleur	381eea0dbf	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2016-01-12 23:10:25 +01:00
Regis Houssin	694530bfae	Fix: Gives the possibility to the module, to provide his own family info ... and position of this family. (canceled $this->family)	2016-01-10 13:00:48 +01:00
Laurent Destailleur	7e9ee6f047	Fix include error	2016-01-10 12:51:42 +01:00
Laurent Destailleur	40f0d0c9f2	Merge pull request #4321 from fmarcet/3.7 ... FIX: Email templates not compatible with Multicompany	2016-01-10 11:49:37 +01:00
Laurent Destailleur	8653e7fa5c	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-10 00:12:51 +01:00
Juanjo Menent	8cabb87a2b	Merge pull request #4299 from aspangaro/develop-a12 ... Accountancy Add a list to select accounting account on dict	2016-01-09 17:47:33 +01:00
Juanjo Menent	7f6f30e69e	Merge pull request #4298 from aspangaro/develop-a11 ... Accountancy Add a list to select accounting account on tax admin	2016-01-09 17:47:03 +01:00
Juanjo Menent	099ec2b0fb	Merge pull request #4296 from aspangaro/develop-a9 ... Accountancy Add a list to select accounting account on salaries admin	2016-01-09 17:46:24 +01:00
Laurent Destailleur	0d8788e552	FIX It was not possible to define if leave type need to be followed by a ... counter or not. Added also a message to ask user to finish setup if no leave with counter was setup.	2016-01-09 01:18:53 +01:00
Laurent Destailleur	a0d11e157b	Fix select2 component go over parent container so we introduce option to ... deal this.	2016-01-08 23:17:45 +01:00
Laurent Destailleur	127354f0af	Minor fixes	2016-01-08 22:41:30 +01:00
Laurent Destailleur	2259cf2340	Merge remote-tracking branch 'origin/3.8' into develop	2016-01-08 14:49:00 +01:00
Laurent Destailleur	8366310f0f	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/admin/agenda_extsites.php	2016-01-08 14:47:46 +01:00
Laurent Destailleur	e008922919	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/admin/agenda_extsites.php	2016-01-08 14:45:53 +01:00
Raphaël Doursenaud	f2178f0369	FIX #4291 Correctly filter external calendar GETPOSTs	2016-01-08 06:42:28 +01:00
fmarcet	d8360a2a01	FIX: Email templates not compatible with Multicompany	2016-01-07 08:18:36 +01:00
fmarcet	cafe148f72	FIX: Email templates not compatible with Multicompany	2016-01-04 09:12:27 +01:00
Laurent Destailleur	1e1d6d4955	Fix to be able to use dolibarr with a smartphone	2016-01-03 19:34:19 +01:00
Laurent Destailleur	b2c41d8565	Fix search forms	2016-01-03 18:46:10 +01:00
Laurent Destailleur	d02c261d2e	Fix perf test was using a not existing js file.	2016-01-02 18:13:41 +01:00
fmarcet	cebb996120	FIX: Email templates not compatible with Multicompany	2015-12-29 11:22:18 +01:00
fmarcet	f8e156ea30	FIX: Email templates not compatible with Multicompany	2015-12-29 10:35:10 +01:00
Bahfir Abbes	61ef9921bd	correction of precedent commit ... I do not kow how I deleted a line instead of another. Sorry for it. Hope it's resolved	2015-12-27 17:50:29 +01:00
Laurent Destailleur	e93ec106bc	Merge pull request #4290 from defrance/patch-92 ... add odt info function call if present in class	2015-12-27 17:26:26 +01:00
aspangaro	d6b96ec03a	Add function length_accountg to dictionary	2015-12-26 08:38:18 +01:00
aspangaro	565040e1bc	Accountancy Add a list to select accounting account on dict	2015-12-26 08:19:43 +01:00
aspangaro	f514c65ff7	Modify a style center	2015-12-26 06:41:03 +01:00
aspangaro	86bb93884a	Accountancy Add a list to select accounting account on tax admin	2015-12-26 06:35:56 +01:00
aspangaro	97e1bb871e	Accountancy Add a list to select accounting account on salaries admin	2015-12-26 06:14:02 +01:00
BENKE Charlie	ed501cec46	add odt info is present in class	2015-12-24 15:44:56 +01:00
BENKE Charlie	9c78b083bd	add display odt info if method present in class	2015-12-24 15:42:47 +01:00
philippe grand	1eeee203d7	[Qual] comments should be in english	2015-12-22 09:37:27 +01:00
Laurent Destailleur	db7a98f0ef	Fix: When a payment mode was disabled, it was not visible on old ... records. Fix: init of $limit not correctly set according to 3.9 rules on most pages.	2015-12-21 13:56:59 +01:00
Bahfir Abbes	4f4c6d904e	Update edit.php ... allow cherry-pick of a sub-menu by changing its parent identifier	2015-12-20 13:37:46 +01:00
Laurent Destailleur	724817b966	Merge pull request #4259 from aschio/develop_sunimport ... Adding extrafields to shipments module	2015-12-18 17:28:35 +01:00
Laurent Destailleur	dc8e5f45ae	Merge pull request #4254 from grandoc/develop ... [Qual] Uniformize code	2015-12-18 17:13:22 +01:00
Laurent Destailleur	98cd4f8307	Fix message so it is more clear what the feature can do or not. ... Fix list of email templates must be hidden for templates of disabled modules.	2015-12-18 12:48:20 +01:00
cla	cb96618460	Merge branch 'develop' into develop_sunimport	2015-12-18 10:49:57 +01:00
Laurent Destailleur	5eea1ce7d9	Fix several warnings	2015-12-17 19:37:24 +01:00
philippe grand	6e45ad92fa	fix some issue within setEventMessages attribut	2015-12-17 17:35:30 +01:00
Laurent Destailleur	7b17d2ce0c	Merge pull request #4221 from mrsof/patch-1 ... FIX : Fatal error: Cannot access empty property	2015-12-16 19:07:24 +01:00
cla	ef487c48a4	NEW ... Extrafields for: - expedition, expeditiondet, livraison, livraisondet	2015-12-16 16:18:29 +01:00
Sof	4c60569cc4	FIX : Fatal error: Cannot access empty property	2015-12-14 15:42:21 +01:00
Frédéric FRANCE	65cebe37f3	Update sms.php	2015-12-13 21:12:08 +01:00
Laurent Destailleur	3680202c1c	Fix do not share color for title of table and title of pages	2015-12-13 14:39:12 +01:00
philippe grand	30eb08151d	[Qual] Close database handler should be after Footer	2015-12-11 14:19:38 +01:00
philippe grand	9b0dd8159e	[Qual] Close database handler should be after Footer	2015-12-11 12:29:19 +01:00
BENKE Charlie	898f637457	Update fichinter.php	2015-12-08 18:02:25 +01:00
BENKE Charlie	bcf6c1243c	db close must do AFTER llxFooter() call	2015-12-07 11:03:27 +01:00
BENKE Charlie	c60178c95f	db close must do AFTER llxFooter() call	2015-12-07 11:00:26 +01:00
BENKE Charlie	771f7183d4	db close must do AFTER llxFooter() call	2015-12-07 10:56:37 +01:00
AlainRnet	50cf96bd16	Update const.php ... link to help file	2015-12-06 12:01:59 +01:00
Laurent Destailleur	374480043e	Add maxwidth300 on combo list for users and sale representatives	2015-12-06 00:37:58 +01:00
Laurent Destailleur	6be9a04a56	Fix detection of last version on sourceforge	2015-12-03 14:52:13 +01:00
Laurent Destailleur	e4f0b9ba15	Fix detection of last version on sourceforge	2015-12-03 14:46:34 +01:00
Raphaël Doursenaud	e1d5b4483a	Fix #4137 Salaries parameter saving ... Button was outside of the form.	2015-12-02 18:31:38 +01:00
Laurent Destailleur	3aa25cd2be	Merge pull request #4064 from frederic34/escpos ... Add profile escpos printer	2015-11-22 17:09:15 +01:00
frederic34	6b4b70bdbb	translations and help	2015-11-22 14:11:33 +01:00
Laurent Destailleur	cb3765bc92	Debug module Resource	2015-11-22 12:23:10 +01:00
frederic34	bfd97d5226	Add profile escpos printer	2015-11-22 11:04:27 +01:00
Laurent Destailleur	2a345b6fc0	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php	2015-11-21 12:48:41 +01:00
Laurent Destailleur	611d8f3e86	Merge pull request #4021 from defrance/patch-75 ... add odt feature on supplier admin page	2015-11-21 00:24:15 +01:00
Marcos García de La Fuente	5dba9ef54e	FIX #4043 Incorrect translation in error mesage in menu creation admin page	2015-11-20 22:00:11 +01:00
philippe grand	42ed3d2bb7	[Qual] Uniformize code	2015-11-18 16:05:41 +01:00
BENKE Charlie	4aad7122e0	add odt feature on supplier admin page ... add odt feature on supplier admin page	2015-11-17 10:06:03 +01:00
BENKE Charlie	8630a2d56b	add odt feature on supplier admin page ... add odt feature on admin page	2015-11-17 10:04:13 +01:00
Laurent Destailleur	f5631cac45	NEW Introduce property module_position so a module can decide where it ... appears into list of modules.	2015-11-17 00:58:12 +01:00
Laurent Destailleur	7afedd3f8b	Minor enhancement of theme MD	2015-11-15 19:29:18 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to ... do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Laurent Destailleur	c2ec4a4fd2	Move online help link at a better place (top right). Link is also always ... visible.	2015-11-14 22:49:34 +01:00
Laurent Destailleur	6895daa5e9	Fix tr/td not correctly open/closed ... Fix default value was not set	2015-11-14 19:31:50 +01:00
Laurent Destailleur	80127cbbc9	Fix tr/td not correctly open/closed ... Fix default value was not set	2015-11-14 19:31:16 +01:00
Laurent Destailleur	01058be44c	NEW Introduce a "code" into fiels to describe vat. This will allow to ... suggest different vat lines with same value with ability to differentiate them.	2015-11-14 17:53:58 +01:00
Laurent Destailleur	64c783623b	NEW Framework feature. To have a page being loaded at same scrollbar ... level wafter a click on a href link, just add the class "reposition" on this link.	2015-11-13 03:35:55 +01:00
Laurent Destailleur	471bcdd29f	Remove hard coded list of permissions.	2015-11-13 02:21:27 +01:00
Laurent Destailleur	4065b3f1df	Better management of the Dolibarr tracking id into email. ... This will allow an imap scanner to link email	2015-11-13 00:19:11 +01:00
Laurent Destailleur	e7554d377f	Fix better error message	2015-11-06 19:07:05 +01:00
philippe grand	5f74a0f1c0	Traduction	2015-11-06 09:46:18 +01:00
Laurent Destailleur	2dc644da30	Debug Direct print module using the OAuth setup.	2015-11-06 01:33:49 +01:00
Laurent Destailleur	a7cea65710	Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement ... NEW add an option to use standard ISO location for bill in crabe model	2015-11-05 21:51:38 +01:00
Laurent Destailleur	f3b8df3ea5	Merge pull request #3889 from frederic34/escpos ... Receipt Printer conf and lang	2015-11-05 21:32:43 +01:00
frederic34	55dfa4859f	Install lib with composer	2015-11-05 21:09:14 +01:00
frederic34	8a765bf5fd	wip	2015-11-05 16:20:35 +01:00
Alexis Algoud	8221817087	NEW add an option to use standard ISO location for bill in crabe model ... For electronic sending solutions, it could be required	2015-11-05 16:17:09 +01:00
Laurent Destailleur	1f4481a6b0	Merge pull request #3172 from atm-maxime/new_creditnote ... NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice	2015-11-05 02:45:15 +01:00
Laurent Destailleur	11b7d8a44c	Merge pull request #3873 from frederic34/escpos ... Escpos Receipt printer	2015-11-05 02:18:09 +01:00
frederic34	644a104d5f	start to parse template	2015-11-04 23:14:50 +01:00
frederic34	ece9f68e0c	wip	2015-11-04 20:02:04 +01:00
frederic34	614f9c8e98	wip	2015-11-03 23:26:07 +01:00
frederic34	4a67a94704	wip template edit	2015-11-03 23:11:04 +01:00
frederic34	5c725aceb8	sql	2015-11-03 22:12:03 +01:00
frederic34	d362d889f6	wip	2015-11-03 20:50:01 +01:00
Laurent Destailleur	d5b77bdc5f	Fix parameters are set at a better place	2015-11-03 19:51:07 +01:00
Laurent Destailleur	12e11da6b4	Use better field	2015-11-02 21:44:52 +01:00
Laurent Destailleur	cd68ea9d0f	Fix: We must use external URL for OAuth.	2015-11-02 21:42:11 +01:00
Laurent Destailleur	1bcda200e3	A module to setup OAuth. OK, but what to do once setup of a client ... id/secret is done ?	2015-11-02 20:48:27 +01:00
Laurent Destailleur	ffe1284a85	Merge pull request #3840 from frederic34/printgcp ... Printing with Google Cloud Print	2015-11-02 20:09:13 +01:00
Frédéric FRANCE	e7ced32245	Fix Can't edit DictionaryRevenueStamp	2015-11-02 20:08:33 +01:00
Laurent Destailleur	7b3828b68f	Merge pull request #3861 from frederic34/patch-7 ... Fix Can't edit DictionaryRevenueStamp	2015-11-02 20:07:09 +01:00
Laurent Destailleur	da0aa2f937	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/langs/en_US/main.lang htdocs/product/list.php htdocs/product/stock/mouvement.php	2015-11-02 19:31:42 +01:00
Frédéric FRANCE	ccb69d313c	Fix Can't edit DictionaryRevenueStamp	2015-11-02 18:18:00 +01:00
frederic34	9149032a03	Merge remote branch 'upstream/develop' into printgcp ... Conflicts: htdocs/core/actions_printing.inc.php	2015-11-02 11:43:34 +01:00
frederic34	0836a84c0e	Somme cleaning	2015-10-31 18:06:49 +01:00
Laurent Destailleur	a8d28b5e46	NEW Add a filter field to restrict list of member when doing a LDAP list ... request. Use also this filter into ldap command line script making sync from ldap to dolibarr.	2015-10-30 19:23:23 +01:00
frederic34	b6be372c4b	Merge remote branch 'upstream/develop' into printgcp	2015-10-30 18:12:34 +01:00
frederic34	1694c690ed	Printing with Google Cloud Print	2015-10-30 17:22:06 +01:00
Laurent Destailleur	e01bdebc49	Fix translation	2015-10-30 14:37:19 +01:00
philippe grand	aa6b5bc1ce	[Qual] Uniformize code	2015-10-29 13:58:16 +01:00
aspangaro	4e9d06785c	Fix #3818 & presentation	2015-10-29 06:47:42 +01:00
philippe grand	d517595f82	[Qual] Uniformize code	2015-10-28 19:28:18 +01:00
Juanjo Menent	0bcb9dde10	Merge pull request #3810 from grandoc/develop ... [Qual] Uniformize code	2015-10-28 16:11:40 +01:00
Laurent Destailleur	fb28586f32	Better visible of what is possible for stock management	2015-10-27 19:18:22 +01:00
philippe grand	12e7c7b9e4	[Qual] Uniformize code	2015-10-27 13:42:00 +01:00
Laurent Destailleur	7d8fab73e1	Merge pull request #3792 from grandoc/develop ... [Qual] Uniformize code	2015-10-26 23:03:30 +01:00
Laurent Destailleur	6493438e87	NEW The clicktodial module is now able to provide link "tel:" on phone ... numbers. So it is also possible to use clicktodial with a client solution like the "xivo" local client.	2015-10-26 16:20:09 +01:00
Laurent Destailleur	4b2db78c3a	Keep deprecated options to show or not forms for blind people.	2015-10-26 12:50:32 +01:00
Laurent Destailleur	d5e42478a9	Removed deprecated options to show or not forms. Such forms does not ... exists anymore.	2015-10-26 12:37:36 +01:00
Maxime Kohlhaas	4b7c451f3d	Option of standalone creditnote is hidden	2015-10-26 09:43:58 +01:00
Maxime Kohlhaas	bd831b1f24	Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote	2015-10-26 09:40:50 +01:00
philippe grand	83420880dd	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-10-25 21:07:36 +01:00
Laurent Destailleur	f6d30d8b9e	Fix: W3C no form into table	2015-10-23 14:40:45 +02:00
philippe grand	3767ab437e	[Qual] Uniformize code	2015-10-23 12:58:30 +02:00
Laurent Destailleur	8df59134a9	Merge pull request #3705 from aspangaro/develop-hrm ... New : Module HRM	2015-10-22 19:15:49 +02:00
Laurent Destailleur	cac4a85ccd	Merge pull request #3788 from atm-maxime/new_customer_recap ... New customer recap	2015-10-22 18:02:38 +02:00
Laurent Destailleur	9cce56895c	Merge branch 'patch-77' of https://github.com/defrance/dolibarr into ... defrance-patch-77 Conflicts: htdocs/core/lib/admin.lib.php	2015-10-22 13:13:02 +02:00
frederic34	865e9d9738	Merge remote branch 'upstream/develop' into patch-15 ... Conflicts: htdocs/langs/en_US/admin.lang	2015-10-22 10:28:06 +02:00
BENKE Charlie	ef79bb3b67	Update dict.php	2015-10-21 05:23:49 +02:00
BENKE Charlie	88ca8d2ace	Update dict.php	2015-10-21 05:22:33 +02:00
Laurent Destailleur	9a1ec900bd	NEW Add into about page, a sample text to use to promote new version ... release (visible only if version is last stable)	2015-10-21 00:31:32 +02:00
Frédéric FRANCE	229fa59f6c	Update commande.php	2015-10-19 21:57:26 +02:00
Maxime Kohlhaas	a953a66616	New : allow to define list size for object list on customer card	2015-10-19 19:05:04 +02:00
Laurent Destailleur	e43f1cee7b	Better error message	2015-10-19 10:52:46 +02:00
philippe grand	f31ddc23aa	[Qual] Uniformize code	2015-10-17 16:18:33 +02:00
aspangaro	aac88519de	Merge remote-tracking branch 'Upstream/develop' into develop-hrm ... Conflicts: htdocs/user/card.php	2015-10-17 07:19:46 +02:00
Laurent Destailleur	d27330e012	Removed useless info	2015-10-15 03:38:21 +02:00
Laurent Destailleur	7f75a3da9d	NEW On list of thirdparties, user can select fields to show. ... Make phpunit test working again localy. Add missing columns into llx_expedition.	2015-10-15 03:29:35 +02:00
aspangaro	8e37da55c3	Add searchform, language key and correct code	2015-10-10 08:34:15 +02:00
Laurent Destailleur	2b17cd3353	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-08 23:50:24 +02:00
Laurent Destailleur	0d799402d0	Work on image for "no photo" with better resolution	2015-10-08 23:50:17 +02:00
philippe grand	0e343ae3b2	syntax error	2015-10-08 09:34:02 +02:00
Laurent Destailleur	4b103ba8ce	Work on a better way to manage modules. All one page. Introduce a way to ... choose order of modules family. We should also be able to introduce filters.	2015-10-07 08:13:23 +02:00
Laurent Destailleur	85a5b0fc69	Merge pull request #3652 from grandoc/develop ... FIX : typo	2015-10-04 19:57:12 +02:00
Juanjo Menent	92f4c0d015	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509	2015-10-03 16:01:24 +02:00
philippe grand	298fafd7d2	fix : internationalization	2015-10-03 15:10:53 +02:00
philippe grand	b6de2a954c	fix : internationalization	2015-10-03 15:04:03 +02:00
Juanjo Menent	67d28d6991	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-03 14:59:56 +02:00
philippe grand	82c7022e20	Fix : internationalization	2015-10-03 14:47:11 +02:00
Laurent Destailleur	c0c0cc2415	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/interventions.lang htdocs/theme/md_exp/style.css.php	2015-10-03 14:28:31 +02:00
Laurent Destailleur	5acf961f23	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-10-03 00:10:19 +02:00
Laurent Destailleur	b57c156b60	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/modules/modContrat.class.php htdocs/fichinter/card.php htdocs/install/upgrade2.php	2015-10-01 11:16:35 +02:00
Laurent Destailleur	9c4a12b9d4	Merge pull request #3613 from aspangaro/develop-68 ... Fix : remove viewport for mobile device already declared	2015-10-01 10:29:39 +02:00
Laurent Destailleur	747c49862c	Try to solve a flush pb	2015-09-30 19:15:45 +02:00
Florian HENRY	e209fb23a2	FIX : Admin fiche inter page do not take good action	2015-09-29 18:27:39 +02:00
Laurent Destailleur	1108656d19	NEW Can set color of the highlight hover line	2015-09-29 15:58:24 +02:00
Laurent Destailleur	60c6510fc1	NEW Can set default value of event type when creating an event (if type ... of event option is used).	2015-09-29 14:17:03 +02:00
Laurent Destailleur	c05df2ab7e	FIX Wizard for restore does not show import command	2015-09-29 09:11:13 +02:00
Laurent Destailleur	3f506552e3	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/theme/md_exp/style.css.php	2015-09-27 21:29:16 +02:00
aspangaro	0b266a8ee5	Fix : remove viewport for mobile device already declared	2015-09-27 14:15:09 +02:00
Laurent Destailleur	4e77a651d4	Merge pull request #3600 from fmarcet/3.8 ... FIX #3599 Not saving legal form	2015-09-26 11:05:02 +02:00
Juanjo Menent	4fa1be0e35	Issue #3509: Init works	2015-09-26 10:37:36 +02:00
Juanjo Menent	c726afe3bc	Merge pull request #3592 from GPCsolutions/select_users ... [Qual] Replaced deprecated select_users()	2015-09-26 08:44:34 +02:00
Laurent Destailleur	c0433928c6	FIX sortder field was missing so manually added values were moved to ... begin.	2015-09-25 11:28:49 +02:00
fmarcet	b5b90d1639	FIX #3599 Not saving legal form	2015-09-25 08:50:00 +02:00
Raphaël Doursenaud	b0b552c378	[Qual] Replaced deprecated select_users()	2015-09-24 20:32:35 +02:00
Raphaël Doursenaud	631ee83745	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00
Raphaël Doursenaud	dabfad1529	[Qual] Replaced deprecated print_titre()	2015-09-24 18:27:13 +02:00
Laurent Destailleur	9acc75ac12	Test if Zend OPCache is installed	2015-09-22 14:23:24 +02:00
Laurent Destailleur	ee683049a6	Enhance CSS capabilities	2015-09-22 11:24:31 +02:00
Laurent Destailleur	872b59f568	NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to ... enter pdf footer text with wysiwyg editor.	2015-09-18 12:34:36 +02:00
Laurent Destailleur	a4ab5f5552	Restore manual install of ckeditor. It seems upgrade with phpcomposer ... make some plugins not working.	2015-09-18 12:10:47 +02:00
Laurent Destailleur	9cbd236c8c	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/filefunc.inc.php	2015-09-16 22:09:21 +02:00
Laurent Destailleur	313d9ddacd	FIX #3534	2015-09-16 22:04:03 +02:00
Laurent Destailleur	1b836dc31e	Merge pull request #3408 from aspangaro/develop-60 ... New: CkEditor add possibility to choose skin	2015-09-15 17:09:11 +02:00
Laurent Destailleur	4eedec0274	Fix tool to generate filecheck	2015-09-13 20:25:33 +02:00
Laurent Destailleur	b94fb9e1f3	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-12 18:22:10 +02:00
Laurent Destailleur	9aec4d554b	Fix #3215 [User card] [Contact card] [Member card] Error in LDAP tab	2015-09-12 18:21:37 +02:00
aspangaro	3a90bfa6d3	Merge remote-tracking branch 'Upstream/develop' into develop-60	2015-09-10 06:59:23 +02:00
Laurent Destailleur	41803cd868	Merge pull request #3470 from GPCsolutions/develop-3440 ... Fix #3440 Only search for core modules in main path	2015-09-09 20:53:25 +02:00
BENKE Charlie	b4a9a0cafb	Allow contact definition on additionnal modules ... If additionnal module use contactelement feature, the module is referenced on element list on contact type	2015-09-08 13:07:13 +02:00
Laurent Destailleur	28c62fb214	Introduce a function to return a warning by loggers.	2015-09-07 12:21:26 +02:00
Raphaël Doursenaud	97f91d0ef9	Fix #3440 Only search core modules in main path ... Removed duplicated code and used common dolGetModulesDirs() function	2015-09-05 12:37:43 +02:00
Raphaël Doursenaud	3b5473abe4	NEW Syslog displays configuration errors	2015-09-04 19:10:04 +02:00
Laurent Destailleur	441bb83e64	Fix url of local web sites	2015-09-01 10:08:03 +02:00
Laurent Destailleur	942723ff8d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-08-31 12:13:35 +02:00
Laurent Destailleur	31465fe899	Fix several minor bugs	2015-08-31 12:13:23 +02:00
aspangaro	e4bac2adfd	Merge remote-tracking branch 'Upstream/develop' into develop-57 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-08-30 07:39:45 +02:00
Laurent Destailleur	a98985bf37	Fix align	2015-08-28 20:17:36 +02:00
aspangaro	a6701aeb69	New: CkEditor add possibility to choose skin	2015-08-23 15:39:55 +02:00
aspangaro	bd69d37c3a	New: Add number of expense reports to pay	2015-08-17 05:29:12 +02:00
philippe grand	ece6d1bf02	the form should be outside table to avoid errors	2015-08-15 11:21:50 +02:00
Laurent Destailleur	d5ed875427	Fix no need the star for this case	2015-08-13 05:23:25 +02:00
Laurent Destailleur	460a78e3e5	Fix translation	2015-08-13 02:13:34 +02:00
Juanjo Menent	d39b6a6bfa	Merge remote-tracking branch 'origin/3.8' into develop	2015-08-10 20:46:35 +02:00
Juanjo Menent	c96573dcb4	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-08-10 20:29:36 +02:00
Juanjo Menent	b3f3cdda3a	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-08-10 20:16:05 +02:00
Marcos García de La Fuente	2f921b6431	Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate ... Close #3342	2015-08-09 13:46:48 +02:00
Laurent Destailleur	459f9e3db8	Fix avoid warning	2015-07-29 15:54:49 +02:00
Laurent Destailleur	fcc6ce8c31	Fix Option for second level approbation was visible when it should ... not.	2015-07-29 15:39:34 +02:00
Laurent Destailleur	747e4b5e40	Fix timezone problem with external calendar import.	2015-07-28 18:12:45 +02:00
Laurent Destailleur	cb98d6cb93	Merge remote-tracking branch 'origin/3.8' into develop	2015-07-19 15:32:20 +02:00
Laurent Destailleur	11f434d422	Bad css	2015-07-16 01:02:20 +02:00
Laurent Destailleur	a66985a279	Restore backup feature	2015-07-16 00:58:05 +02:00
Laurent Destailleur	9037d2be50	Fix: test was done on wrong file	2015-07-16 00:20:46 +02:00
aspangaro	59e88590e0	Move my address email to new one	2015-07-15 20:30:33 +02:00
Laurent Destailleur	db67ab0b5e	Fix wrap into lang list. ... Sync with transifex	2015-07-15 16:27:01 +02:00
Laurent Destailleur	e31af7f914	Can filter list of setup constant on name and extend visibility to all.	2015-07-12 18:05:56 +02:00
Maxime Kohlhaas	9f9ba12802	New : option to allow credit note without related invoice	2015-07-08 14:32:57 +02:00
Raphaël Doursenaud	b508dce3ff	Fix: jquery path	2015-07-06 16:48:10 +02:00
aspangaro	56831ecd16	Correct travis	2015-07-04 16:13:44 +02:00
aspangaro	7bf1ea2cac	New: Task(#2567) Add accountancy code for VAT payments	2015-07-04 15:48:43 +02:00
Laurent Destailleur	251fedad48	NEW Can edit email template using WYSIWYG editor	2015-07-04 11:57:55 +02:00
Laurent Destailleur	bddee5d01f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-07-04 04:11:30 +02:00
Laurent Destailleur	19158979ac	Merge pull request #3122 from ywarnier/tva2 ... Updates and additions to VAT reports	2015-07-04 04:05:04 +02:00
Laurent Destailleur	9c80735310	An easier to use dictionary page to edit email template. ... Uniformize look.	2015-07-04 03:28:52 +02:00
Laurent Destailleur	0ac43211ad	NEW: Add help tooltips on fields of dictionary edit pages. ... Fix: visible list of tasks are for opened project only.	2015-07-04 02:08:06 +02:00
Laurent Destailleur	6ef0b8e330	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-07-01 21:17:05 +02:00
Yannick Warnier	3a8c93522f	Convert " " to \t to match custom coding conventions	2015-06-30 15:53:58 -05:00
Laurent Destailleur	b766f99acc	Uniformize look. ... Make code to manage link "Now" on calendar more generic.	2015-06-30 21:50:24 +02:00
Laurent Destailleur	276f057acf	Clean trigger codes ... Better error message when we insert duplicate barcode.	2015-06-30 16:10:03 +02:00
Laurent Destailleur	ae5b779652	Uniformize code	2015-06-30 01:34:17 +02:00
Laurent Destailleur	ceb9955efc	Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43 ... Conflicts: htdocs/contact/list.php	2015-06-27 02:27:34 +02:00
Laurent Destailleur	0fe0c989ca	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-26 17:36:54 +02:00
Laurent Destailleur	8f691138e8	NEW Can edit Background color for Top menu and Background color for ... table title line (works only with theme menu eldy).	2015-06-26 16:21:09 +02:00
Laurent Destailleur	936c46d219	Better error/setup messages.	2015-06-26 13:18:40 +02:00
aspangaro	9d2e964b00	Fix: print_liste_field_titre('');	2015-06-26 06:23:29 +02:00
aspangaro	452733263d	Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT	2015-06-25 06:37:26 +02:00
Laurent Destailleur	040a643ee9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/expensereport/card.php htdocs/projet/element.php	2015-06-23 18:34:39 +02:00
Laurent Destailleur	27cc7ef2b3	Time spent	2015-06-23 10:13:08 +02:00
Laurent Destailleur	a27212644e	NEW Can add project search on left menu search area	2015-06-22 11:55:21 +02:00
Laurent Destailleur	d780c03651	Fix default buttone	2015-06-21 03:47:16 +02:00
Laurent Destailleur	4f1538f502	Introduce table llx_c_holiday_type	2015-06-21 03:19:15 +02:00
Laurent Destailleur	2c5ef858d0	NEW Filter "active" by default on user list. ... Fix label of permission of project module	2015-06-20 20:35:57 +02:00
Laurent Destailleur	ba5d6318ef	Debug the integrity check feature.	2015-06-20 14:24:22 +02:00
Laurent Destailleur	a7ce414d23	Fix translation	2015-06-20 14:15:32 +02:00
Raphaël Doursenaud	95debcc376	Fix nophoto image path on company admin	2015-06-10 19:49:09 +02:00
Raphaël Doursenaud	4aee11e54b	Make default avatar images public to allow Gravatar proxying ... Fix #2985	2015-06-08 17:23:02 +02:00
Laurent Destailleur	30f6cd08cf	Merge pull request #2943 from aspangaro/develop-donation2 ... New: Add object ot the company & Add picture cerfa logo	2015-06-05 15:58:47 +02:00
Laurent Destailleur	5edef2f02f	NEW A module can add its entries into cron module.	2015-06-05 03:32:09 +02:00
Laurent Destailleur	1f92f542a6	NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become ... officialy visible into setup.	2015-06-04 13:32:21 +02:00
aspangaro	3461a8712a	New: Add object of the company - Needed for donation	2015-06-03 06:48:15 +02:00
Raphaël Doursenaud	a24e4fec6c	NEW A link to the bugtracker can be enabled in the GUI	2015-06-01 10:46:56 +02:00
Laurent Destailleur	3588d73c8e	Fix css	2015-05-31 16:36:11 +02:00
Laurent Destailleur	1b681510a5	NEW Use new select2 component for juridical status, country and state ... selection.	2015-05-31 12:25:33 +02:00
Laurent Destailleur	5e773d4cb6	Work on finishing of style	2015-05-31 01:06:51 +02:00
Laurent Destailleur	65c7ab7a93	Fix: Introduce error by default when function is used as a true delete ... function.	2015-05-29 17:11:42 +02:00
Laurent Destailleur	6108dfad55	Minor enhancement	2015-05-22 00:46:53 +02:00
Laurent Destailleur	6d03ba228d	Fix consistency of backup result message	2015-05-18 20:33:02 +02:00
Laurent Destailleur	e230d72cea	Increase default date range to current month instead of current day	2015-05-18 19:41:23 +02:00
Laurent Destailleur	36cad55ed7	Merge pull request #2829 from bafbes/patch-6 ... NEW Add date filtering into audit page	2015-05-18 19:25:30 +02:00
Bahfir Abbes	1ba2240553	fix add to listevents.php ... use of dol_mktime + check dates order	2015-05-17 16:13:50 +01:00
Laurent Destailleur	4b13d5fafe	Fix css	2015-05-16 03:11:08 +02:00
Bahfir Abbes	ffc5284a78	Update listevents.php	2015-05-14 20:17:52 +01:00
Bahfir Abbes	5191bffb1c	improve events list view ... provide a finer grained view for this list and fix bug related to sorting control which wipes off other parameters	2015-05-13 18:56:13 +01:00
Laurent Destailleur	8e09f54a46	Minor fixes	2015-05-13 07:46:12 +02:00
Laurent Destailleur	4408648a68	Merge pull request #2817 from GPCsolutions/jqueryfixes ... jQuery fixes	2015-05-12 22:36:12 +02:00
Raphaël Doursenaud	aee61aa2c4	[Qual] Fixed deprecated HTML nowrap attribute to class	2015-05-12 15:37:35 +02:00
Raphaël Doursenaud	e149d49fb8	[Qual] Use jQuery property instead of attribute to test and set disabled	2015-05-12 14:53:01 +02:00
Raphaël Doursenaud	0d8641a073	[Qual] Use jQuery property instead of attribute to test and set checked	2015-05-12 14:51:30 +02:00
Juanjo Menent	ce1769d2c5	Merge pull request #2803 from simnandez/develop ... Code fixes	2015-05-09 13:59:11 +02:00
Juanjo Menent	d4e8e58e54	Code fixes	2015-05-09 13:25:40 +02:00
Raphaël Doursenaud	5d2f081152	[Qual] Fixed HTML select form selected attribute ... Dolibarr uses HTML 4.01 or HTML5 doctypes. The select form selected attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	b8d9c20731	[Qual] Fixed HTML input form disabled attribute ... Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form disabled attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	859d1b0df9	[Qual] Fixed HTML input form checked attribute ... Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form checked attribute should not have a value.	2015-05-07 14:21:14 +02:00
Laurent Destailleur	b71e5a1025	Merge pull request #2673 from aternatik/fix_getentity ... Fix : missing getEntity calls	2015-05-07 00:48:19 +02:00
Laurent Destailleur	3a8cf17f3c	NEW Can edit list of prospect status for customers/prospects. Add a new ... entry into dictionary table to manage list fo status. Removed deprecated files.	2015-05-06 23:13:07 +02:00
Laurent Destailleur	89c9996b22	Fix translation of status	2015-05-04 09:50:49 +02:00
Laurent Destailleur	333a29683c	uniformize look	2015-05-03 21:15:08 +02:00
aspangaro	8163563753	New: Add option to show long or short (by default) label in select_month()	2015-05-03 06:12:02 +02:00
Laurent Destailleur	60a56da370	Some change into css. Tabs background are now white so main content is ... black on white (better contrast). Fix editfieldval for date.	2015-04-25 22:20:10 +02:00
Laurent Destailleur	100fa1067e	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/bank/virement.php htdocs/compta/facture/impayees.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/modProjet.class.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/en_GB/admin.lang htdocs/langs/es_AR/orders.lang htdocs/langs/es_AR/trips.lang htdocs/langs/es_CO/admin.lang htdocs/langs/es_CO/orders.lang htdocs/langs/es_CO/trips.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/main.lang htdocs/langs/pl_PL/interventions.lang htdocs/langs/pt_BR/trips.lang htdocs/langs/ro_RO/productbatch.lang htdocs/langs/ro_RO/trips.lang htdocs/main.inc.php htdocs/projet/element.php	2015-04-22 17:57:57 +02:00
jfefe	f5db4d5bb7	Fix: missing getEntity function	2015-04-19 03:05:37 +02:00
Marcos García de La Fuente	270bca740c	Merge branch 'develop' into units ... Conflicts: htdocs/compta/facture/fiche-rec.php	2015-04-19 00:59:04 +02:00
Laurent Destailleur	5b29c87933	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/deplacement/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/expedition/fiche.php	2015-04-19 00:23:46 +02:00
Laurent Destailleur	ab77158757	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/expedition/fiche.php	2015-04-18 23:55:17 +02:00
Marcos García de La Fuente	87f97ed545	Merge branch 'develop' into units ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php	2015-04-18 23:38:14 +02:00
jfefe	c905f88498	Change generic and setup image title	2015-04-18 23:13:48 +02:00
Laurent Destailleur	9dd73de9b0	Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:47:20 +02:00
Marcos García de La Fuente	dc790ff586	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
philippe grand	eaf0fda6aa	fix syntax errors	2015-04-18 18:07:41 +02:00
Laurent Destailleur	471a5857d2	Fix CSS	2015-04-18 17:42:24 +02:00
Laurent Destailleur	97cdc55839	NEW Module notification should details of emails into confirm box, not ... only number.	2015-04-13 17:04:18 +02:00
Laurent Destailleur	ae103e34b8	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/debian/changelog htdocs/compta/facture.php htdocs/core/lib/price.lib.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/opensurvey/public/studs.php htdocs/projet/element.php	2015-04-13 13:08:46 +02:00
Marcos García de La Fuente	9cfb295675	Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref	2015-04-12 21:05:26 +02:00
Laurent Destailleur	1272b03e5e	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: build/debian/changelog htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/menus/standard/eldy.lib.php htdocs/fourn/facture/fiche.php htdocs/product/stock/mouvement.php htdocs/projet/element.php htdocs/societe/rib.php htdocs/theme/bureau2crea/img/statut4.png	2015-04-12 12:03:59 +02:00
Laurent Destailleur	6889162d7a	Fix: management of vat type 2, 4 and 6 is now ok. ... Works for canada and ivory cost.	2015-04-11 22:51:53 +02:00
Laurent Destailleur	fc803e7000	Fix permission lost when enabled/disabled module.	2015-04-08 17:33:38 +02:00
Laurent Destailleur	6fa0234409	Uniformize code	2015-04-07 03:00:11 +02:00
frederic34	19b55cb4c1	Add public note to members	2015-04-06 18:58:36 +02:00
Laurent Destailleur	4d6b7b4bae	Clean code	2015-04-04 04:17:07 +02:00
Laurent Destailleur	2ec5595277	NEW Can install an external module from admin pages, if web server has ... permission for and if setup is ok for.	2015-04-04 00:19:03 +02:00
Laurent Destailleur	e6c9e07de4	NEW Backup and restore tool is easier to use	2015-04-03 17:17:02 +02:00
Marcos García de La Fuente	7075ac74c4	Merge branch 'develop' into units ... Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/class/product.class.php	2015-04-03 15:45:54 +02:00
Laurent Destailleur	c62687d198	Comment	2015-04-02 12:55:00 +02:00
Laurent Destailleur	d8db32a99c	NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 ... approvals to make a supplier order approved. Activating this option introduce a new permission to the second level approval.	2015-04-01 21:00:51 +02:00
Laurent Destailleur	b83e9ea32f	Merge branch 'loan' of https://github.com/frederic34/dolibarr into ... frederic34-loan Conflicts: htdocs/compta/bank/ligne.php	2015-03-30 02:56:26 +02:00
Laurent Destailleur	fd8d09c8c0	Fix avoid warning	2015-03-29 17:53:05 +02:00
aspangaro	9d34b40897	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc ... Conflicts: htdocs/compta/bank/account.php	2015-03-24 05:28:57 +01:00
Laurent Destailleur	efe9c21b81	Merge pull request #2382 from aspangaro/develop-loan ... NEW: Module loans	2015-03-23 23:28:57 +01:00
Laurent Destailleur	b9c3c074b1	Fix: a line was inserted when making update ... Fix: missing message into notification admin page	2015-03-23 14:43:19 +01:00
aspangaro	414d4c6432	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-22 18:08:12 +01:00
aspangaro	c4a580723d	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-20 06:36:06 +01:00
Laurent Destailleur	f44d91e153	NEW: The notification module accept keyword __SUPERVISOR__ to send ... notification to supervisor of user.	2015-03-19 11:47:30 +01:00
aspangaro	4e68586389	Move module Dons in htdocs>donations	2015-03-19 05:08:23 +01:00