4970 Commits

Author	SHA1	Message	Date
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
Laurent Destailleur	6ceda02eaa	NEW: Enhancement of module 'Notification by Email'. Show nb of ... notifications set. Can set several emails. Can set a threshold on amount for notifications. Add notification on supplier order validation.	2015-03-18 21:44:57 +01:00
Laurent Destailleur	6d7b340cee	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/class/dolgraph.class.php htdocs/langs/en_AU/main.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/other.lang	2015-03-16 18:30:30 +01:00
Laurent Destailleur	bc4ecf8619	Fix the debug option must works for admin user	2015-03-16 18:25:26 +01:00
aspangaro	d69f066735	QUAL: Traduce terms + remove <center>	2015-03-15 14:04:07 +01:00
Laurent Destailleur	10bbf463e7	Several bug fixes from scrutinizer	2015-03-14 14:55:41 +01:00
Laurent Destailleur	306eff62ad	NEW: Show last official stable version into system - update page.	2015-03-14 13:23:36 +01:00
Laurent Destailleur	e935745727	Merge pull request #2285 from ndrosis/patch-14 ... New: Check live last version from sourceforge.net	2015-03-14 13:09:05 +01:00
Laurent Destailleur	51c877e32c	Hide a feature that is really not stable. So i move it as a "develop" ... feature.	2015-03-13 18:03:21 +01:00
Laurent Destailleur	f090893807	Hide a feature that is really not stable. So i move it as a "develop" ... feature.	2015-03-13 18:02:54 +01:00
aspangaro	3897e65425	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-11 05:28:59 +01:00
Laurent Destailleur	ec322e2e29	Revert was not complete	2015-03-11 03:03:17 +01:00
Laurent Destailleur	4b8fa00edb	Merge pull request #2422 from guedel/sqlite3-dev ... Sqlite3 dev	2015-03-11 02:54:15 +01:00
Laurent Destailleur	e8732df747	Merge pull request #2441 from aspangaro/develop-ReviewER ... FIXED: Review Expense Report	2015-03-11 02:14:13 +01:00
Laurent Destailleur	84695845bb	Some fixes into translation and permissions	2015-03-09 21:20:56 +01:00
aspangaro	402e0c8ad5	Add condition to access on dictionary c_type_fees when the module is enabled	2015-03-07 15:06:45 +01:00
Scrutinizer Auto-Fixer	a0762a5113	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-06 01:31:49 +00:00
Laurent Destailleur	049174b76f	Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/	2015-03-06 01:53:02 +01:00
aspangaro	11704e0807	Merge remote-tracking branch 'Upstream/develop' into develop-loan ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-05 20:24:53 +01:00
Guillaume de Lestanville	dd2594692e	Updating compatibility with Sqlite3 ... - Replace USING syntax by IN SELECT syntax - Fix error on database creation - Removing test on username parameter when installing.	2015-03-05 17:35:37 +01:00
guillaume	0ef46b06f4	Sqlite3-PDO restoration ... FR: - Restauration de la version PDO dans sqlite.class.php et désactivation. - Ajout de la classe de base de données Sqlite3 dans sqlite3.class.php EN: - revert of the PDO version of sqlite.class.php and deactivation. - add database class Sqlite3 into sqlite3.class.php.	2015-03-05 10:52:37 +01:00
Laurent Destailleur	96de912661	NEW: Add module "Supplier commercial proposals" to requests ... quotation/price to suppliers. Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into atm-ph-new_ask_price Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/html.formfile.class.php htdocs/core/tpl/document_actions_post_headers.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 17:54:43 +01:00
Laurent Destailleur	60a6d8789f	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-04 01:14:27 +01:00
guillaume	5a5a2f1bcf	Affichage de la liste des tables dans les infos de base de données.	2015-03-03 15:54:55 +01:00
aspangaro	c119ce382e	Merge remote-tracking branch 'Upstream/develop' into develop-loan ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-02 21:05:38 +01:00
Laurent Destailleur	79023cddb0	Fix external calendar for users were not visible if no global calendar ... was set.	2015-03-02 17:34:50 +01:00
Laurent Destailleur	2f24622a7c	NEW: Introduce TCPDI as replacement of FPDI.	2015-03-02 01:38:40 +01:00
Laurent Destailleur	50d8137618	Merge pull request #2384 from marcosgdf/better-practice ... Better practice in getBrowserInfo	2015-03-02 00:28:40 +01:00
Laurent Destailleur	2795d27cc9	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang htdocs/projet/index.php	2015-03-01 16:13:22 +01:00
Marcos García de La Fuente	b4c84fac9d	NEW: [ task #977 ] New option to manage product unit ... Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-03-01 12:42:38 +01:00
Laurent Destailleur	b888a04af9	Reduce a lot of duplicate code. Move all tables of extrafields setup ... into a tpl file.	2015-02-28 20:14:26 +01:00
Laurent Destailleur	f8e9a38e5c	Fix: Avoid empty table into setup when module are missing.	2015-02-28 19:37:44 +01:00
Marcos García de La Fuente	60e2524fc2	Merge remote-tracking branch 'upstream/develop' into better-practice ... Conflicts: htdocs/core/lib/functions.lib.php test/phpunit/FunctionsLibTest.php	2015-02-28 14:39:14 +01:00
aspangaro	4803a1fb89	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-25 06:59:27 +01:00
Laurent Destailleur	1c04af2e55	Merge branch 'feature_Product_stock_subproduct_stock_independent' of ... https://github.com/atm-alexis/dolibarr into atm-alexis-feature_Product_stock_subproduct_stock_independent Conflicts: htdocs/langs/en_US/products.lang	2015-02-24 17:23:23 +01:00
Laurent Destailleur	472181a03b	Merge pull request #2374 from frederic34/filecheck ... Files Integrity Checker	2015-02-24 10:08:39 +01:00
Laurent Destailleur	6d3834b3b9	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/index.php htdocs/projet/class/project.class.php test/phpunit/BankAccountTest.php	2015-02-23 14:59:24 +01:00
Laurent Destailleur	570194b4b9	Fix validation of email when there is a comma separator.	2015-02-23 13:10:18 +01:00
Alexis Algoud	72908c1fd3	Merge branch 'develop' of https://github.com/atm-gauthier/dolibarr into feature_Product_stock_subproduct_stock_independent	2015-02-23 10:51:41 +01:00
Laurent Destailleur	b04682db4c	Fix Edit of extrafield on supplier invoice or order was deleteing other ... fields. Fix Missing escapment Fix new field delivery date was only into edit page	2015-02-22 17:41:02 +01:00
Laurent Destailleur	2bc6ac4671	Finished new module to manage expense reports ! ... Fix export to support corectly multicompany	2015-02-22 13:16:49 +01:00
Marcos García de La Fuente	ce916f3bcb	Better practice in getBrowserInfo	2015-02-22 12:35:51 +01:00
aspangaro	63099727d0	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-21 15:10:35 +01:00
frederic34	2b19f75460	Files Integrity Checker	2015-02-19 21:26:03 +01:00
Laurent Destailleur	e3713c8b6d	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/admin/tools/eaccelerator.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php	2015-02-19 00:01:26 +01:00
Laurent Destailleur	4963555669	Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-misc Conflicts: htdocs/barcode/codeinit.php	2015-02-18 22:54:02 +01:00
Laurent Destailleur	b6947dbe2c	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/modules/DolibarrModules.class.php	2015-02-18 22:04:26 +01:00
Laurent Destailleur	cc1d506614	Miscelaneous debug on barcode features.	2015-02-18 21:01:17 +01:00
Gauthier	02d59cce5a	NEW : Product stock and subproduct stock are independant	2015-02-16 16:06:50 +01:00
Laurent Destailleur	e3885d6d73	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/lib/tax.lib.php	2015-02-10 21:36:38 +01:00
Marcos García de La Fuente	e21681a369	PHPDoc and misc fixes for Admin	2015-02-10 10:52:48 +01:00
phf	34bc1dbc15	Merge branch 'develop' into new_ask_price	2015-02-09 09:07:50 +01:00
Laurent Destailleur	64963ef9bd	Fix: the syslog handler for chromphp an fiefoxphp was not visible when ... they should not.	2015-02-07 19:12:22 +01:00
Laurent Destailleur	011d39105d	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/accountancy/admin/export.php htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/datepicker.php htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/fourn/facture/card.php	2015-02-07 03:28:36 +01:00
Laurent Destailleur	53453a63f5	Fix: pb when posting page due to apache limit	2015-02-07 01:45:09 +01:00
phf	bf643c26da	[CORE] FIX : des noms des hooks ... + correction nom de variable (#new_ask_price).	2015-02-06 09:50:27 +01:00
phf	bcbf29d9a5	[CORE] assainissement du code + traductions FR vers EN (#new_ask_price).	2015-02-04 15:39:57 +01:00
Laurent Destailleur	96215ccea5	Fix bad operator for and	2015-02-03 13:05:28 +01:00
frederic34	b850b7b448	Merge remote branch 'upstream/develop' into tooltip ... Conflicts: htdocs/langs/en_US/sendings.lang	2015-01-30 16:45:24 +01:00
Laurent Destailleur	4fdc287717	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/accountancy/customer/card.php htdocs/accountancy/journal/sellsjournal.php htdocs/admin/menus.php htdocs/fourn/commande/card.php htdocs/install/check.php	2015-01-30 15:53:06 +01:00
Laurent Destailleur	67c1ae8593	Fixed: condition to show menus	2015-01-30 15:47:27 +01:00
phf	87398c7d43	[CORE] renomage de variables pour être en rapport avec le module (#new_ask_price).	2015-01-29 10:42:53 +01:00
Drosis Nikos	fc7f2f2303	translate UpdateServerOffline	2015-01-28 23:12:46 +02:00
phf	a98ce01807	[CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price).	2015-01-28 17:27:26 +01:00
Drosis Nikos	872fe15743	Check live last version from sourceforge.net	2015-01-26 17:05:47 +02:00
frederic34	e18577aa62	Tooltip and lib for file cache	2015-01-24 21:46:05 +01:00
cla	134759ce28	update table name facture_fourn_det_extrafields	2015-01-22 15:02:19 +01:00
cla	c953a04687	Added files for Extrafields in Order/Invoice Supplier Line. New files ... sql added in install/mysql folder and 2 new pages to insert extrafields in admin folder	2015-01-22 14:18:33 +01:00
Marcos García de La Fuente	fb186d6ef8	Added delay between mails in Newsletter module	2015-01-18 16:26:26 +01:00
Ion Agorria	48c6897f75	Store per entity SMTP configuration	2015-01-18 03:20:35 +01:00
Laurent Destailleur	30abacd0a6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-01-17 14:42:42 +01:00
Laurent Destailleur	87a59ef527	Merge branch 'develop_bank_extrafields' of ... https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields Conflicts: htdocs/admin/bank.php	2015-01-17 14:42:04 +01:00
Laurent Destailleur	6a081fe883	Merge pull request #2229 from frederic34/getnextvalue ... Translation error messages numbering modules	2015-01-16 12:08:53 +01:00
Laurent Destailleur	c54355b63a	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-16 10:44:41 +01:00
Laurent Destailleur	362167f319	Fixed: Export was not using user assigned	2015-01-15 02:32:15 +01:00
Laurent Destailleur	13132ef2ed	Better organisation of entries into security setup area	2015-01-12 13:20:27 +01:00
frederic34	173d3aaa90	Translation error messages numbering modules	2015-01-11 11:31:53 +01:00
Laurent Destailleur	fc78d632d3	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/facture.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/main.inc.php	2015-01-09 23:09:10 +01:00
frederic34	73fda2cb86	WIP PSR2	2015-01-08 18:36:03 +01:00
Laurent Destailleur	443c9d245e	Merge pull request #2212 from marcosgdf/misc-doc ... Miscellaneous corrections	2015-01-06 00:21:05 +01:00
Laurent Destailleur	df3987fa10	Fixed: Bad url link with jquery mobile. We must add rel="external" on ... all external links.	2015-01-04 14:51:16 +01:00
Marcos García de La Fuente	86100758ff	Miscellaneous corrections	2014-12-28 20:13:15 +01:00
Laurent Destailleur	5ead994955	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: ChangeLog	2014-12-26 04:57:55 +01:00
Laurent Destailleur	2a3bb96c34	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/ecm.lib.php	2014-12-22 03:14:22 +01:00
Frédéric FRANCE	3d9ce4c1dc	Admin config for ask for payment bank during order	2014-12-21 10:32:11 +01:00
Laurent Destailleur	c05c2fe427	Info to help debug perf pb.	2014-12-20 18:46:29 +01:00
Philippe GRAND	8878ef601f	form should open before table	2014-12-16 15:34:56 +01:00
Philippe GRAND	cf196c77fb	one close form too much	2014-12-16 15:15:03 +01:00
Philippe GRAND	69c1de3fe1	one close form too much, an other at the wrong place	2014-12-16 15:07:23 +01:00
Philippe GRAND	e40ef3f9ce	form closed at the wrong place	2014-12-16 14:49:07 +01:00
Philippe GRAND	dd6d6bc054	open form was at the wrong place ... missing close form	2014-12-16 14:43:28 +01:00
Laurent Destailleur	8a6f7df186	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-14 12:37:20 +01:00
Laurent Destailleur	711b033844	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/contrat/card.php htdocs/core/class/html.form.class.php htdocs/product/stock/card.php	2014-12-14 12:35:13 +01:00
Laurent Destailleur	da3bc3868d	Fixed: Duplicated lang key	2014-12-14 11:46:21 +01:00
Laurent Destailleur	627e344c78	Documentation of external link.	2014-12-11 14:43:14 +01:00
Laurent Destailleur	03cfff66ea	Fixed: no form into table	2014-12-11 14:26:34 +01:00
Laurent Destailleur	63f2bfed24	Fixed: Maxi debug of withdrawal module.	2014-12-09 11:19:16 +01:00
Laurent Destailleur	d7dd496239	Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5	2014-12-08 00:09:01 +01:00
Laurent Destailleur	344aa40858	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: .travis.yml dev/codesniffer/ruleset.xml htdocs/core/class/conf.class.php htdocs/langs/en_US/productbatch.lang	2014-12-05 20:21:40 +01:00
Laurent Destailleur	a9338a0f9f	Fix: Maxi debug of module productbatch. ... Conflicts: htdocs/core/class/conf.class.php htdocs/langs/en_US/productbatch.lang	2014-12-05 16:04:37 +01:00
Laurent Destailleur	5457d3116a	Fix: Maxi debug of module productbatch.	2014-12-05 16:01:01 +01:00
Laurent Destailleur	8d405a147f	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: build/debian/changelog htdocs/core/tpl/objectline_create.tpl.php	2014-12-04 15:29:45 +01:00
Laurent Destailleur	6729544782	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/projet/tasks/task.php	2014-12-04 14:52:34 +01:00
Laurent Destailleur	83122ebe1e	Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now ... for release.	2014-12-04 13:20:56 +01:00
Laurent Destailleur	b5d74372de	Bad var	2014-12-04 01:36:53 +01:00
Laurent Destailleur	f884f16564	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/admin/boxes.php htdocs/comm/action/card.php htdocs/core/class/html.formfile.class.php	2014-12-03 12:54:42 +01:00
Frédéric FRANCE	79314b7ff8	Fix missing space	2014-12-03 12:47:11 +01:00
Laurent Destailleur	1a67ae10a4	Merge pull request #2119 from frederic34/patch-7 ... Fix missing space	2014-12-03 12:46:44 +01:00
Laurent Destailleur	2ddc3cb3f0	Fix: Using a select with checkbox will not be compatible when we will ... add feature to put box on other pages.	2014-12-03 12:43:14 +01:00
Frédéric FRANCE	58621e7e13	Update boxes.php	2014-12-03 12:32:37 +01:00
Laurent Destailleur	6a09bca21e	Merge pull request #2120 from frederic34/patch-8 ... Update admin config for boxes	2014-12-03 12:24:03 +01:00
aspangaro	f6ab7ca0c9	Typo	2014-12-02 20:42:47 +01:00
BENKE Charles	3c12d5f420	Update supplierinvoice_extrafields.php ... add orders translation files for correct menu translation error	2014-12-02 10:36:48 +01:00
Frédéric FRANCE	aade7309e0	Update boxes.php	2014-11-30 15:56:57 +01:00
Laurent Destailleur	01209ff844	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/product/stock/card.php	2014-11-30 14:15:38 +01:00
Frédéric FRANCE	18f2cfbeac	Fix missing space	2014-11-30 13:28:09 +01:00
Laurent Destailleur	7303983610	Fixed: Ton of old bugs when debugging POS.	2014-11-30 01:35:58 +01:00
aspangaro	3db2e46fc6	Typo	2014-11-29 07:41:51 +01:00
aspangaro	64260cde72	Add button in admin->GUISetup to activate Html5	2014-11-29 07:07:27 +01:00
Laurent Destailleur	d3b32ce22f	Fixed: Bad function/picto for information messages (not a star)	2014-11-28 19:49:42 +01:00
Laurent Destailleur	a724c3aa70	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/main.inc.php	2014-11-28 02:26:40 +01:00
Laurent Destailleur	dc1c98734e	Fixed: Option specific to a module should start with module name	2014-11-28 00:21:52 +01:00
aspangaro	c4c69e191b	Replace <center> tags	2014-11-25 20:13:43 +01:00
Frédéric FRANCE	f5bc6dc634	Update propal.php	2014-11-24 21:01:55 +01:00
Frédéric FRANCE	655dc35628	Update propal.php	2014-11-24 20:57:26 +01:00
Marcos García de La Fuente	eb569fe235	Fixed [ bug #1712 ] Unable to add a social charge	2014-11-23 16:43:52 +01:00
Marcos García de La Fuente	7d71974362	Fixed [ bug #1712 ] Unable to add a social charge	2014-11-23 16:14:12 +01:00
Laurent Destailleur	2a56a19b7d	Merge remote-tracking branch 'origin/3.7' into develop	2014-11-22 16:59:12 +01:00
Laurent Destailleur	671243e8f6	Fixed: Bugs reported by scrutinizer ... Fixed: Solve conflict between ->iban and ->iban_prefix.	2014-11-22 16:57:08 +01:00
Laurent Destailleur	06b663b92c	Merge remote-tracking branch 'origin/3.7' into develop	2014-11-22 00:45:45 +01:00
Laurent Destailleur	a2d4046f50	Fixed: Untranslatable tokens	2014-11-22 00:45:04 +01:00
Laurent Destailleur	0f5203b384	Edit vat	2014-11-20 15:08:13 +01:00
Laurent Destailleur	dae9315374	Fix: duplicate line	2014-11-20 11:06:46 +01:00
Laurent Destailleur	e5e1c542ce	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/admin/security_other.php htdocs/langs/en_US/admin.lang	2014-11-20 10:59:14 +01:00
Laurent Destailleur	358ddb0abc	Fix: W3C. form into table is forbidden. This makes some browsers crazy.	2014-11-20 10:15:24 +01:00
Laurent Destailleur	84729a6aa3	Fix: Bad vars	2014-11-18 23:18:59 +01:00
Laurent Destailleur	1d21141de2	Fix: Bad vars	2014-11-18 22:59:48 +01:00
aspangaro	c256243bf7	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-16 08:41:39 +01:00
Laurent Destailleur	ad661256c0	Fix: Bugs reported by scrutinizer	2014-11-15 16:20:03 +01:00
Laurent Destailleur	4df754f36f	Merge pull request #2015 from aspangaro/develop-patch ... Update accounting language	2014-11-15 12:19:23 +01:00
Laurent Destailleur	81f0d953e3	Fix: Bad test	2014-11-12 10:05:40 +01:00
aspangaro	da258cd4b0	Typo & presentation	2014-11-12 07:29:57 +01:00
Florian HENRY	9c795d2c4b	Finnish bank extrafeilds	2014-11-10 13:18:27 +01:00
aspangaro	cbfa90abca	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-04 20:57:05 +01:00
Laurent Destailleur	c41e908dba	Merge pull request #2000 from Devensys/Develop-MajPasswordPattern ... New modGeneratePass with personal conf	2014-11-04 17:37:25 +01:00
Andrelec1	796f2409a1	Add verif and correction lang	2014-11-04 11:38:16 +01:00
aspangaro	25433120e6	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-11-04 06:16:03 +01:00
Andrelec1	5074feacd6	Add option and create new class	2014-11-03 17:57:55 +01:00
Laurent Destailleur	9c51effe5c	Ajout plus d'info dans description audit.	2014-10-31 15:42:35 +01:00
Laurent Destailleur	8d964e03d2	Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into ... AMMD-agenda-export-by-project Conflicts: htdocs/admin/agenda_xcal.php	2014-10-30 18:19:13 +01:00
Laurent Destailleur	6a1a0303d8	Merge pull request #1975 from frederic34/patch-1 ... "Is Order shippable" icon	2014-10-30 18:03:44 +01:00
Laurent Destailleur	38a939771c	New: Add template of emails into dictionnary.	2014-10-30 17:16:51 +01:00
Laurent Destailleur	0abeea059e	Uniformize and clean boxes behaviour and translation.	2014-10-27 21:48:28 +01:00
Frédéric FRANCE	68fa6cec70	Update commande.php	2014-10-25 11:34:21 +02:00
Laurent Destailleur	0fc1c85b34	New: Module notification has been enhanced: ... EMail use now language of target contact. Can also define a fixed email for notifications. Better error management	2014-10-25 00:42:52 +02:00
Laurent Destailleur	42a600412d	Fix: Regression with favorite.	2014-10-20 12:41:18 +02:00
Laurent Destailleur	718b3b19b4	Fix: user and date modification not updated	2014-10-20 11:16:51 +02:00
Grégory DAVID	a794180586	Document the ability to export agenda calendar restricted to project ID	2014-10-18 16:41:47 +02:00
Laurent Destailleur	e53c328767	Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into ... aspangaro-develop-favorite Conflicts: ChangeLog htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-10-18 15:45:44 +02:00
aspangaro	9f6a460d42	Merge remote-tracking branch 'Upstream/develop' into develop-favorite ... Resolve conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-10-18 15:32:50 +02:00
Laurent Destailleur	90d47cffae	Better error management and better error message for reporting upload or ... error of images.	2014-10-18 14:56:06 +02:00
Laurent Destailleur	58b15fa736	Fix: Solve some regressions	2014-10-18 01:32:38 +02:00
aspangaro	861583bb77	Merge remote-tracking branch 'Upstream/develop' into develop-favorite	2014-10-14 06:12:46 +02:00
Laurent Destailleur	f498921715	Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into ... GPCsolutions-droposcommerce Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/vi_VN/admin.lang htdocs/langs/vi_VN/shop.lang	2014-10-13 00:50:51 +02:00
aspangaro	71dafac03c	Add favorite button into country dictionary to put value on top select list	2014-10-12 15:28:01 +02:00
Laurent Destailleur	9768550696	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: ChangeLog htdocs/categories/fiche.php htdocs/comm/action/index.php htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/fiche.php htdocs/product/composition/fiche.php htdocs/product/price.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php	2014-10-12 02:54:34 +02:00
Laurent Destailleur	a2fed6f214	Fix: miss dol_fiche_end	2014-10-05 23:26:42 +02:00
aspangaro	7e11fa06bb	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-10-05 16:35:38 +02:00
Laurent Destailleur	97eec37f1c	Uniformize code: property "nom" for thirdparty is aliased into "name" ... everywhere.	2014-10-04 17:20:17 +02:00
aspangaro	f70e8b766f	Merge remote-tracking branch 'Upstream/develop' into develop-loan ... Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-09-29 20:40:53 +02:00
Laurent Destailleur	8121aeb0b6	Merge pull request #1914 from aternatik/fix_ldapgrp ... Fix: gidNumber ldap attribute was not defined	2014-09-29 16:39:36 +02:00
Raphaël Doursenaud	f01e76f686	Removed unmaintaned OScommerce module	2014-09-29 15:22:48 +02:00
Laurent Destailleur	e0aa140960	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-09-29 14:01:40 +02:00
Laurent Destailleur	8ccb581185	Fix: Change for php 5.6 ... New: Management of color into type of events dictionnary (visible into peruser view). New: Can disable predefined type of events.	2014-09-29 13:21:03 +02:00
Regis Houssin	f1f4fc18e9	Fix: use "doc" instead "pdf" dir and uniformize code	2014-09-29 11:08:50 +02:00
Regis Houssin	f233d4f610	New: add doc models management in contract module	2014-09-28 20:39:02 +02:00
aspangaro	250b57ca0a	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-09-28 14:00:26 +02:00
Regis Houssin	0997a7960d	Fix: uniformize code	2014-09-28 12:53:06 +02:00
Laurent Destailleur	14ab409ca9	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/stock.php htdocs/admin/system/index.php htdocs/comm/fiche.php htdocs/core/lib/admin.lib.php htdocs/core/lib/holiday.lib.php htdocs/core/lib/pdf.lib.php htdocs/core/login/functions_forceuser.php htdocs/core/login/functions_http.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/filefunc.inc.php htdocs/holiday/define_holiday.php htdocs/opensurvey/fonctions.php htdocs/societe/canvas/actions_card_common.class.php test/phpunit/CompanyBankAccountTest.php test/phpunit/ExportTest.php test/phpunit/FactureTest.php test/phpunit/FunctionsLibTest.php test/phpunit/PropalTest.php test/phpunit/SocieteTest.php test/phpunit/WebservicesInvoicesTest.php test/phpunit/WebservicesThirdpartyTest.php	2014-09-28 02:14:32 +02:00
Laurent Destailleur	5fdd798e91	Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on ... parameter).	2014-09-27 17:13:15 +02:00
Regis Houssin	179da9a220	Fix: uniformize code	2014-09-25 13:50:01 +02:00
Regis Houssin	64b757ed81	Fix: add generic doc and use doc dir instead pdf	2014-09-25 12:44:57 +02:00
Regis Houssin	3daf06960d	Fix: add generic doc and uniformize code	2014-09-25 12:07:11 +02:00
aspangaro	a58025c601	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2014-09-23 21:24:29 +02:00
Laurent Destailleur	dd86453020	Add field color into table of type of events	2014-09-23 17:54:03 +02:00
Eden	248ef4fd46	Fix: gidNumber ldap attribute was not defined i using posixGroup objectClass	2014-09-23 00:13:51 +02:00
aspangaro	1bcc2c92a3	compta_mode -> accounting_mode	2014-09-21 20:42:46 +02:00
aspangaro	e147259e95	Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6	2014-09-21 20:30:55 +02:00
aspangaro	08b9e05425	New Module : Manage Financial Loan	2014-09-21 17:42:38 +02:00
Laurent Destailleur	ee4d697172	Fix several bugs reported by scrutinizer	2014-09-19 14:57:31 +02:00
Laurent Destailleur	ca3c5d9513	Fix: invalid list of params ... Fix: loading of sql menu	2014-09-19 14:36:55 +02:00
Laurent Destailleur	12ae552486	Fix: Option to make pg_dump/restore	2014-09-17 17:38:07 +02:00
Laurent Destailleur	83447243ae	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: build/debian/get-orig-source.sh htdocs/product/class/product.class.php htdocs/societe/soc.php	2014-09-15 22:58:39 +02:00
Laurent Destailleur	05f3a47018	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: build/debian/control htdocs/compta/bank/account.php htdocs/fourn/paiement/fiche.php htdocs/product/class/product.class.php htdocs/product/fiche.php	2014-09-15 22:52:59 +02:00
Marcos García de La Fuente	74e16db632	[ bug #1589 ] Menu type in "Edit menu" page is not translated	2014-09-14 13:14:03 +02:00
aspangaro	4c52a6ee6f	Add admin page into salaries to manage accountancy	2014-09-10 04:53:18 +02:00
aspangaro	7cc3fe9c95	Merge remote-tracking branch 'Upstream/develop' into develop-accounting	2014-09-09 20:41:19 +02:00
Laurent Destailleur	9e2a0cb671	Fix: debug of accountancy module	2014-09-09 09:46:57 +02:00
aspangaro	1223be1e5b	Move language key into admin.lang file	2014-09-08 21:51:40 +02:00
Laurent Destailleur	531a48388b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-09-05 09:33:30 +02:00
Laurent Destailleur	a93ad958ac	New: Add help info of field type into dictionary of payment types.	2014-09-05 09:33:12 +02:00
aspangaro	ec47bc05b5	Missing key language	2014-09-04 04:48:48 +02:00
Laurent Destailleur	adc96cc826	Merge pull request #1853 from aspangaro/develop-accounting ... Integration of module Accounting Expert	2014-09-02 19:14:21 +02:00
Laurent Destailleur	38233ca05d	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/limits.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/core/ajax/ziptown.php	2014-09-02 13:46:47 +02:00
Juanjo Menent	cc858b2af0	Fix SQL syntax ... ChangeLog	2014-09-01 22:41:36 +02:00
Florian HENRY	fd03f582c9	Fix SQL syntax	2014-08-31 12:38:33 +02:00
aspangaro	d03763f6c3	Update Accounting Expert integration	2014-08-28 06:30:01 +02:00
aspangaro	71265558d2	Integrate module Accounting Expert	2014-08-27 07:03:42 +02:00
Laurent Destailleur	04b611f758	Merge pull request #1820 from aspangaro/develop-trad1 ... Qual: Renamed table llx_c_civilite into llx_c_civility	2014-08-21 23:25:49 +02:00
Laurent Destailleur	eb3c53d897	Merge pull request #1823 from Devensys/Develop-removeVersion ... Hidden version on login page	2014-08-21 23:24:08 +02:00
aspangaro	f774ff487b	Merge branch 'Upstream/develop'	2014-08-18 11:56:49 +02:00
Laurent Destailleur	be6f99c10e	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/dict.php htdocs/core/db/mysql.class.php htdocs/core/db/mysqli.class.php htdocs/core/lib/ajax.lib.php	2014-08-17 19:34:12 +02:00
Laurent Destailleur	b58f6b36a8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-08-17 17:48:33 +02:00
Laurent Destailleur	45927cc986	Fix pb of links into state-region-country: ... - no more rowid into insert sql requests - link, so foerign key must be on fk_region->code_region - label was not visible - unique keys must be into file .key.sql	2014-08-17 17:47:25 +02:00
Laurent Destailleur	b0ebaec0da	Fix: Add more log and missing error message	2014-08-17 12:43:24 +02:00
Laurent Destailleur	f392eb4c94	Merge pull request #1803 from defrance69/patch-15 ... add company contact tabs	2014-08-17 01:05:18 +02:00
Laurent Destailleur	7edf2eacea	New: Each user can include its own external ics calendar into dolibarr ... agenda view.	2014-08-15 17:08:05 +02:00
Laurent Destailleur	96cb9fe6cb	Merge remote-tracking branch 'origin/3.6' into develop	2014-08-15 02:35:06 +02:00
Laurent Destailleur	6b6b372579	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/theme/eldy/graph-color.php	2014-08-15 02:28:16 +02:00
Andrelec1	1ffb964dd1	Change method ... Replace by existing constant ..	2014-08-14 16:06:43 +02:00
BENKE Charles	5d81eca1a3	change option name ... replace MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES by MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES	2014-08-14 10:47:28 +02:00
Laurent Destailleur	d6c4993c40	Merge pull request #1822 from Devensys/Devlop-PayTotalButton ... Add button to fill amount paiement	2014-08-14 01:28:20 +02:00
Laurent Destailleur	18b44ccfae	Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into ... aspangaro-develop-favorite Conflicts: htdocs/core/class/html.form.class.php	2014-08-14 01:04:15 +02:00
Laurent Destailleur	de3d66eaeb	Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into ... aspangaro-develop-accounting3 Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-08-14 00:59:48 +02:00
Laurent Destailleur	98f140962a	Merge remote-tracking branch 'origin/3.6' into develop	2014-08-13 19:25:55 +02:00
Laurent Destailleur	6727385765	Fix: error message	2014-08-13 15:07:22 +02:00
Florian HENRY	329c0b2913	Fix: Missing include files.lib.php in some pages ti use ... dol_delete_recursive	2014-08-13 12:42:55 +02:00
Andrelec1	8b6d613cb0	Hidde version on login page ... Create option and use it in login template	2014-08-12 12:29:20 +02:00
Andrelec1	49d1983acd	trigger on total ... Add hook on js for total	2014-08-12 11:40:24 +02:00
aspangaro	1a87d98357	Qual: Renamed table llx_c_civilite into llx_c_civility ... field civilite into label in the same table and field civilite into civility in other table	2014-08-12 06:03:27 +02:00
Andrelec1	3548f72d8a	Start implement	2014-08-11 18:14:40 +02:00
aspangaro	9af336b53b	Add accountancy code for trips & fees and renamed libelle field into label	2014-08-10 20:41:52 +02:00
Laurent Destailleur	2c1db4cdd2	Revert "Update facture.php foreach wrong argument" ... This reverts commit bc0c0eeddb.	2014-08-10 20:36:56 +02:00
aspangaro	0738103da8	Renamed llx_c_pays to llx_c_country & field "libelle" to "label"	2014-08-10 13:37:39 +02:00
Laurent Destailleur	06fcbe12a8	Add MAIN_DEFAULT_WORKING_DAYS and MAIN_DEFAULT_WORKING_HOURS into ... company setup.	2014-08-08 10:44:10 +02:00
Laurent Destailleur	75eb9cadc7	Merge pull request #1809 from KreizIT/fix_1549 ... Fix : [ bug #1549 ] It's not possible add ExtraFields	2014-08-08 01:52:13 +02:00
Laurent Destailleur	1c59f2df1c	New: Add check to return dir into setup that server can't read	2014-08-07 13:02:13 +02:00
KreizIT	c94c0699d8	Fix : [ bug #1549 ] Itïs not possible add ExtraFields	2014-08-06 17:38:44 +02:00
Laurent Destailleur	4c91788941	Fix: Can not set option when using in nojs mode.	2014-08-03 22:08:25 +02:00
Laurent Destailleur	6ff57e57c2	Fix: external link is visible when a module is using tabhelp of ... dictionary.	2014-08-02 00:34:54 +02:00
Laurent Destailleur	6a815dd585	Fix: external link is visible when a module is using tabhelp of ... dictionary.	2014-08-02 00:34:15 +02:00
Laurent Destailleur	852b78f79f	Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for ... constants into database driver classes.	2014-08-01 00:53:29 +02:00
Laurent Destailleur	9fff30416a	Qual: Remove usage of getStaticMember function dir constants.	2014-07-31 20:12:21 +02:00
Laurent Destailleur	b31bf68376	New: Start to work on data check for dictionnary tables.	2014-07-28 00:47:27 +02:00
Laurent Destailleur	bf9313dd87	getBrowserInfo can return type of layout (classic/phone/tablet)	2014-07-27 20:56:26 +02:00
Laurent Destailleur	b964f9e9e3	New: Add info page about browser. ... Qual: Removed dedicated code to change top menu according to dol_optimize_smallscreen. We must use instead size of screen into css.	2014-07-27 14:13:25 +02:00
Laurent Destailleur	ad104470d8	Fix: CheckStyle	2014-07-20 14:55:18 +02:00
Marcos García de La Fuente	4f4ac30fc0	Deprecating arbitrary use of dol_htmloutput* functions	2014-07-20 02:32:13 +02:00
Marcos García de La Fuente	43597c1731	Migrated old error notifications to the """new""" system	2014-07-20 01:43:46 +02:00
Marcos García de La Fuente	ac824728bc	Migrated old error notifications to the """new""" system	2014-07-20 01:09:43 +02:00
Marcos García de La Fuente	434bb1bec7	Migrated old message notifications to the """new""" system	2014-07-20 00:10:40 +02:00
Raphaël Doursenaud	94bcb0dc40	Labels and autofocus for company card forms	2014-07-12 14:45:23 +02:00
Laurent Destailleur	32b015e661	New: Type of thirdparties can accept a country (to show list of types ... specific for a country).	2014-07-11 13:56:35 +02:00
Laurent Destailleur	90a5f6c7ef	Qual: Remove end php tag.	2014-07-08 01:02:30 +02:00
Laurent Destailleur	688d58413b	Merge pull request #1710 from aspangaro/develop-accounting2 ... New feature :: Add fiscal year	2014-07-07 21:28:35 +02:00
Laurent Destailleur	ce3fa14511	New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to ... create an automatic event into agenda. Qual: Removed hard coded rowid into data init.	2014-07-06 19:25:15 +02:00
aspangaro	9eaeaae2fb	Merge branch 'Upstream/develop'	2014-07-05 08:48:51 +02:00
aspangaro	be78e96313	Bug fix & add tab info	2014-07-05 08:47:01 +02:00
Juanjo Menent	9aa234255d	[ task #1063 ] Allow edit localtaxes rate for thirds	2014-07-04 18:26:56 +02:00
Laurent Destailleur	e496823778	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: .travis.yml ChangeLog htdocs/fourn/commande/fiche.php htdocs/install/mysql/migration/3.5.0-3.6.0.sql htdocs/product/stock/replenish.php	2014-07-04 14:14:40 +02:00
Laurent Destailleur	be4fe3d0d0	Merge branch 'syslog' of github.com:marcosgdf/dolibarr into ... marcosgdf-syslog Conflicts: htdocs/contrat/class/contrat.class.php htdocs/fichinter/class/fichinter.class.php htdocs/projet/class/project.class.php htdocs/projet/class/task.class.php	2014-07-04 13:43:50 +02:00
Laurent Destailleur	7ee1388582	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-07-04 12:22:10 +02:00
Laurent Destailleur	11abba30b3	Fix: Add information to help debug pb with TZ.	2014-07-04 11:58:41 +02:00
aspangaro	a2ac578712	Merge branch 'Upstream/develop'	2014-07-04 06:21:00 +02:00
Juanjo Menent	e30649dcd2	[ task #1063 ] Allow edit localtaxes rate for thirds. Works with company	2014-07-03 17:39:31 +02:00
Marcos García de La Fuente	7e1cf124b8	Merge branch 'develop' into syslog ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/product/class/product.class.php htdocs/product/stock/lib/replenishment.lib.php htdocs/societe/soc.php	2014-07-02 21:20:02 +02:00
Laurent Destailleur	31c27b8f7c	New: More option to define default filter setting of agenda views.	2014-06-29 23:35:00 +02:00
aspangaro	46320071a0	Merge branch 'Upstream/develop'	2014-06-29 05:42:37 +02:00
aspangaro	8cfdfbe47d	Update	2014-06-29 05:41:24 +02:00
Laurent Destailleur	d5e0bcfaee	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-06-26 22:54:36 +02:00
Laurent Destailleur	534e574379	Merge pull request #1668 from aspangaro/develop-dons ... Move donation receipt to french model cerfa 11580*03	2014-06-26 22:03:13 +02:00
aspangaro	56785f1149	Merge branch 'Upstream/develop'	2014-06-24 06:10:47 +02:00
aspangaro	3612fb02bc	Merge branch 'Upstream/develop'	2014-06-24 05:50:16 +02:00
Laurent Destailleur	0778d38b2c	Fix: Deprecated and no more used fields should not appear to user.	2014-06-21 18:08:32 +02:00
Laurent Destailleur	62b0d8a472	Fix: Deprecated and no more used fields should not appear to user.	2014-06-21 18:03:01 +02:00
Laurent Destailleur	5c0813e865	Fix: EMail test feature to make a test without html must not include any ... html.	2014-06-21 01:26:41 +02:00
Laurent Destailleur	8d1fdec8cf	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/lib/pdf.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/modProduct.class.php htdocs/fourn/commande/fiche.php htdocs/projet/fiche.php	2014-06-20 15:26:02 +02:00
Francis Appels	5b5473bc7c	Fix: [ bug #1509 ] Expedition admin submit error ... Expedition admin free text & watermark submit error	2014-06-19 10:02:58 +02:00
aspangaro	f4efd3b2e8	Move donation receipt to french model cerfa 11580*03	2014-06-15 22:18:19 +02:00
Marcos García de La Fuente	9fbd7806f0	More substitutions	2014-06-12 11:31:53 +02:00
Laurent Destailleur	47c982c506	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php	2014-06-10 08:45:08 +02:00
Laurent Destailleur	5853b9eb30	Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into ... marcosgdf-bug-1416 Conflicts: ChangeLog	2014-06-10 01:37:43 +02:00
Marcos García de La Fuente	0b73b44f34	Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the supplier order card	2014-06-09 23:38:06 +02:00
Marcos García de La Fuente	8a22a708b4	Fixed the bug for supplier invoice and supplier order pages	2014-06-09 22:55:38 +02:00
Marcos García de La Fuente	0810e6756a	Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration	2014-06-09 22:48:16 +02:00
Marcos García de La Fuente	ae4bd4445e	Moved dol_syslog query log to the database handler and decreased report level to DEBUG	2014-06-09 15:49:54 +02:00
Mainmich	bc0c0eeddb	Update facture.php foreach wrong argument ... Wrong array in foreach line 503.	2014-06-04 19:13:58 +02:00
aspangaro	67f05515d9	Add accountancy_code into llx_c_paiement	2014-06-03 06:19:24 +02:00
Laurent Destailleur	ccca46f380	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/comm/propal.php htdocs/comm/propal/list.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/lib/functions.lib.php htdocs/expedition/note.php htdocs/fourn/commande/liste.php htdocs/fourn/facture/fiche.php htdocs/main.inc.php htdocs/projet/tasks/index.php htdocs/theme/eldy/style.css.php	2014-05-29 19:20:48 +02:00
aspangaro	b384f91096	Merge branch 'upstream/develop'	2014-05-28 05:35:35 +02:00
aspangaro	dce9c2bc76	Fiscal year - 1st step	2014-05-28 05:34:10 +02:00
Laurent Destailleur	48bbcc6f4a	Fix: Button was not be enabled.	2014-05-27 10:45:58 +02:00
Raphaël Doursenaud	c48c3a9d91	Qual: remove PHP closing tag (again) ... These were reintroduced by careless merge	2014-05-26 13:51:25 +02:00
Laurent Destailleur	4b9d1b901b	Fix: [ bug #1401 ] Problème avec la génération des codes barres	2014-05-25 17:14:33 +02:00
Laurent Destailleur	e6f828cd86	Link to Preferred Partners missing.	2014-05-24 17:00:49 +02:00
Laurent Destailleur	2a6b2a4540	Fix: Stat page show no cache when there is, if user was using apc.	2014-05-24 14:00:58 +02:00
Laurent Destailleur	43bf9ba890	Fix: Import of ical files was broken ... Fix: Can import of ical files from BlueMind.	2014-05-23 04:28:57 +02:00
Laurent Destailleur	94335b186e	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/core/modules/propale/mod_propale_marbre.php	2014-05-21 20:30:07 +02:00
Laurent Destailleur	b146dcad31	Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5	2014-05-21 19:45:28 +02:00
Laurent Destailleur	753ef28168	Fix: Data are clean once registered into dictionnaries.	2014-05-20 16:08:05 +02:00
Laurent Destailleur	5709179cf0	Fix: Box was not added on correct side	2014-05-19 00:05:49 +02:00
Jean-François Ferry	5f74b86b18	Add dictionary to define type of resources	2014-05-10 22:07:12 +02:00
Laurent Destailleur	bcdf3e8a51	New: The combo list of juridical status is now sorted	2014-05-04 23:46:36 +02:00
Laurent Destailleur	c2c0a9b4bb	Merge pull request #1568 from GPCsolutions/closingtagremoval ... Qual: Remove the closing PHP tag	2014-05-04 18:08:37 +02:00
Laurent Destailleur	bdbd619a8e	Merge pull request #1566 from marcosgdf/usability ... Improved usability of admin/compta.php page	2014-05-04 17:58:54 +02:00
Laurent Destailleur	bc35728ea3	Merge pull request #1562 from marcosgdf/translation ... Improved translations	2014-05-04 17:39:36 +02:00
Raphaël Doursenaud	f8f502d013	Removed closing php tag ... http://php.net/manual/en/language.basic-syntax.phptags.php	2014-05-03 18:18:44 +02:00
Marcos García de La Fuente	6eae44b766	CS Fix	2014-05-03 17:10:47 +02:00
Marcos García de La Fuente	077dfab7a6	Added labels for the "Other options" inputs	2014-05-03 12:19:18 +02:00
Marcos García de La Fuente	6482c51858	Improved usability of admin/compta.php page	2014-05-03 12:11:30 +02:00
Laurent Destailleur	50c10d3d1e	Fix: Can disable features with PHPEXCEL (no DLSF compatible). ... Fix: Can disable features with CKEDITOR.	2014-05-03 02:20:26 +02:00
Laurent Destailleur	43253d877a	Fix: Can disable features with PHPEXCEL (no DLSF compatible). ... Fix: Can disable features with CKEDITOR.	2014-05-03 02:15:33 +02:00
Laurent Destailleur	b56f59b313	Perf: Avoid to isntantiate object 'form' into 'subform' classes when ... already available. Qual: Better information into xdebug page.	2014-05-01 16:26:57 +02:00
Marcos García de La Fuente	e53c55002f	Added missing translations	2014-05-01 16:23:18 +02:00
Laurent Destailleur	a9869802f4	Add link to setup page	2014-04-30 00:22:27 +02:00
Laurent Destailleur	11115eb773	Fix: Bad link ... Trans: Add missing translation keys.	2014-04-29 23:34:36 +02:00
Raphaël Doursenaud	83dd3a532b	Qual: Better type check	2014-04-23 18:23:50 +02:00
Laurent Destailleur	9a8a306d78	Qual: Method form->select_currency() has been removed. Use instead ... print form->selectCurrency(). Qual: Method form->select_methodes_commande() has been renamed into english name selectInputMethod().	2014-04-02 14:53:42 +02:00
Laurent Destailleur	d2cb5e8d2d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-03-31 22:56:47 +02:00
Laurent Destailleur	56c7d14b9a	We do not force disabling of ckeditor for phones. We let ckeditor ... decide (currently ckeditor is disabled with android).	2014-03-31 13:25:40 +02:00
Laurent Destailleur	76259a633c	Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have ... to do it everywhere at different places. Value is now 0 or 1.	2014-03-31 02:16:49 +02:00
Laurent Destailleur	b675b9b610	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/comm/action/fiche.php htdocs/core/class/conf.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/company.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/fourn/facture/fiche.php htdocs/langs/en_US/admin.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/projet/tasks/task.php	2014-03-31 00:44:45 +02:00
Laurent Destailleur	ed49f88446	Fix: deleting files into backup system tools. ... Fix: Dump using php not not include lock on tables that are deleted.	2014-03-31 00:19:31 +02:00
Laurent Destailleur	3d8fb60f94	Start to implement sepa format. Need serious tests.	2014-03-30 20:22:54 +02:00
Juanjo Menent	d98a5d4c6f	Fix: [ bug #1306 ] Fatal error when adding an external calendar	2014-03-22 13:01:38 +01:00
Juanjo Menent	e0b4bd9b0d	Fix: [ bug #1306 ] Fatal error when adding an external calendar	2014-03-22 13:00:23 +01:00
Laurent Destailleur	24dbfbba60	Qual: Still working on cleaning code for timezone management.	2014-03-21 18:05:08 +01:00
Maxime Kohlhaas	9c340d7af8	Task 672 : Prevent use of product not available	2014-03-15 12:45:56 +01:00
Laurent Destailleur	f1b05dd3c2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2014-03-13 12:37:39 +01:00
Laurent Destailleur	6cec011df6	New: Add manager name (ceo, director, president...) into main company ... information page.	2014-03-13 12:22:53 +01:00
Laurent Destailleur	1b85f83dbb	Merge pull request #1466 from marcosgdf/minor ... Minor style and translation corrections	2014-03-13 11:53:52 +01:00
Marcos García de La Fuente	735d30a7d3	Corrected features supported tooltip style in livraison tab	2014-03-11 13:20:52 +01:00
Marcos García de La Fuente	cc95163064	Added missing preview column for donations module	2014-03-11 13:20:32 +01:00
Marcos García de La Fuente	42622fc7c4	Changed agenda module configuration page	2014-03-11 12:51:37 +01:00
Marcos García de La Fuente	0f0228ca5a	Changed order module configuration page	2014-03-11 12:47:08 +01:00
Marcos García de La Fuente	31afd56897	Changed supplier module configuration page	2014-03-11 12:46:54 +01:00
Marcos García de La Fuente	1d357ec2f9	Removed odd tabs from some modules	2014-03-11 11:53:22 +01:00
Marcos García de La Fuente	371f0cbb8e	Fixed module name in contract admin setup page	2014-03-11 11:15:35 +01:00
Laurent Destailleur	2c0f1340d5	New: Update ckeditor to version 4 (part 2)	2014-03-08 13:17:20 +01:00
Laurent Destailleur	24b0ea6613	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: build/makepack-dolibarr.pl htdocs/comm/propal.php htdocs/compta/facture.php htdocs/fourn/class/fournisseur.commande.class.php	2014-03-03 19:38:02 +01:00
Laurent Destailleur	072bb709ff	Fix: dead code	2014-02-28 22:09:40 +01:00
Laurent Destailleur	1790f905c9	Removed some code specific to databases and use instead correct abstract ... method of drivers.	2014-02-25 18:25:17 +01:00
Laurent Destailleur	a797a5e665	Clean comment and make some implementations	2014-02-24 09:52:48 +01:00
Laurent Destailleur	6f962397e4	Start to work on a mass send remind feature.	2014-02-19 20:23:02 +01:00
Laurent Destailleur	c8d6a88f8a	Clean xdebug page.	2014-02-17 16:30:22 +01:00
Laurent Destailleur	908c39098d	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/comm/action/fiche.php	2014-02-16 19:47:51 +01:00
Laurent Destailleur	fd22c9b69a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-02-15 15:23:47 +01:00
Laurent Destailleur	7e3c2d40ba	New: Make difference between virtual and physical stock easier to ... understand.	2014-02-15 14:14:49 +01:00
Laurent Destailleur	7e2027ec39	Fix: Can not set delay to zero.	2014-02-14 13:05:49 +01:00
Laurent Destailleur	4b5748fd12	Fix: Can not set delay to zero.	2014-02-14 12:58:03 +01:00
Laurent Destailleur	b499efeccf	Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: htdocs/compta/sociales/index.php htdocs/compta/tva/index.php	2014-02-12 22:29:56 +01:00
Laurent Destailleur	7d74d0d3bd	CFix: The order field for prospect level was not visible making ... dictionnary useless.	2014-02-12 22:28:16 +01:00
Laurent Destailleur	46e9b5d550	Merge branch 'develop' of https://github.com/grandoc/dolibarr into ... grandoc-develop Conflicts: htdocs/langs/ar_SA/admin.lang htdocs/langs/el_GR/admin.lang htdocs/langs/es_ES/admin.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/tr_TR/admin.lang	2014-02-10 01:30:48 +01:00
Laurent Destailleur	ce8d13ead0	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: ChangeLog build/debian/changelog build/doxygen/dolibarr-doxygen.doxyfile build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/perl/virtualmin/dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/comm/action/fiche.php htdocs/filefunc.inc.php htdocs/install/check.php	2014-02-10 00:38:10 +01:00
Laurent Destailleur	bd25a98e03	New: Generation auto of barcode is available for product.	2014-02-10 00:24:20 +01:00
Laurent Destailleur	abc8649e02	Fix: Bug of import of agenda when using https link	2014-02-08 01:16:20 +01:00
Grand Philippe	1855ba556a	fix misspelled words	2014-02-05 17:53:30 +01:00
Laurent Destailleur	d8b8f8c646	Uniformize code for contacts forms.	2014-02-04 20:49:07 +01:00
Laurent Destailleur	efcff80a28	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: build/debian/control htdocs/fourn/facture/paiement.php	2014-02-03 18:44:48 +01:00
Laurent Destailleur	77b3c9d2eb	Fix: Bad constant	2014-02-02 19:00:56 +01:00
Laurent Destailleur	ba931e18d4	Work on barcode number generation. ... Normalize code for barcode module.	2014-01-31 18:12:54 +01:00
Laurent Destailleur	7f15aa4582	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2014-01-31 11:41:17 +01:00
Laurent Destailleur	1b88ab2355	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/contact/class/contact.class.php	2014-01-31 10:12:41 +01:00
Laurent Destailleur	a2afea7ba9	Work on barcode number generation. ... Normalize code for barcode module.	2014-01-30 18:21:04 +01:00
Laurent Destailleur	47ff6a68bb	Fix: Test were inverted.	2014-01-30 18:11:40 +01:00
Laurent Destailleur	bb1575e0e6	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-24 10:20:03 +01:00
Laurent Destailleur	21b43d7604	Fix: if module invoice is disabled, option to automatically classify ... order as billed does not exists, so "Classify billed" for order must be done manually from order card.	2014-01-23 20:02:19 +01:00
Laurent Destailleur	1fd67807ce	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-18 01:13:29 +01:00
Grand Philippe	c5689b86b4	Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1	2014-01-13 09:43:21 +01:00
Laurent Destailleur	c7ef0b7c57	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/societe/consumption.php	2014-01-07 16:41:00 +01:00
Laurent Destailleur	e99883f1a6	Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: htdocs/admin/modules.php	2014-01-06 19:18:06 +01:00
Laurent Destailleur	5b63b56143	Merge remote-tracking branch 'origin/3.3' into 3.4 ... Conflicts: ChangeLog	2014-01-06 19:13:40 +01:00
Laurent Destailleur	5a7fe6b4a7	Fix: Change to make debian package ok despite removal of ckeditor ... package.	2014-01-05 01:17:38 +01:00
Laurent Destailleur	29ae579298	Fix: Bad link	2013-12-27 20:29:30 +01:00
simnandez	3a496d1fa1	Fix: setup not saving changes	2013-12-26 11:33:47 +01:00
simnandez	91b104aeb8	Fix: setup not saving changes	2013-12-26 11:32:13 +01:00
simnandez	bf333d4f54	Fix: Some config data are shared between suppliers orders and suppliers ... invoices	2013-12-23 16:39:37 +01:00
simnandez	d6b2f96c19	Fix: Some config data are shared between suppliers orders and suppliers ... invoices	2013-12-23 16:38:38 +01:00
Laurent Destailleur	6946fdbcda	Merge remote-tracking branch 'origin/3.5' into develop	2013-12-16 00:09:29 +01:00
Laurent Destailleur	ef2f8ea67d	Removed some FIXME	2013-12-15 14:26:27 +01:00
Laurent Destailleur	fbeb61861a	Start to remove too low level permission. Philisophy of dolibarr is ... having a minum of permission. Starting to include one permission for each field we manage should not be into core. Also activation of "skype" field in a future should probably be rewritten to support as several communication id (chat, skype, hanghout) with only one feature.	2013-12-14 20:58:03 +01:00
Laurent Destailleur	5a4b5dcc26	Fix: Missing condition	2013-12-14 14:21:27 +01:00
Laurent Destailleur	eaf151d7f5	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/.gitignore htdocs/contact/fiche.php	2013-12-14 03:13:46 +01:00
Laurent Destailleur	42f032ded3	Merge remote-tracking branch 'origin/3.4' into 3.5	2013-12-14 01:30:15 +01:00
Laurent Destailleur	88aa0ad4da	Fix: Doxygen problems	2013-12-14 01:28:59 +01:00
Laurent Destailleur	286bdf91d4	Better detection of corrupted module files.	2013-12-10 18:52:48 +01:00
Laurent Destailleur	c3c6588426	Better detection of corrupted module files.	2013-12-10 16:25:27 +01:00
Laurent Destailleur	65593bce34	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2013-12-10 15:51:16 +01:00
Laurent Destailleur	8fb0986303	New: Add path file of trigger into admin trigger list page	2013-12-10 15:49:57 +01:00
Laurent Destailleur	c49af3da48	Fix: fields too large	2013-12-09 11:00:36 +01:00
Laurent Destailleur	7aa2c9dcd1	Fix: Error management with corrupted module files	2013-12-08 02:33:32 +01:00
Laurent Destailleur	a90f6ef368	Fix: Error management with corrupted module files	2013-12-08 02:32:04 +01:00
Laurent Destailleur	62e209520a	Fix: Update when submitting form	2013-12-07 00:53:58 +01:00
Laurent Destailleur	76d111b09f	Fix: W3C form must be outside table tag	2013-12-07 00:26:30 +01:00
Laurent Destailleur	42a3cbd27c	Fix: Missing css class	2013-12-04 23:21:57 +01:00
Laurent Destailleur	6c26684284	Fix: [ bug #1166 ] Supplier account number in its card does not respect ... order set in Banks module.	2013-12-01 23:17:16 +01:00
Laurent Destailleur	c475346248	Fix: [ bug #1166 ] Supplier account number in its card does not respect ... order set in Banks module.	2013-12-01 23:16:18 +01:00
Laurent Destailleur	88ae0a7945	Fix: the rename function is bugged with some windows. I add a ... workaround. Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.	2013-11-28 12:58:02 +01:00
Laurent Destailleur	6ffdc039a2	Fix: When option is not set, it must not appears as set.	2013-11-23 14:51:49 +01:00
Laurent Destailleur	3c0ee64648	New: Add links to social networks	2013-11-16 15:40:46 +01:00
Laurent Destailleur	b7190d2609	Fix: Several bugs.	2013-11-16 13:00:21 +01:00
Laurent Destailleur	628fbc7b7d	Fix: bad picto	2013-11-05 15:14:23 +01:00
aspangaro	d79ba9695a	Task 157 : Add a skype button	2013-11-04 21:41:36 +01:00
Laurent Destailleur	469dd03673	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_view.tpl.php htdocs/filefunc.inc.php htdocs/langs/nl_NL/margins.lang	2013-11-01 17:58:38 +01:00
Laurent Destailleur	ecb1f490ae	Fix: Option drop tables was broken	2013-11-01 17:20:36 +01:00
Laurent Destailleur	139ed68d6e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2013-11-01 17:19:43 +01:00
Laurent Destailleur	60d4033e59	Fix: Option drop tables was broken	2013-11-01 17:19:25 +01:00
Florian Henry	f512ef344a	Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE ... use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used	2013-10-30 12:24:51 +01:00
Laurent Destailleur	93c5720579	New: Add path to installed dir of external modules + Name and web of ... module provider.	2013-10-28 01:37:04 +01:00
Laurent Destailleur	bcd63d2466	Look: Remove useless array title bar	2013-10-25 18:01:45 +02:00
Laurent Destailleur	601de7a308	Fix: Test not working	2013-09-29 14:00:56 +02:00
Laurent Destailleur	072247f1c8	Fix: Use correct translation key	2013-09-25 19:07:25 +02:00
Laurent Destailleur	3fde695c94	Qual: Uniformise name of include files we use to share common code found ... into Actions area of pages (controllers).	2013-09-23 13:22:28 +02:00
Laurent Destailleur	50ce834dd0	[ bug #1049 ] agenda isn't save preferences	2013-09-11 11:08:38 +02:00
Laurent Destailleur	c151ef7b87	Qual: Remove duplicate form instanciation.	2013-09-06 12:10:09 +02:00
Laurent Destailleur	91718bc902	Qual: Replace deprecated call ->form_confirm with ->formconfirm	2013-09-06 11:51:24 +02:00
Grand Philippe	da384dda18	uniformize	2013-09-02 11:53:07 +02:00
Grand Philippe	4c5d9e8441	fix : activate a model	2013-09-02 10:17:45 +02:00
Grand Philippe	7a64ad1a26	some fix for contract model and clean code	2013-08-26 14:29:46 +02:00
Grand Philippe	e9dc71a9af	first step to complete contract functionalities	2013-08-24 16:18:30 +02:00
Grand Philippe	a0c04a548b	first step to complete contract functionalities	2013-08-24 15:59:49 +02:00
Grand Philippe	e56e0ebfb5	add extrafields	2013-08-24 13:49:55 +02:00
simnandez	b5e10a061b	[ task #1036 ] Normalized usage of setEventMessage instead of ... dol_htmloutput_mesg	2013-08-20 16:50:33 +02:00
simnandez	db46bc88ca	[ task #1036 ] Normalized usage of setEventMessage instead of ... dol_htmloutput_mesg	2013-08-20 16:10:01 +02:00
simnandez	9741b49b75	[ task #1036 ] Normalized usage of setEventMessage instead of ... dol_htmloutput_mesg	2013-08-20 09:28:23 +02:00
simnandez	fa5f09d6e0	[ task #1036 ] Normalized usage of setEventMessage instead of ... dol_htmloutput_mesg: Works in admin	2013-08-14 12:48:00 +02:00
simnandez	88356acc3a	[ task #1036 ] Normalized usage of setEventMessage instead of ... dol_htmloutput_mesg: Init works in admin	2013-08-14 11:11:49 +02:00
simnandez	b9e1a57f67	Fix: [ bug #1029 ] Tulip numbering mask	2013-08-08 10:00:06 +02:00
Laurent Destailleur	2a0597a6d4	Merge pull request #1161 from PaulPoulain/948-develop ... T948-develop :Classify Billed when the price of bill is greater than command	2013-08-07 16:48:32 -07:00
lalaina rasamoelina	0fa4739d47	T948-develop :Classify Billed when the price of bill is greater than command ... -In the workflow i've added on bouton which permitted to classify billed when the price of bills is greater than command,if her status is delivered /htdocs/admin/workflow.php	2013-08-06 16:57:40 +02:00
Juanjo Menent	aab90bfe76	Merge pull request #1154 from atm-maxime/develop ... Fix : supplier invoice mask + numbering	2013-08-06 06:37:32 -07:00
Maxime Kohlhaas	08a3b0c905	Fix : supplier invoice mask + numbering	2013-08-06 15:27:51 +02:00
Laurent Destailleur	afae841ae4	Fix: Permissions on files	2013-08-06 00:36:21 +02:00
Laurent Destailleur	c41a955cbe	Fix: Permissions on files	2013-08-06 00:36:04 +02:00
Laurent Destailleur	aab1a6d958	New: Add hook addHomeSetup	2013-08-05 10:10:44 +02:00
simnandez	283d9eb064	Text for invoices numbering modules more clear. Update ChangeLog	2013-08-02 15:27:37 +02:00
Juanjo Menent	ba8d094ec5	Merge pull request #1152 from atm-maxime/develop ... Better fix for email text / signature integration	2013-08-02 03:13:42 -07:00
simnandez	6d1a021382	New: [ task #1005 ] Update mercure module with replacement invoices.	2013-08-02 12:11:14 +02:00
Maxime Kohlhaas	229c2d890f	Add possibility to define default VAT accountancy code for purchase	2013-08-02 10:43:53 +02:00
Maxime Kohlhaas	a6ef341ae7	Task # 1016 : can define a specific numbering for deposits	2013-08-01 16:30:31 +02:00
Maxime Kohlhaas	eccbf89ecd	Bank account sharing for multi company	2013-08-01 16:15:53 +02:00
Laurent Destailleur	df0a8e0829	Fix: Bad link	2013-07-31 18:43:37 +02:00
Laurent Destailleur	e234d5342d	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: htdocs/contrat/liste.php	2013-07-31 12:45:39 +02:00
Laurent Destailleur	88d1e7258b	Merge pull request #1140 from atm-maxime/develop ... Task # 853 : Can hide in conf the search by product supplier ref	2013-07-30 03:29:12 -07:00
Laurent Destailleur	1c24f9e35e	Merge pull request #1138 from atm-maxime/3.4 ... Fix : Numbering on supplier invoice was not saved and on shipment displa...	2013-07-30 03:22:29 -07:00
Maxime Kohlhaas	1b54efcaaf	Task # 853 : Can hide in conf the search by product supplier ref, and displayed only if product and supplier module are enabled	2013-07-30 11:26:37 +02:00
Maxime Kohlhaas	f9c2910f84	Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok	2013-07-30 09:21:45 +02:00
Cédric Salvador	e3d5f086b6	background color	2013-07-29 12:31:15 +02:00
Cédric Salvador	53265591fc	separated replenishment configuration	2013-07-29 12:31:12 +02:00
Cédric Salvador	52cfecd0af	added an option to use virtual stock instead of physical stock	2013-07-29 12:31:12 +02:00
Cédric Salvador	5f526fd84a	separated replenishment configuration	2013-07-29 12:31:08 +02:00
Cédric Salvador	9b4601bcf2	added an option to use virtual stock instead of physical stock	2013-07-29 12:31:07 +02:00
Laurent Destailleur	36c73c4798	Look: Beautify backup page.	2013-07-28 17:25:58 +02:00
Laurent Destailleur	67820774bb	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: ChangeLog htdocs/commande/fiche.php htdocs/core/class/extrafields.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php	2013-07-27 14:21:47 +02:00
Laurent Destailleur	3c6b1f17d1	Fix: print of a function that already contains the print.	2013-07-27 14:10:57 +02:00
Laurent Destailleur	a386179f47	New: Numbering models with a suffix for specific country is visible only ... if company is from this country.	2013-07-26 15:17:36 +02:00
Laurent Destailleur	5608e320f7	New: Can add a suffix into filename of template after -. This may be ... used in future as specific criteria to filter list of numbering models to show.	2013-07-26 15:10:56 +02:00
Laurent Destailleur	68d83dd653	Some fix into perf.php page.	2013-07-24 00:34:08 +02:00
Laurent Destailleur	d802470aae	I killed <td nowrap>. Hello <td class="nowrap"> !	2013-07-19 14:23:42 +02:00
Maxime Kohlhaas	01e4d905fb	Start work on bank sharing for multi-company	2013-07-19 09:19:20 +02:00
Maxime Kohlhaas	9e5286bce9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 ... Conflicts: htdocs/core/class/html.formfile.class.php	2013-07-14 13:27:41 +02:00
Laurent Destailleur	b5820315f9	Fix: Correct permissions on files	2013-07-13 10:34:19 +02:00
Laurent Destailleur	2c0a01fc8c	Merge remote-tracking branch 'origin/3.4' into develop	2013-07-11 17:57:06 +02:00
Maxime Kohlhaas	0d40debeac	Merge branch 'develop' of github.com:atm-maxime/dolibarr into mko862 ... Conflicts: htdocs/admin/system/perf.php	2013-07-11 17:17:43 +02:00
Maxime Kohlhaas	3c7f4a3548	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 ... Conflicts: htdocs/admin/system/perf.php	2013-07-11 15:55:33 +02:00
Geoffrey	54961036be	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop ... Conflicts: htdocs/admin/system/perf.php	2013-07-11 15:40:10 +02:00
Laurent Destailleur	158a2b8ca8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/.gitignore	2013-07-11 11:52:32 +02:00
Maxime Kohlhaas	9d931b7b05	Task # 862 : ODT templates on shipment	2013-07-10 15:54:28 +02:00
Maxime Kohlhaas	cfc999a06d	Merge	2013-07-10 15:44:53 +02:00
Maxime Kohlhaas	8f72e16444	Remove duplicate code	2013-07-10 15:34:36 +02:00
simnandez	ca406d0980	Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS	2013-07-10 15:34:16 +02:00
simnandez	50395fc8c4	Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS	2013-07-10 15:32:29 +02:00
Laurent Destailleur	a4abfe1abc	New: Can add an event automatically when a projet is create.	2013-07-10 14:46:16 +02:00
Laurent Destailleur	a60cc916f6	Merge remote-tracking branch 'origin/3.3' into 3.4	2013-07-10 10:34:56 +02:00
Laurent Destailleur	752bc0ccff	Work on tool for performance advice.	2013-07-09 18:45:14 +02:00
Laurent Destailleur	f4428c8a8a	Fix: Bad link	2013-07-09 15:27:06 +02:00
Laurent Destailleur	0ca4e4ffe8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2013-07-09 13:51:27 +02:00
Laurent Destailleur	5706779c8b	New: Add a page on performance advice	2013-07-09 13:50:20 +02:00
Laurent Destailleur	c1cb5e9bff	Fix geoipmaxmind module	2013-07-09 00:19:58 +02:00
Laurent Destailleur	7c163f7be3	Fix: Running fixdosfile onto all project	2013-07-07 13:17:48 +02:00
Laurent Destailleur	7b5e0678db	New: Make some changes to allow usage of alternative ... $dolibarr_main_url_root variables. Can now use several alternative path. Fix several bugs with all code.	2013-07-07 03:26:51 +02:00
Laurent Destailleur	529a58cc9d	New: Add advice into info help	2013-07-05 12:04:55 +02:00
Laurent Destailleur	6f5a918373	New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page. ... Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME now accept "|langfile" into translation key to use a specific language file.	2013-07-02 21:53:34 +02:00
Laurent Destailleur	af4651f1a2	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: build/perl/virtualmin/dolibarr.pl htdocs/core/lib/files.lib.php htdocs/langs/en_US/projects.lang htdocs/langs/fr_FR/projects.lang htdocs/public/paybox/paymentko.php htdocs/public/paybox/paymentok.php htdocs/public/paypal/paymentko.php htdocs/public/paypal/paymentok.php htdocs/webservices/server_other.php	2013-06-25 23:22:00 +02:00
Laurent Destailleur	8359a34545	Merge remote-tracking branch 'origin/3.3' into 3.4 ... Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/perl/virtualmin/dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/compta/facture/class/facture-rec.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/filefunc.inc.php	2013-06-25 21:31:24 +02:00
Laurent Destailleur	2af8f295b1	Fix: warning not always visible. Depends if addon modules were ... installed. Var should provide a quick fix.	2013-06-25 21:25:09 +02:00
Laurent Destailleur	a8547b5375	New: Add property hidden into module descriptor to allow to hide a ... module according to some dynamic conditions.	2013-06-24 18:31:56 +02:00
Regis Houssin	05bd035488	Fix: convert line delimiters	2013-06-24 17:34:22 +02:00
Grand Philippe	b599481ef6	standardize code	2013-06-20 09:18:12 +02:00
Florian Henry	9f03074127	- New: [ task #926 ] Add extrafield feature on order lines ... - New: [ task #927 ] Add extrafield feature on Proposal lines - New: [ task #928 ] Add extrafield feature on invoice lines	2013-06-10 16:05:41 +02:00
Laurent Destailleur	c3f5e0c6ee	New: Show version of client lib used by mysql drivers	2013-06-07 19:19:11 +02:00
Cédric Salvador	b747b0349d	merge	2013-06-06 18:31:33 +02:00
Laurent Destailleur	e25651204c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/lib/admin.lib.php	2013-06-05 18:56:41 +02:00
Regis Houssin	c9a71439b2	Fix: EOF	2013-06-05 16:24:32 +02:00
Laurent Destailleur	ebb8f05f09	Subscription to ML can also be done according to member type	2013-06-05 15:53:27 +02:00
Laurent Destailleur	eac4aa7e28	New: Module mailman can subscribe/unsubscribe to ML according to ... categories of member.	2013-06-05 15:44:42 +02:00
Laurent Destailleur	3e1d2c3e63	Qual: Mutualized and uniformize code	2013-06-05 11:21:45 +02:00
Laurent Destailleur	c4f90f8174	Merge remote-tracking branch 'origin/3.4' into develop	2013-06-05 11:10:25 +02:00
Laurent Destailleur	7aa145ae6a	Fix: Previous fix was not complete	2013-06-05 11:09:54 +02:00
Laurent Destailleur	650158dd59	Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4	2013-06-05 10:51:09 +02:00
Laurent Destailleur	f83ab0de70	Fix: ModelDoc Activation bug	2013-06-05 10:49:12 +02:00