5453 Commits

Author	SHA1	Message	Date
Laurent Destailleur	e1b19b831a	NEW An external module can hook and add mass actions	2017-06-02 23:57:37 +02:00
Laurent Destailleur	66420d0e80	Restore lost file and better generation of modules	2017-06-02 23:02:48 +02:00
Laurent Destailleur	9e629bdb02	Work on modulebuilder	2017-06-02 20:01:25 +02:00
Laurent Destailleur	c59d216cf5	NEW Can read time spent of others (hierarchy only or all if granted)	2017-06-02 13:24:45 +02:00
phf	64cd1e0923	Fix get extrafields value from getOptionalsFromPost give an error with chkbxlst type on propaldet for exemple	2017-06-02 12:31:03 +02:00
Laurent Destailleur	c70beaa56b	Complete work for mutualizing generic substitution system.	2017-06-01 01:57:22 +02:00
Laurent Destailleur	10ac53077e	Code comment	2017-05-31 11:51:38 +02:00
Laurent Destailleur	292571688b	Fix error message not reported	2017-05-31 10:49:06 +02:00
Regis Houssin	aa780ea33b	Fix: missing dot	2017-05-30 19:15:37 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	df729d8889	Fix travis	2017-05-29 19:28:43 +02:00
Laurent Destailleur	d56cd44ebc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-29 19:11:41 +02:00
Laurent Destailleur	ab5545d02d	Merge pull request #6898 from defrance/patch-12 ... $resaction need in 5.0.x too	2017-05-29 11:41:22 +02:00
BENKE Charlie	18799c3a7f	Changes Done ... question need to change $actionclassinstance->results in $actionclassinstance->resactionss ???	2017-05-29 11:00:08 +02:00
Laurent Destailleur	452579150d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/html.form.class.php	2017-05-29 10:43:26 +02:00
Laurent Destailleur	e667d72547	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/build_class_from_table.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php	2017-05-29 10:41:51 +02:00
Laurent Destailleur	16456cf19f	Merge pull request #6891 from hregis/develop_api ... NEW add REST api "memberstypes"	2017-05-29 10:29:04 +02:00
Laurent Destailleur	d03d179fa3	FIX Fullname when member is a moral entity with no name.	2017-05-28 23:43:24 +02:00
Laurent Destailleur	c4f09b8894	Work on modulebuilder	2017-05-28 14:43:17 +02:00
BENKE Charlie	e4f7f2a0b2	$resaction need in 5.0.x too	2017-05-26 12:39:49 +02:00
Regis Houssin	18886849eb	New: add REST api "memberstypes"	2017-05-25 08:54:30 +02:00
Alexandre SPANGARO	e4f5d45c45	Remove old code (selectjournal_accountancy_bookkepping)	2017-05-25 07:10:09 +02:00
Alexandre SPANGARO	1f079fac9d	Move html.formventilation.class.php to html.formaccounting.class.php	2017-05-25 06:57:28 +02:00
Laurent Destailleur	e5fe629a0e	NEW Extrafields support formulas to be computed using PHP expressions	2017-05-24 22:48:44 +02:00
Laurent Destailleur	aef9ef2d75	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-24 13:46:03 +02:00
Laurent Destailleur	6eeb82ec70	FIX dialog window with md theme must not be hidden by left menu part.	2017-05-24 13:45:26 +02:00
Laurent Destailleur	80ce8da7a3	Fix migration errors and responsive design	2017-05-23 15:13:52 +02:00
Laurent Destailleur	1a8884bbbe	NEW Can filter on year and product tags on the product statistic page	2017-05-22 15:20:52 +02:00
Laurent Destailleur	52b5a8ece7	More powerfull dol_move function.	2017-05-21 14:06:43 +02:00
Laurent Destailleur	2dd2ab1003	Look and feel v6	2017-05-20 20:59:54 +02:00
Laurent Destailleur	80cbc28385	NEW Add REST API to push a file.	2017-05-20 15:52:36 +02:00
Laurent Destailleur	807c77f754	Fix inconsistent options	2017-05-19 18:03:49 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
Laurent Destailleur	7dbe3b1da9	Merge pull request #6843 from aspangaro/6.0-multijournal ... Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-18 17:45:21 +02:00
florian HENRY	82cac745e3	FIX 6863	2017-05-18 14:18:59 +02:00
Laurent Destailleur	0b52c43e05	Fix bad selection of progress when not known	2017-05-18 11:35:12 +02:00
Laurent Destailleur	1a1b27d68c	Fix input of duration	2017-05-18 11:13:18 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Laurent Destailleur	b29d0385e6	NEW Can send an email to a user from its card.	2017-05-15 00:15:56 +02:00
Alexandre SPANGARO	143c019905	Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-14 08:07:34 +02:00
Laurent Destailleur	e0abba5cf2	Merge pull request #6831 from Gecka-Apps/5.0-fixes ... Fix: when sending a mail the default template used should be the first positioned template	2017-05-13 19:35:58 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Dinclaux	8ae05a9651	Fix: when sending a mail the default template used should be the first positionned template	2017-05-11 13:38:17 +11:00
Laurent Destailleur	cd72c50356	Merge pull request #6799 from Dolibarr/scrutinizer-patch-2 ... Scrutinizer Auto-Fixes	2017-05-11 00:04:12 +02:00
Laurent Destailleur	30cf3f2bda	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/class/account.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/install/mysql/tables/llx_bank_account.sql	2017-05-11 00:03:06 +02:00
Laurent Destailleur	922fa088b4	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/boxes/box_services_expired.php	2017-05-10 23:47:33 +02:00
Laurent Destailleur	b2e9d4cc21	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-05-10 23:42:49 +02:00
Laurent Destailleur	2da0a129d1	Multiple file upload on by default on desktop.	2017-05-10 23:41:43 +02:00
Laurent Destailleur	164f3954ee	Merge pull request #6824 from ATM-Marc/NEW_multiple_fileupload ... NEW permit multiple file upload in linked documents tab	2017-05-10 23:24:41 +02:00
Laurent Destailleur	2b64cf0ebe	Update html.formfile.class.php	2017-05-10 23:24:33 +02:00
Laurent Destailleur	1c7d9b9d9a	Merge pull request #6804 from aspangaro/6.0-multijournal ... New : Accountancy - Add a list to select the bank journal in bank card	2017-05-10 22:46:30 +02:00
jfefe	d410a320d7	WIP #6504: CVE-2017-7886 ... 'defaultlang' attribute was not filtered before database request which cause an SQL injection.	2017-05-10 20:32:54 +02:00
Laurent Destailleur	5a96ae54b9	FIX Link to files on bank account tab broken with multicompany ... FIX Link to preview on thirdparty broken with multicompany	2017-05-10 19:08:07 +02:00
Marc de Lima Lucio	984531411d	NEW: permit multiple file upload in linked documents	2017-05-10 15:01:27 +02:00
Laurent Destailleur	e5c898e0d6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/fichinter/list.php htdocs/product/list.php htdocs/projet/tasks/list.php	2017-05-10 00:48:27 +02:00
Laurent Destailleur	9fe28c9b2c	NEW Can disable all overwrote translations in one click.	2017-05-09 10:08:04 +02:00
Laurent Destailleur	05d6c2cd75	Fix no more use of constant	2017-05-09 01:36:20 +02:00
Alexandre SPANGARO	a3602ff6b4	Add journal list in new movement card	2017-05-08 06:20:17 +02:00
Alexandre SPANGARO	dd97bbdc82	Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal	2017-05-07 15:10:30 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +02:00
Alexandre SPANGARO	68aaef2f66	Add list to select journal in bank	2017-05-06 08:06:01 +02:00
Alexandre SPANGARO	a4defb8102	Add html form for accountancy journals list	2017-05-06 07:02:34 +02:00
Laurent Destailleur	d53654e64f	Look and feel v6	2017-05-05 20:45:06 +02:00
Scrutinizer Auto-Fixer	d93552c8c5	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-05-05 17:13:29 +00:00
Laurent Destailleur	2e5c32eb62	Merge pull request #6748 from atm-florian/5.0 ... FIX : #6747	2017-05-05 19:06:14 +02:00
Laurent Destailleur	806157ae40	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 17:52:22 +02:00
Laurent Destailleur	15d20497c8	FIX #6795 #6796	2017-05-05 17:46:22 +02:00
Laurent Destailleur	a8292ce990	Code comment	2017-05-05 17:27:16 +02:00
Laurent Destailleur	885a636351	Debug new journal list page	2017-05-05 16:35:05 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	eb2124bfc8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-05 14:14:53 +02:00
Laurent Destailleur	2120b9af85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/theme/eldy/style.css.php	2017-05-05 14:14:21 +02:00
Laurent Destailleur	a1ac3b470b	Change menu for setup of predefined emails	2017-05-05 14:01:20 +02:00
Laurent Destailleur	90542d119a	FIX trigger name and status set of setStatus for commercial proposal	2017-05-05 13:25:30 +02:00
Laurent Destailleur	9785e9b298	Update commonobject.class.php	2017-05-05 09:57:51 +02:00
Laurent Dinclaux	24a2fb57ea	Resolved merge conflict	2017-05-05 10:22:46 +11:00
Laurent Destailleur	089b882033	Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone ... FIX ajax autocomplete on clone	2017-05-04 21:05:40 +02:00
Laurent Destailleur	bf616cbe05	Fix bad var	2017-05-04 19:05:02 +02:00
florian HENRY	b8d63ae6c0	Better fix	2017-05-04 14:04:30 +02:00
florian HENRY	9958fcaa6f	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0	2017-05-04 14:02:28 +02:00
Laurent Destailleur	c196e79bf4	Merge branch 'develop' into FIX_inventory	2017-05-04 13:50:53 +02:00
Laurent Destailleur	0c76db7973	FIX #6698 #6742	2017-05-04 13:41:37 +02:00
Laurent Destailleur	7d5b5cf86a	Better behavior for tooltip on click	2017-05-04 13:09:42 +02:00
Laurent Destailleur	c7d736376f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-04 12:41:49 +02:00
Laurent Destailleur	7ec46b3bd6	Finished work to have substitution keys code mutualized.	2017-05-04 12:35:45 +02:00
Laurent Destailleur	f543461e9b	Complete the substitution array with substitution array with all ... possible keys	2017-05-04 11:21:28 +02:00
Laurent Destailleur	3871da0324	Merge pull request #6729 from atm-florian/dev_importexport_ressources ... NEW : Add module resources import/export	2017-05-04 09:43:00 +02:00
Laurent Dinclaux	f63f28c7fe	Fix vat_src_code propagation between post types	2017-05-03 21:37:30 +11:00
alexis portable	da4d179d36	fix travis	2017-05-02 23:20:23 +02:00
alexis portable	d1a443f0f0	fix camelcase for travis	2017-05-02 23:11:05 +02:00
Laurent Destailleur	3917bdfc79	Fix vat_src_code propagation.	2017-05-02 22:37:43 +02:00
alexis Algoud	6138d197e4	FIX major issues for inventory ... - Move all needed declaration from coreobject to commonobject for updateCommon, fetchCommon, deleteCommon, createCommon - Just leave method for child object into coreobject, check later if is useless - debug inventory card, PHP 7.0 compatibility - activate rights for inventory into stock module - add inventory options into stock admin module	2017-05-02 15:19:55 +02:00
Marcos García de La Fuente	166f2d262d	Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume	2017-05-02 14:00:27 +02:00
Laurent Destailleur	1e3384a842	Fix travis	2017-04-30 14:16:58 +02:00
Laurent Destailleur	58e2b49b1c	Clean code	2017-04-30 13:49:06 +02:00
Laurent Destailleur	865c8140d1	Clean code	2017-04-30 03:23:06 +02:00
Laurent Destailleur	4993a43025	Move new feature inventory into module stock.	2017-04-30 02:25:05 +02:00
Laurent Destailleur	92b5f8d85e	Move new feature inventory into module stock.	2017-04-29 21:53:01 +02:00
Laurent Destailleur	f5bdfc426f	Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview ... New inventory coreobject listview	2017-04-29 21:31:46 +02:00
Laurent Destailleur	a8c775dcbd	Fix compatibility with the removal of "constant".	2017-04-29 18:48:30 +02:00
phf	8219ff84c8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-04-28 14:45:04 +02:00
Laurent Destailleur	c722286bcb	Fix regressions	2017-04-28 13:37:36 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Quentin Vial-Gouteyron	4ab5674ffb	FIX ajax autocomplete on clone	2017-04-25 15:10:46 +02:00
florian HENRY	86338d1781	FIX : #6747	2017-04-24 09:03:25 +02:00
Laurent Destailleur	ec59f08e41	FIX extrafield css for boolean type	2017-04-24 00:46:27 +02:00
florian HENRY	213e0d2870	fix travis	2017-04-19 14:49:12 +02:00
florian HENRY	4efb1ba23a	update credentials	2017-04-18 15:27:18 +02:00
florian HENRY	a52db08cd6	NEW : Add module resources import/export	2017-04-18 15:25:04 +02:00
Laurent Destailleur	3da0aea168	Prepare code to use different SMTP servers.	2017-04-18 01:39:06 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	436f60a784	FIX Cache to load currencies was not working when loading all currencies	2017-04-14 18:08:02 +02:00
Laurent Destailleur	5931bc4068	NEW Feature to crop/resize images available on user and expense reports	2017-04-14 13:53:39 +02:00
Laurent Destailleur	e6e9b65594	NEW Reduce memory usage by removing deprecated constant loading.	2017-04-14 12:38:52 +02:00
Laurent Destailleur	4e021c123b	Fix travis error	2017-04-14 11:28:19 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	6c069e9a1a	Fix label of long status	2017-04-13 15:15:44 +02:00
Laurent Destailleur	3e9ccc186a	NEW Small PDF template for products	2017-04-13 10:26:12 +02:00
Laurent Destailleur	a6b05bb4da	Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0	2017-04-12 14:08:58 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	4eaa1d4f46	Add nb of generation into list of template invoices	2017-04-11 20:07:35 +02:00
Laurent Destailleur	8e33c8090d	FIX No filter on company when showing the link to elements.	2017-04-11 19:07:03 +02:00
Laurent Destailleur	423ffefbf3	NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN_LINKTO	2017-04-11 18:18:36 +02:00
Laurent Destailleur	2446cb5431	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture.php htdocs/compta/facture/fiche-rec.php htdocs/contact/list.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/facture/card.php htdocs/societe/list.php htdocs/user/document.php	2017-04-11 11:43:54 +02:00
Laurent Destailleur	81020cea77	Merge pull request #6660 from atm-florian/dev_contractselect ... NEW select2 for contract selector	2017-04-11 11:08:59 +02:00
Laurent Destailleur	d4de81ed6d	Merge pull request #6659 from altatof/fix_incoterm ... FIX: dont get empty "Incoterms : - " string if no incoterm	2017-04-11 11:08:17 +02:00
Laurent Destailleur	6aa56ce0fa	NEW Add a tracking id into mass emailing ... Prepare code to use a dedicated SMTP server according to context.	2017-04-11 10:57:17 +02:00
Marcos García de La Fuente	996b5e9f87	Corrected translation errors and little bug showing a non-available button to a restricted user	2017-04-09 18:17:46 +02:00
Laurent Destailleur	52c86cb3f5	NEW Bulk actions available on supplier orders	2017-04-09 13:12:25 +02:00
Laurent Destailleur	a0e75d0af0	Work on look and feel v6	2017-04-07 18:38:55 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
florian HENRY	e76a00845d	better test	2017-04-07 14:55:59 +02:00
florian HENRY	a1c1aa054f	new : select2 for contract selector	2017-04-07 14:55:14 +02:00
altatof	d892a89f45	FIX: dont get empty "Incoterms : - " string if no incoterm	2017-04-07 14:15:51 +02:00
Laurent Destailleur	60a54041c2	NEW Enable bulk actions delete on supplier invoices	2017-04-07 14:09:19 +02:00
Laurent Destailleur	ea44e14b60	Start debug the variant module	2017-04-07 11:01:12 +02:00
Laurent Destailleur	f598bf8bef	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-04-06 21:59:11 +02:00
Laurent Destailleur	8363bee234	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/filefunc.inc.php	2017-04-06 21:56:48 +02:00
Laurent Destailleur	e2ea5945dd	Work on look and feel v6	2017-04-06 21:48:28 +02:00
Alexis ALGOUD	736800dd66	little fix ... for param into list pagination	2017-04-05 12:16:10 +02:00
Laurent Destailleur	1dc2cae3a5	NEW Show company into combo list of projects	2017-04-05 11:51:55 +02:00
Laurent Destailleur	7c868888a5	FIX Add option MAIN_MAIL_USE_MULTI_PART to include text content into ... HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to restore the inline images feature.	2017-04-05 01:02:03 +02:00
Laurent Destailleur	13333ffd73	Add multipart text version into html emails.	2017-04-05 00:39:32 +02:00
Laurent Destailleur	c4d4856997	FIX sql errors on user card	2017-04-04 12:23:44 +02:00
Laurent Destailleur	9df4bac202	NEW Bookmarks are into a combo list.	2017-04-04 11:56:19 +02:00
Laurent Destailleur	761ece3125	Remove $maxfilenamelength replace with auto overflow.	2017-04-03 16:59:22 +02:00
Laurent Destailleur	e8767122b0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/societe/list.php	2017-04-03 11:05:19 +02:00
Laurent Destailleur	13587fa13e	Fix key were not translated	2017-04-03 10:51:35 +02:00
Laurent Destailleur	6a69f9349b	Fix too much logs in list	2017-04-03 10:43:04 +02:00
Laurent Destailleur	a5a0995313	More comments	2017-04-03 10:11:29 +02:00
Laurent Destailleur	17a1874e36	FIX Counter of notification of a thirdparty	2017-04-01 13:43:05 +02:00
Laurent Destailleur	d975e7f442	Work on 6.0 look and feel	2017-04-01 12:46:47 +02:00
Laurent Destailleur	88017f5707	Merge pull request #6369 from atm-florian/dev_replace_extrefield_checkboxByMultiSelect ... NEW : change render extrafields checkbox list for multiselectarray	2017-03-31 18:12:58 +02:00
Laurent Destailleur	7bcd4d74ef	Merge pull request #6617 from dolibarr95/patch-9 ... Display mobile icon	2017-03-31 17:43:01 +02:00
Laurent Destailleur	01a74a8d23	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
Laurent Destailleur	8e70c4a0b7	Work on 6.0 new look and feel	2017-03-30 15:39:50 +02:00
Marcos García de La Fuente	cd5b074a48	FIX #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled	2017-03-30 15:21:20 +02:00
dolibarr95	1489847a74	Display mobile icon ... Display a specific icon when mobile	2017-03-30 09:49:34 +02:00
Laurent Destailleur	fbca800246	FIX Detection of color brightness	2017-03-29 11:46:13 +02:00
Laurent Destailleur	4fa5448aab	FIX Detection of color brightness	2017-03-29 10:34:33 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
phf	fe1b1ede0f	Fix remove filter on date	2017-03-28 17:35:51 +02:00
phf	c3e8a5be62	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-28 17:20:50 +02:00
Laurent Destailleur	31bde1ae74	Code for 6.0 new look and feel	2017-03-28 17:12:15 +02:00
phf	5decbde79b	Fix search by date does not work	2017-03-28 17:06:22 +02:00
phf	df170769c9	Update function module inventory	2017-03-28 16:05:18 +02:00
phf	70743e1f68	Update list header to be print with Dolibarr functions	2017-03-28 13:48:33 +02:00
Laurent Destailleur	f843f8a93d	Start to move search bar before table titles	2017-03-27 00:48:50 +02:00
atm-ph	ed27b44f62	Add TODO to print header table as Dolibarr	2017-03-26 14:58:59 +02:00
atm-ph	ae2ab3276d	Refactoring and class/method documentation	2017-03-26 14:37:25 +02:00
Laurent Destailleur	e38ad37ce3	FIX #6517 #6525 Autocompletion of thirdparty after n chars not ... implemented	2017-03-26 05:02:06 +02:00
atm-ph	09f645fc9f	Fix travis	2017-03-25 23:21:49 +01:00
atm-ph	76b95aeec0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-25 19:15:25 +01:00
atm-ph	2fc74b4962	Refactoring class	2017-03-25 18:53:14 +01:00
atm-ph	cb576e6c99	Refactoring class	2017-03-25 18:26:10 +01:00
atm-ph	fce8e08b51	Refactoring and fix	2017-03-25 18:13:39 +01:00
atm-ph	ae33e40dc8	Refactoring and add method comments	2017-03-25 17:32:42 +01:00
atm-ph	269645dfc7	Add method documentations	2017-03-25 10:48:06 +01:00
atm-ph	de832d90a9	Refactoring	2017-03-25 00:50:53 +01:00
Laurent Destailleur	292bcae592	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-25 00:05:04 +01:00
Laurent Destailleur	d1a988a0be	Fix document_preview is possible on files with + chars inside.	2017-03-24 17:32:38 +01:00
atm-ph	edc2d39702	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-03-24 17:06:40 +01:00
Laurent Destailleur	38660418b4	Include preview of pdf into dol_banner	2017-03-23 22:27:44 +01:00
Laurent Destailleur	664380d304	Css enhancement	2017-03-23 21:24:57 +01:00
Laurent Destailleur	eb145faffd	Replace parameter mixte with textselect	2017-03-23 19:57:45 +01:00
Laurent Destailleur	d1c29bf698	Merge pull request #6552 from defrance/patch-91 ... NEW : introducing "mixte" mode for select_duration	2017-03-23 19:54:33 +01:00
Laurent Destailleur	fec3a89aa5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 11:38:46 +01:00
Laurent Destailleur	0a35d17207	CSS enhancement	2017-03-23 10:59:13 +01:00
BENKE Charlie	7999cb9a46	introducing "mixte" mode for select_duration ... If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a text, if 'mixte' input hour is in text and input min is a combo	2017-03-21 23:48:06 +01:00
Laurent Destailleur	acdfd6ab9e	css enhancement	2017-03-21 18:23:58 +01:00
Laurent Destailleur	e7a45a7f6a	NEW Use html5 type "number" on select field for year and duration.	2017-03-21 17:50:43 +01:00
Laurent Destailleur	68257283e4	Enhance select list	2017-03-21 13:39:42 +01:00
Laurent Destailleur	1b0b4c9609	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-20 23:53:47 +01:00
Laurent Destailleur	b9a9997688	Page societe/soc.php and compta/facture.php was renamed into card.php ... to match page naming conventions.	2017-03-20 21:29:22 +01:00
Laurent Destailleur	b169f93abc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-19 14:27:12 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
Laurent Destailleur	b9d6122c53	Add comments	2017-03-18 19:56:53 +01:00
Laurent Destailleur	f7e71d1de2	FIX LOG_ERROR does not exists. Use LOG_ERR.	2017-03-18 11:48:02 +01:00
Laurent Destailleur	597fb11d08	Fix error management in duplicate trigger	2017-03-18 11:36:48 +01:00
Laurent Destailleur	35b79818b7	Uniformize css rules	2017-03-16 20:33:51 +01:00
Laurent Destailleur	dba6d99686	Minor look enhancement	2017-03-16 17:02:30 +01:00
Laurent Destailleur	6f25d6de24	Fix bad management of PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY	2017-03-15 12:33:06 +01:00
Laurent Destailleur	4c0ff38020	Fix closing boxes	2017-03-15 11:58:13 +01:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +01:00
arnaud	192a825de8	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
Alexandre SPANGARO	c6c07bf9f4	New : Add project to social contributions	2017-03-12 14:32:49 +01:00
Laurent Destailleur	4bf0e31299	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-11 02:40:42 +01:00
Laurent Destailleur	47dd53abbe	NEW The substitution keys available for emailing edition is now into a ... popup	2017-03-11 02:36:22 +01:00
Laurent Destailleur	4737c62394	FIX Avoid flash on screen	2017-03-11 00:52:35 +01:00
Laurent Destailleur	2054ce0aab	FIX Avoid flash on screen	2017-03-11 00:50:55 +01:00
Laurent Destailleur	209bd0b3e4	2nd try to fix better compatibility	2017-03-10 16:53:26 +01:00
Laurent Destailleur	2a3d3b4b50	Fix dol_banner for agenda	2017-03-10 16:40:38 +01:00
Laurent Destailleur	a9b39f3028	Fix dol_banner for agenda	2017-03-10 16:27:28 +01:00
Laurent Destailleur	57c2971175	Fix dol_banner for agenda	2017-03-10 16:19:18 +01:00
Laurent Destailleur	c72e7c1057	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/files.lib.php	2017-03-10 14:54:35 +01:00
Laurent Destailleur	de2558c907	Fix useless lines	2017-03-10 12:47:51 +01:00
Laurent Destailleur	50044ed21e	FIX #6499	2017-03-10 12:45:56 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
arnaud	1d31603ad2	Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo	2017-03-10 11:46:59 +01:00
Laurent Destailleur	46eedeafe8	Fix message shown to many times	2017-03-10 11:30:46 +01:00
Laurent Destailleur	8389db18bf	Fix solution for comaptibility	2017-03-10 10:07:09 +01:00
Laurent Destailleur	d241adc201	NEW Use autocompletion on the "Add widget list".	2017-03-09 13:22:43 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
Laurent Destailleur	8ac1aab45a	Uniformize look and feels	2017-03-07 18:34:57 +01:00
florian HENRY	fc63008485	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect	2017-03-06 15:35:29 +01:00
Laurent Destailleur	4e4045d18a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:12:08 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	52a4863ed8	Merge pull request #6480 from dolibarr95/patch-2 ... Add label tag	2017-03-05 21:40:31 +01:00
Laurent Destailleur	5fa6592d6e	Fix bad conf used	2017-03-04 20:10:50 +01:00
Laurent Destailleur	379e0083ab	Fix bad help	2017-03-03 18:00:53 +01:00
Laurent Destailleur	6c91cb4f90	Fix it was not possible to create/edit a new chart of account	2017-03-03 17:59:49 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
Laurent Destailleur	85518c6a54	FIX #6479	2017-03-03 14:04:40 +01:00
Laurent Destailleur	07c828d38f	Introduce method loadLangs to save code lines	2017-03-03 13:27:51 +01:00
arnaud	cff9fa0e6b	FIX user odt	2017-03-03 12:01:58 +01:00
arnaud	abeba95de9	New USER odt	2017-03-02 15:13:42 +01:00
dolibarr95	d3a80795ce	Add label tag ... Add a label html tag for the input radio extrafield tag.	2017-03-02 11:40:43 +01:00
Laurent Destailleur	d202003e29	Fix translation	2017-03-01 18:12:06 +01:00
Laurent Destailleur	8487f0fc96	Fix missing setup of new option	2017-03-01 11:18:11 +01:00
Laurent Destailleur	3c54cb5ba9	Fix avoid trigger during migration	2017-02-28 20:55:14 +01:00
Laurent Destailleur	9648f20a2e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-28 12:08:41 +01:00
Laurent Destailleur	59d2943d8d	Fix context must be provided to triggers using ->context no a dedicated ... property.	2017-02-28 12:07:05 +01:00
Laurent Destailleur	0f22beb774	Upgrade to ckeditor 4.6.2.	2017-02-28 10:49:58 +01:00
Laurent Destailleur	74e8fb9c19	NEW Can set number of dump to keep with job "local database backup"	2017-02-27 02:04:25 +01:00
Laurent Destailleur	43f3e46aac	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-27 01:23:48 +01:00
Laurent Destailleur	4f24613de0	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/class/expensereport.class.php	2017-02-27 01:19:03 +01:00
Laurent Destailleur	92acbbd8a8	Fix parameters	2017-02-27 00:22:11 +01:00
Ion	320da17c78	Add object extrafields to mail form	2017-02-26 03:42:42 +01:00
Laurent Destailleur	1ef899dacc	Prepare database to follow supplier discounts	2017-02-24 15:22:32 +01:00
Laurent Destailleur	baa1f3ed2b	Clean doc about changes in external libraries	2017-02-24 14:35:20 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Laurent Destailleur	92d9eb3c5d	Several fix for a better management of #6424	2017-02-22 17:46:54 +01:00
Laurent Destailleur	24c2675705	Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email ... NEW : Can send email to multiple destinaries from mail form	2017-02-22 14:39:35 +01:00
Laurent Destailleur	ba03b17354	Fix css	2017-02-22 14:30:39 +01:00
Laurent Destailleur	a0fb53d5b1	Merge branch 'develop' into NEW_pdf_supplier_payment	2017-02-22 14:20:47 +01:00
Laurent Destailleur	cbe855370b	Merge pull request #6451 from laudeco/feature/list_user_by_firstname ... FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users	2017-02-22 14:17:00 +01:00
Laurent Destailleur	3f3b82ed64	Merge pull request #6454 from atm-florian/dev_fix_unittrad ... fix unit trad	2017-02-22 14:16:28 +01:00
Laurent Destailleur	1681445427	Remove useless line	2017-02-22 00:08:25 +01:00
florian HENRY	c8de648924	fix unit trad	2017-02-21 19:07:57 +01:00
Laurent Destailleur	eef3824f8c	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang	2017-02-21 10:34:52 +01:00
De Coninck Laurent	33d1d78329	FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users	2017-02-21 09:22:50 +01:00
Alexis ALGOUD	4a97864d23	change for tms	2017-02-20 15:54:02 +01:00
Alexis ALGOUD	07d6bbf835	change for tms	2017-02-20 15:53:43 +01:00
Laurent Destailleur	a8129ce46e	Fix transaction/sql error	2017-02-20 11:49:27 +01:00
Laurent Destailleur	89d10ae5aa	Fix the accounting account groups must be editable by book keeper, not ... admin user.	2017-02-20 11:21:38 +01:00
Laurent Destailleur	2dbae7b808	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 17:14:00 +01:00
Laurent Destailleur	fd111cb1c6	NEW tooltip can be on hover or on click with textwithpicto function.	2017-02-17 17:11:14 +01:00
arnaud	4ec664029d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment	2017-02-17 16:40:14 +01:00
Laurent Destailleur	1f156c1716	Merge pull request #6436 from defrance/patch-79 ... on list, preview tooltip is not displayed correctly	2017-02-17 13:27:31 +01:00
florian HENRY	f7e1927b43	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect	2017-02-17 13:25:19 +01:00
florian HENRY	4836fa8f76	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email	2017-02-17 13:24:06 +01:00
Laurent Destailleur	8d03f86f45	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-17 13:10:46 +01:00
Laurent Destailleur	a91d57037e	FIX #6433	2017-02-17 13:09:28 +01:00
BENKE Charlie	b94312162e	on list, preview tooltip is not displayed correctly ... it's a problem of alignment, the tooltip is cut by the left part on list (ex : comm/propal/list.php) think we can do better	2017-02-17 12:05:24 +01:00
Laurent Destailleur	afa5ef2913	NEW Introduce fields that can be computed during export in export ... profiles.	2017-02-17 00:19:28 +01:00
florian HENRY	a98e5b7290	fix syntax	2017-02-15 11:46:36 +01:00
florian HENRY	5ec01b3175	NEW : Can send email to multiple destinaries from mailform	2017-02-15 11:41:09 +01:00
florian HENRY	a26081d352	Merge branch 'develop' of local repository into dev_replace_extrefield_checkboxByMultiSelect	2017-02-15 09:10:49 +01:00
Laurent Destailleur	eb70d6eea1	Debug of feature for browser notifications	2017-02-14 18:20:01 +01:00
arnaud	977c18513d	FIX pdf supplier payment work	2017-02-14 12:00:56 +01:00
Laurent Destailleur	05c9f57fd4	Move edition of emails templates out of dictionaries so we would be able ... to have templates per user (not reserved to admin).	2017-02-12 18:13:49 +01:00
arnaud	4230b075c2	INIT pdf supplier payment	2017-02-10 17:28:00 +01:00
Laurent Destailleur	ad361d6d45	Merge pull request #6394 from aspangaro/6.0-fiscalyear ... [FP17] Accountancy - Prepare fiscal year	2017-02-08 19:25:02 +01:00
Laurent Destailleur	596c092ec8	Merge pull request #6219 from atm-florian/dev_changelistchild ... NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list	2017-02-08 16:49:18 +01:00
Laurent Destailleur	d5b10a18b7	Debug module variant	2017-02-08 12:52:31 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr ... Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	b611c5ca53	Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received ... NEW Develop new reduc on excess received	2017-02-08 11:16:10 +01:00
Alexandre SPANGARO	4126dcff03	[FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed.	2017-02-08 06:51:42 +01:00
Laurent Destailleur	fcbc12ce31	Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project ... New link movement stock to project	2017-02-06 20:45:04 +01:00
Laurent Destailleur	d230883638	Merge pull request #6367 from gnovaro/patch-2 ... Code style	2017-02-06 20:25:16 +01:00
Laurent Destailleur	a673afe601	NEW Description of feature of a module into a dedicated popup	2017-02-04 14:16:17 +01:00
BENKE Charlie	3f236b1ebf	FIX : $resaction not used in all case ... Please integrate on next 5.0	2017-02-03 12:14:29 +01:00
Laurent Destailleur	53661e1e4f	Merge pull request #6211 from GPCsolutions/optimizetranslate ... [Qual] Optimize language file loading	2017-02-03 11:55:29 +01:00
Laurent Destailleur	3dea950c24	Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project ... New htmlid can be use instead of htmlname for select projects	2017-02-03 11:44:54 +01:00
florian HENRY	dccddf5c7e	NEW : change render extrafields checkbox list for multiselectarray	2017-02-03 09:25:26 +01:00
Gustavo Novaro	f815d1bed3	Code style	2017-02-02 17:30:06 -03:00
atm-ph	ac20a1a874	Fix remove param htmlid in ajax_combobox	2017-02-02 20:47:45 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	c3fb559d3b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modProduct.class.php	2017-02-01 20:58:17 +01:00
Laurent Destailleur	9a9b31c9c0	Fix cancel button + logic to close project when setting opp to WON/LOST.	2017-02-01 13:25:16 +01:00
phf	aea6a8f9ec	Fix (	2017-01-31 14:03:54 +01:00
phf	e73c60b526	New htmlid can be use instead of htmlname for select projects	2017-01-31 12:20:45 +01:00
Laurent Destailleur	756919de2a	Fix deadlock feature: could not solve a situation where an emailing was ... validated by error.	2017-01-29 16:08:45 +01:00
atm-ph	ccad6d6dde	New show on project "overview" tab the informations about movements stock	2017-01-29 13:36:33 +01:00
Laurent Destailleur	fd90bf466b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/societe/soc.php	2017-01-28 15:12:14 +01:00
Laurent Destailleur	c88e63ecc9	FIX #6259	2017-01-28 15:01:17 +01:00
Laurent Destailleur	bc8ccd8ec5	Fix bad var set	2017-01-28 13:01:10 +01:00
florian HENRY	055a00a338	fix travis	2017-01-27 15:18:12 +01:00
florian HENRY	cb6209de31	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_changelistchild Conflicts: htdocs/core/class/commonobject.class.php	2017-01-27 15:16:28 +01:00
Laurent Destailleur	29df2c9115	Merge branch 'develop' into mail-lines	2017-01-27 01:29:58 +01:00
Laurent Destailleur	70091eceed	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php	2017-01-27 01:26:11 +01:00
Laurent Destailleur	0c14e1d233	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-27 01:24:55 +01:00
Laurent Destailleur	3c86507ce6	FIX #6328	2017-01-27 00:51:22 +01:00
Laurent Destailleur	1239e8600a	Merge pull request #6326 from altatof/fix_entity_thirdpart_files ... Fix entity thirdparty files links	2017-01-27 00:30:03 +01:00
Laurent Destailleur	053afe21dd	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/class/user.class.php	2017-01-26 23:40:16 +01:00
Laurent Destailleur	c1b59b1950	Fix several security bugs on expense report	2017-01-26 18:08:00 +01:00
Laurent Destailleur	c39fcce9f1	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-26 10:45:38 +01:00
Laurent Destailleur	9889f0a4a2	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/modules/modProjet.class.php htdocs/filefunc.inc.php	2017-01-26 10:44:50 +01:00
florian HENRY	13917cebdc	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild	2017-01-25 11:02:23 +01:00
altatof	d65cb29536	FIX: use param for http links	2017-01-25 09:25:06 +01:00
Laurent Destailleur	755d353dfa	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/class/html.formprojet.class.php	2017-01-24 18:41:29 +01:00
Laurent Destailleur	84fec7c5c7	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 ... Conflicts: htdocs/core/class/html.formprojet.class.php	2017-01-24 18:40:01 +01:00
Laurent Destailleur	b1e5d8ce98	FIX Combo list of VAT is wrong on POS	2017-01-24 14:33:49 +01:00
Laurent Destailleur	f591e2b1b1	FIX Combo list of VAT is wrong on POS	2017-01-24 14:29:05 +01:00
Laurent Destailleur	1878647d26	NEW Add statistics on supplier tab.	2017-01-23 20:54:52 +01:00
Laurent Destailleur	9a59fbada7	Fix missing info admin picto. Fix colspan.	2017-01-23 17:31:39 +01:00
florian HENRY	d714a52f95	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... dev_changelistchild Conflicts: htdocs/core/class/commonobject.class.php	2017-01-23 11:35:11 +01:00
Laurent Destailleur	7622d3b2fb	Fix missing info admin picto. Fix colspan.	2017-01-23 10:23:24 +01:00
Laurent Destailleur	daf40ed573	NEW Direct open of card after a search if on record only found.	2017-01-22 23:35:32 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	5362d10c0d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/hookmanager.class.php	2017-01-21 21:56:24 +01:00
Laurent Destailleur	6ab9ba3284	Fix management of alternative language for Greek (el_CY)	2017-01-21 21:52:42 +01:00
Laurent Destailleur	b8a80f9311	Fix code comment and missing showLinkToObjectBlock hook declaration as ... an addreplace hook.	2017-01-21 17:30:35 +01:00
Laurent Destailleur	3a2d9c8610	Fix for rtl languages	2017-01-21 16:12:25 +01:00
Laurent Destailleur	9a5670787f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-21 12:26:50 +01:00
Laurent Destailleur	fc4aa96cd7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fichinter/card.php htdocs/fourn/commande/dispatch.php	2017-01-20 21:02:05 +01:00
Laurent Destailleur	6780b20968	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-20 14:11:55 +01:00
Laurent Destailleur	2f4ff66c43	Minor fixes	2017-01-20 14:10:57 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
Laurent Destailleur	4047de82bd	Fix navigation on projects	2017-01-20 10:27:37 +01:00
Laurent Destailleur	03c1521cde	Merge pull request #6271 from altatof/fix_extra_input ... FIX: extrafield input for varchar was not working with special char	2017-01-18 16:53:43 +01:00
Laurent Destailleur	562bdbc9f5	Merge pull request #6291 from gnovaro/patch-1 ... Improve code style	2017-01-18 16:44:56 +01:00
Laurent Destailleur	2566df8252	Merge pull request #6298 from benlo06/fix_shipping_contactid ... FIX getIdContact for shipping	2017-01-18 15:53:32 +01:00
Benoit	73852beb4e	FIX contactid for shipping pdf	2017-01-17 21:55:21 +01:00
arnaud	39f35bbaab	FIX all dolibarr versions about project list and ajax completion bug	2017-01-17 11:17:40 +01:00
Gustavo Novaro	0f6cb52376	Improve code style ... Replace var for public and private.	2017-01-16 17:40:13 -03:00
altatof	3dd160c663	use dol_escape_htmltag	2017-01-16 09:17:37 +01:00
Laurent Destailleur	36bd63c1a7	NEW PHP 7.1 compatibility	2017-01-16 09:05:18 +01:00
Laurent Destailleur	6bfd534a36	NEW PHP 7.1 compatibility	2017-01-16 01:21:33 +01:00
Laurent Destailleur	846e827e09	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:49:11 +01:00
Laurent Destailleur	f5458b4337	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/admin/modules.php htdocs/core/class/html.formfile.class.php htdocs/product/stats/card.php	2017-01-16 00:48:37 +01:00
Laurent Destailleur	4ecd657f34	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 00:02:43 +01:00
Laurent Destailleur	0671f75417	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-16 00:01:37 +01:00
Regis Houssin	fd4a19855d	Fix: preview image not show with multicompany product sharing	2017-01-15 12:09:26 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Laurent Destailleur	1fd9f5e1fb	Fix: host was twice into message id for smtp driver and swiftmailer was ... not using dol_getprefix() to build host.	2017-01-14 13:27:44 +01:00
altatof	55c0a99bce	fix was not at the right place	2017-01-13 15:42:07 +01:00
altatof	487b5b25db	FIX: extrafield input for varchar was not working with special char ... within (ie double quotes)	2017-01-13 15:37:33 +01:00
Laurent Destailleur	2c6672d17a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/login.tpl.php	2017-01-12 11:32:51 +01:00
Laurent Destailleur	c42b48636a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/commande/class/api_commande.class.php htdocs/core/class/CMailFile.class.php htdocs/societe/class/api_contact.class.php	2017-01-12 11:06:24 +01:00
Laurent Destailleur	5e71ff816f	Increase limit for better backward compatibility without loosing minimum ... security.	2017-01-12 10:51:31 +01:00
Regis Houssin	5898d27609	Fix: avoid errors if constants values not exists	2017-01-11 16:47:17 +01:00
Laurent Destailleur	5553be4aa9	Fix code comment	2017-01-11 16:08:04 +01:00
Laurent Destailleur	1559c45a61	FIX link for not found photo when using gravatar. Must use external url	2017-01-10 09:24:55 +01:00
Laurent Destailleur	5c233a41b3	NEW Add hook "formatNotificationMessage"	2017-01-09 23:55:53 +01:00
Laurent Destailleur	93ab224614	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-09 23:33:36 +01:00
Laurent Destailleur	decbda3e23	Fix inversion application name - company name	2017-01-09 23:26:31 +01:00
Laurent Destailleur	a9354e5f27	Fix generic text must be set before specific for notification	2017-01-09 21:07:54 +01:00
Alexis Algoud	8b4a43ec77	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-09 10:31:05 +01:00
Laurent Destailleur	51b9802de4	NEW Hook to allow inserting custom product head #6001	2017-01-07 20:42:35 +01:00
Laurent Destailleur	4c4aeba855	Fix project on loans	2017-01-07 17:54:47 +01:00
Laurent Destailleur	e9853f3cd7	Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into ... Franck-MOREAU-develop Conflicts: htdocs/core/lib/functions.lib.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql htdocs/loan/card.php htdocs/loan/class/loan.class.php htdocs/projet/element.php	2017-01-07 17:45:05 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Laurent Destailleur	e57f834434	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-01-04 17:06:02 +01:00
Laurent Destailleur	71e368aa83	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-04 17:04:25 +01:00
Laurent Destailleur	2aae4ea6ea	FIX We must not drop column if there is still record on other entities.	2017-01-04 15:05:13 +01:00
Alexis Algoud	370be70e46	Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview	2017-01-03 16:30:50 +01:00
Ion Agorria	522fb4cf7a	Add email template for each line in object	2016-12-31 17:39:01 +01:00
Laurent Destailleur	f46ce68d08	NEW Can sort thumbs visible on product card	2016-12-31 16:16:20 +01:00
Laurent Destailleur	f1961b0207	Work on sorting/indexing upload files	2016-12-31 03:43:22 +01:00
Marcos García de La Fuente	47a444b2ab	Merge branch 'develop' into prod-attr	2016-12-27 15:54:53 +01:00
Laurent Destailleur	b5c815367c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-26 15:44:31 +01:00
Laurent Destailleur	bbd3734a21	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/filefunc.inc.php	2016-12-26 12:42:23 +01:00
Laurent Destailleur	e297b64722	Several security fix in using mailings.	2016-12-26 12:35:10 +01:00
Laurent Destailleur	c9c8079c3d	Can add additionnal paramon mail to solve rare sendmail problems	2016-12-26 00:00:28 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
florian HENRY	337897e0a1	NEW : Allow extrafields list select to be dependands on other standard ... list and not only other extrafields list	2016-12-23 15:01:49 +01:00
Laurent Destailleur	a2133f391f	Complete work on dol_banner	2016-12-23 14:52:25 +01:00
Laurent Destailleur	43942e6ea2	Fix css and fix navigation on resource tab.	2016-12-23 13:04:46 +01:00
Raphaël Doursenaud	ac92e23b59	[Qual] Optimize language file loading ... Using fscanf() and the proper format is about twice as fast as using fgets() followed by explode() and trim(). This is a small optimization per se but since this code is called often it yields about 33% rendering time improvement on the homepage where about 50% of the time is spent on loading the translation files.	2016-12-23 01:11:50 +01:00
Laurent Destailleur	ba7ca3da6e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop6 Conflicts: htdocs/core/photos_resize.php htdocs/install/mysql/data/llx_c_action_trigger.sql	2016-12-22 17:57:42 +01:00
Laurent Destailleur	b4ed0a1e12	Fix nb of lat approvals wrong	2016-12-22 17:30:39 +01:00
Laurent Destailleur	081d3f0814	Quick hack by adding hidden constant to solve a locking feature (how to ... add project if likned to another third on project view)	2016-12-22 16:52:03 +01:00
Laurent Destailleur	d66bc10d05	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/list.php	2016-12-22 15:54:01 +01:00
Laurent Destailleur	574f84bb84	Fix warning for approval delay.	2016-12-22 15:49:06 +01:00
Laurent Destailleur	77c320a092	Fix warning for expense report late	2016-12-22 15:33:43 +01:00
Laurent Destailleur	26098082d0	NEW Uploaded files are indexed into database	2016-12-20 22:14:27 +01:00
Laurent Destailleur	ed0ffd6f5a	NEW Uploaded files are indexed into database	2016-12-20 19:42:25 +01:00
Laurent Destailleur	0ef963604f	Fix option moreinheader not correctly supported with smtps	2016-12-20 12:38:24 +01:00
Laurent Destailleur	3c79f3acb5	Minor fixes or code comment	2016-12-20 12:06:26 +01:00
Laurent Destailleur	be19a999f5	Fix regression losing warning on not defined emails	2016-12-19 18:11:53 +01:00
Laurent Destailleur	0eded9a8b7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-19 02:36:10 +01:00
Laurent Destailleur	0d1d68d5d9	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/admin/dict.php htdocs/product/price.php	2016-12-19 02:34:29 +01:00
Laurent Destailleur	74e00c4d80	More comment and hidden option to solve problems when sending emails.	2016-12-19 01:04:17 +01:00
Laurent Destailleur	dbf96b8f59	Log at wrong place	2016-12-18 23:32:31 +01:00
Laurent Destailleur	54aa8696ad	Fix regression	2016-12-18 13:01:26 +01:00
Laurent Destailleur	9d3bd9d36f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/errors.lang	2016-12-18 11:57:04 +01:00
Laurent Destailleur	0988a2f173	Merge pull request #6187 from gnovaro/patch-5 ... var to public	2016-12-18 11:30:24 +01:00
Laurent Destailleur	3d57a457eb	Merge pull request #6176 from gnovaro/patch-2 ... Replace attributes var for public	2016-12-18 11:28:04 +01:00
Laurent Destailleur	4ece746437	Merge pull request #6168 from defrance/patch-61 ... FIX navigation field is always ref	2016-12-18 11:02:14 +01:00
Laurent Destailleur	27785323ae	Merge pull request #6164 from hregis/4.0_bug ... Fix: missing date locale and date rfc	2016-12-18 10:57:29 +01:00
Laurent Destailleur	12e919b99d	Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin ... Fix user right write margin	2016-12-18 10:53:34 +01:00
Laurent Destailleur	78bf209119	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-18 02:21:57 +01:00
Laurent Destailleur	394e284a4a	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/class/CMailFile.class.php htdocs/langs/en_US/errors.lang	2016-12-18 02:16:40 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
Laurent Destailleur	c5db333af8	Fix translation of error message when sending email	2016-12-17 14:00:39 +01:00
Gustavo Novaro	7728576f19	var to public ... Improve code style	2016-12-17 03:49:28 -03:00
Alexis Algoud	f0ea610401	change date value	2016-12-16 17:06:05 +01:00
Alexis Algoud	41ddaf5d9b	fix but major bug on date name, as to seach a solution	2016-12-16 16:28:10 +01:00
Alexis Algoud	79867a85d0	fix list issue	2016-12-16 16:09:02 +01:00
Laurent Destailleur	c750ba8b99	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/install/mysql/data/llx_c_payment_term.sql htdocs/langs/en_US/bills.lang htdocs/langs/en_US/mails.lang	2016-12-16 13:56:55 +01:00
Alexis Algoud	4d375bcf95	debug translate	2016-12-16 11:31:14 +01:00
Alexis Algoud	1596760d21	fix regulate / apply new PMP / add or remove line	2016-12-15 17:02:20 +01:00
phf	cca7967144	Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin	2016-12-15 16:19:54 +01:00
Gustavo Novaro	54b433ff6b	Replace attributes var for public ... Improve code style.	2016-12-15 09:54:45 -03:00
Alexis Algoud	9f6f874655	fix	2016-12-15 12:33:26 +01:00
Laurent Destailleur	8f3ce46c50	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-12-15 12:12:36 +01:00
Laurent Destailleur	2c4c48ad6f	Better fix to add server name into email id.	2016-12-15 12:11:39 +01:00
phf	21a648a052	Fix user right on margin module to write buyprice	2016-12-15 12:01:46 +01:00
Alexis Algoud	81b01cd055	fix	2016-12-15 11:23:13 +01:00
Alexis Algoud	703b8708e3	fix create	2016-12-15 10:39:59 +01:00
Alexis Algoud	a463759ba3	init query builder into db	2016-12-14 16:54:05 +01:00
Alexis Algoud	565bcf2332	debug fetch method	2016-12-14 16:11:37 +01:00
BENKE Charlie	2cebeb72aa	FIX navigation field is always ref	2016-12-14 15:04:07 +01:00
Alexis Algoud	a636d27ccb	Div	2016-12-14 14:34:12 +01:00
Laurent Destailleur	ecab7cb70e	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/class/product.class.php	2016-12-14 12:29:41 +01:00
Laurent Destailleur	d2e4888bdd	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-12-14 12:21:33 +01:00
Laurent Destailleur	e4dd020887	Fix bad concat	2016-12-14 11:23:55 +01:00
Laurent Destailleur	af407a094a	FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of ... tracking email.	2016-12-14 11:20:44 +01:00
Alexis Algoud	efc22a4cd8	include default list conception	2016-12-13 09:49:59 +01:00
Regis Houssin	337509d40f	Fix: missing date locale and date rfc	2016-12-13 09:40:08 +01:00
Alexis Algoud	baf1acb4fd	debug	2016-12-13 09:17:43 +01:00
Laurent Destailleur	d2d0e66c5c	Fix style fo ECM module	2016-12-13 01:19:33 +01:00
Laurent Destailleur	902169cb66	Can sort on position on list of documents	2016-12-13 00:40:12 +01:00
Laurent Destailleur	e1a5a90f0a	NEW Uploaded files are indexed into database	2016-12-13 00:15:21 +01:00
Alexis Algoud	dfb9ae234c	debug	2016-12-12 19:03:02 +01:00
Alexis Algoud	cdfbed5d08	new listview	2016-12-12 17:36:22 +01:00
Alexis Algoud	a7813c37a1	init inventory integration	2016-12-12 12:36:00 +01:00
Laurent Destailleur	0c84a0f9af	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-11 22:10:34 +01:00
Laurent Destailleur	6c4f15df63	Fix lot of fix in css look to match v5 rules.	2016-12-11 16:11:42 +01:00
aspangaro	b7babb8a48	Problem of traduction	2016-12-11 14:13:48 +01:00
Laurent Destailleur	190f432c23	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-11 11:07:22 +01:00
Laurent Destailleur	4969af8c74	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: ChangeLog htdocs/product/card.php	2016-12-11 11:04:15 +01:00
Laurent Destailleur	9b436ce871	Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/product/class/product.class.php	2016-12-11 02:51:32 +01:00
Maxime Kohlhaas	f7524b93ad	Actualize currency on supplier order and invoice	2016-12-11 02:50:21 +01:00
Maxime Kohlhaas	177ec97689	Actualize currency on propal, order and invoice	2016-12-11 01:04:58 +01:00
Maxime Kohlhaas	7c82b18da0	New : allow to actualize currency rate	2016-12-10 22:07:25 +01:00
Maxime Kohlhaas	1f48e0486f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug	2016-12-10 21:50:31 +01:00
Maxime Kohlhaas	eb8f89119f	Dynamic select currency	2016-12-10 16:20:37 +01:00
Laurent Destailleur	50bc65ce77	Add css to help debug	2016-12-10 13:05:38 +01:00
Regis Houssin	239e42faa0	Fix: contract use "total_vat" instead "total_tva"	2016-12-09 13:04:05 +01:00
Laurent Destailleur	d23604701c	Fix responsive	2016-12-07 15:00:20 +01:00
Laurent Destailleur	083aef9b90	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-07 14:27:07 +01:00
Laurent Destailleur	1583d0e49f	Fix linkof mass action for pdf merge	2016-12-07 14:14:03 +01:00
Laurent Destailleur	9efcda6714	Merge pull request #6086 from fappels/develop-work-on-warehouse-status ... New continue work on warehouse status #5115	2016-12-07 13:06:07 +01:00
Laurent Destailleur	c2bee0f937	FIX #6088	2016-12-07 12:44:56 +01:00
Laurent Destailleur	455a9ed4da	FIX security in import of files	2016-12-07 12:41:48 +01:00
fappels	085d44eaba	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-12-06 20:15:45 +01:00
fappels	bbbc768fa7	Change filter parameter to string with comma seperated values ... Change warehousefilter from int to string with comma seperated values for selectWarehouses and select_produits form functions.	2016-12-06 20:07:19 +01:00
Laurent Destailleur	017e384f16	FIX Preselected value for extrafield link was not correctly set	2016-12-06 13:10:44 +01:00
fappels	c911f906c8	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-12-05 11:36:20 +01:00
Laurent Destailleur	788cbf9a01	Complete work on dol_banner on contracts	2016-12-04 13:30:17 +01:00
fappels	af5eb00933	Ignore filtering if service	2016-12-02 12:18:36 +01:00
fappels	b21fd14a11	Ignore Service, only filter warehouse if parameter set	2016-12-02 12:17:33 +01:00
fappels	2d4807190e	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-11-30 13:03:24 +01:00
fappels	49442c0b7f	Add filter on warehouse status to object line product list	2016-11-30 13:03:17 +01:00
Laurent Destailleur	874bb488da	Fix bad comment	2016-11-29 23:42:56 +01:00
Laurent Destailleur	bd8f923cee	Several fixes in filter on lists	2016-11-29 22:52:16 +01:00
gauthier	9a1309256d	Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received	2016-11-28 17:13:09 +01:00
Laurent Destailleur	5e5ce0043e	Debug module ECM.	2016-11-28 12:03:33 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	e4a8342aef	Fix div-table-form balance on all lists (solve responsive design)	2016-11-27 11:41:10 +01:00
Laurent Destailleur	16ce156631	Fix responsive design	2016-11-25 18:32:52 +01:00
gauthier	c433829d27	NEW : interface	2016-11-25 11:04:42 +01:00
Laurent Destailleur	60b1591f0e	Fix the notes must not be into the tooltip of ref.	2016-11-23 20:30:43 +01:00
Laurent Destailleur	2043c279b0	Merge remote-tracking branch 'origin/4.0' into develop	2016-11-20 15:47:40 +01:00
Laurent Destailleur	cb99113ab0	Css	2016-11-20 15:47:14 +01:00
Laurent Destailleur	e6894eda0e	Better responsive	2016-11-20 10:58:28 +01:00
Laurent Destailleur	b538f13efb	FIX Module gravatar was not triggered on thirdparty and contact card	2016-11-19 19:43:55 +01:00
Laurent Destailleur	e9b78db1ac	Several bug fixes: ... missing import_key field, ref generator parameter must be task not project, import must use css, serious database integrity problem accepting duplicate tasks.	2016-11-19 02:16:12 +01:00
Laurent Destailleur	9b88ae145b	Fix mass action when using no javascript	2016-11-17 19:04:10 +01:00
florian HENRY	afd17feffe	Merge remote-tracking branch 'origin/develop' into franck_develop	2016-11-16 09:38:50 +01:00
Laurent Destailleur	5539415354	FIX Remove hard coded value '1' for default payment term id. Use quick ... hack by adding hidden constant to avoid this.	2016-11-15 10:43:03 +01:00
moreauf	081be37787	NEW: Add project and Hook to Loan ... BUG: Correct discard_closed parametters management in project	2016-11-14 19:25:50 +01:00
Laurent Destailleur	381b77850c	Fix do not show cloning of virtual product if option is off	2016-11-14 02:08:41 +01:00
Laurent Destailleur	04063a62a8	Better responsive	2016-11-12 15:18:38 +01:00
Laurent Destailleur	4bcc7dc8a0	CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu	2016-11-12 14:36:52 +01:00
Laurent Destailleur	b1bd9e4930	Responsive design	2016-11-11 23:17:37 +01:00
Laurent Destailleur	cd9f1db229	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php	2016-11-11 15:12:30 +01:00
Laurent Destailleur	e4617ec76c	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/core/filemanagerdol/connectors/php/config.php htdocs/viewimage.php	2016-11-11 15:03:05 +01:00
Laurent Destailleur	360d697fc3	Add missing field to store result of email sending	2016-11-11 13:45:18 +01:00
Laurent Destailleur	b20c4bdfe4	Responsive design	2016-11-11 12:55:03 +01:00
Laurent Destailleur	ab269bd7a6	Better responsive	2016-11-11 01:15:41 +01:00
Laurent Destailleur	fe9c880984	NEW Add missing unique key on table llx_links	2016-11-10 14:24:29 +01:00
Laurent Destailleur	eaa2125373	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/card.php htdocs/projet/class/project.class.php htdocs/projet/list.php	2016-11-10 11:40:39 +01:00
Laurent Destailleur	cc64994f30	Better responsive design	2016-11-10 11:33:25 +01:00
Laurent Destailleur	e30622cbd8	FIX Bcc must not appears to recipient when using SMTPs lib	2016-11-09 00:10:02 +01:00
Laurent Destailleur	d1446bb7ef	NEW Show subtotal into list of linked elements	2016-11-08 19:19:30 +01:00
Laurent Destailleur	3346fb1c75	Fix can change type from url to other string	2016-11-08 17:30:48 +01:00
Laurent Destailleur	fcca3d6be1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-11-08 17:21:41 +01:00
Laurent Destailleur	6d70d39bbd	NEW Add type "url" as possible extrafield.	2016-11-08 17:21:26 +01:00
Laurent Destailleur	a28e2a7fb6	Merge pull request #5863 from benlo06/fr_total_tva ... New: Permit to print TotalTTC price in objectline_view	2016-11-08 14:46:16 +01:00
Laurent Destailleur	9bff6f966b	NEW Can add event from the card listing events	2016-11-08 14:08:48 +01:00
Laurent Destailleur	7a94cfc994	NEW Better filtering of automatic/manually inserted events.	2016-11-08 13:03:20 +01:00
Laurent Destailleur	341e014a3d	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/don/document.php	2016-11-08 11:36:31 +01:00
Laurent Destailleur	b4c20f1b1a	Fix regression in creation of invoice ... Uniformize code	2016-11-08 11:23:40 +01:00
Laurent Destailleur	9b64fbaa98	Fix having the css of extrafield on td is not enough to detect it. We ... must have it on tr too.	2016-11-06 16:26:18 +01:00
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
Laurent Destailleur	0fea6f22a9	Change code to reduce need of jmobile	2016-11-05 03:27:56 +01:00
Regis Houssin	718adef600	Fix: external access of fkeditor image with multicompany	2016-11-04 10:21:20 +01:00
Laurent Destailleur	59291be6e0	NEW Can filter on status on objects on the "statistics" page.	2016-11-03 19:50:04 +01:00
Laurent Destailleur	a3607fff77	Fix customer ref of shipment	2016-10-30 16:34:46 +01:00
Laurent Destailleur	b4303470f8	Fix do not update instance status if method used to update other element	2016-10-30 15:42:43 +01:00
Laurent Destailleur	3fbba59f69	Better management of status of events	2016-10-30 13:12:35 +01:00
Laurent Destailleur	aec0e79653	Normalize constant name.	2016-10-29 21:47:10 +02:00
Laurent Destailleur	e9edbba093	NEW Usage of vat code seems ok everywhere.	2016-10-29 21:02:08 +02:00
Laurent Destailleur	03b882d095	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/list.php	2016-10-29 19:12:58 +02:00
Laurent Destailleur	17c1b3f1d2	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-10-29 19:00:43 +02:00
Laurent Destailleur	cc43732c56	Responsive enhancements	2016-10-29 17:02:48 +02:00
Laurent Destailleur	32b6660f63	Uniformize code	2016-10-29 16:18:39 +02:00
Laurent Destailleur	4f5c5a2b0e	NEW Function "crop" images available on project, product and holiday ... attachment tab.	2016-10-28 19:42:04 +02:00
Regis Houssin	d0bd1d5d36	Fix: missing path of user photo	2016-10-28 14:22:06 +02:00
Laurent Destailleur	6938b05219	Mutualize code to show files generated for mass actions	2016-10-28 12:00:30 +02:00
Laurent Destailleur	27808b7f81	Merge pull request #5915 from aspangaro/5.0-p29 ... NEW Expense report documents are now available in ECM module	2016-10-26 10:57:23 +02:00
Laurent Destailleur	7d182c286c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/step1.php htdocs/projet/tasks/time.php	2016-10-26 10:40:03 +02:00
Laurent Destailleur	5d655d47fe	Enhance css	2016-10-25 12:36:14 +02:00
Laurent Destailleur	6ef74b33c9	Uniformize code	2016-10-25 11:09:26 +02:00
Laurent Destailleur	b15535c1f1	Uniformize code	2016-10-25 02:04:46 +02:00
Laurent Destailleur	36c2b5afcd	Responsive	2016-10-24 18:43:17 +02:00
Laurent Destailleur	3b05d00163	Better responsive design	2016-10-24 12:06:33 +02:00
Benoit	a46e7d8e1a	Change inputalsopricetotalwithtax to outputalsopricetotalwithtax	2016-10-24 10:18:24 +02:00
aspangaro	d0544b0aea	Merge remote-tracking branch 'Upstream/develop' into 5.0-p29	2016-10-24 05:27:49 +02:00
aspangaro	337e9db046	New: Expense report documents are now available in ECM module	2016-10-24 05:26:19 +02:00
Laurent Destailleur	b284bdd953	NEW #5896 More complete data on event sent by email (name in title, ... emails list in details)	2016-10-24 02:02:30 +02:00
Laurent Destailleur	35601775e0	By default we open a new tab on external url link	2016-10-22 17:05:47 +02:00
Laurent Destailleur	1c59721294	FIX Solve backup when using mysqldump that return warning	2016-10-22 16:20:51 +02:00
Laurent Destailleur	629af89986	FIX Solve backup when using mysqldump that return warning	2016-10-22 16:18:28 +02:00
Laurent Destailleur	f93bca9be9	NEW Can see/make bank conciliation from transaction list	2016-10-21 17:00:31 +02:00
Laurent Destailleur	434b3ef643	Uniformize code and look and feel	2016-10-17 17:52:58 +02:00
Laurent Destailleur	fe471c43d1	Minor css enhancement	2016-10-16 18:28:09 +02:00
Laurent Destailleur	48ce299a38	NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities.	2016-10-15 03:45:23 +02:00
Laurent Destailleur	dfbca2d0ad	Merge pull request #5868 from olsesacl/#5830 ... NEW: #5830 Allow Generic E-mail Sender	2016-10-15 02:43:19 +02:00
Laurent Destailleur	1f6ddb485f	Fix missing module supplier proposal for external users	2016-10-14 18:22:07 +02:00
Laurent Destailleur	b134f853e5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-10-13 21:25:48 +02:00
Laurent Destailleur	78e8ab64aa	Debug multicurrency	2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent	8556dab68e	NEW: #5830	2016-10-13 16:44:17 +02:00
Benlo	4ebd1ff8a2	Permit to print Total TTC price in objectline	2016-10-12 12:30:22 +02:00
Laurent Destailleur	92dc385307	Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card ... Develop new filter by supplier on replenishment card	2016-10-11 20:04:02 +02:00
BENKE Charlie	9663883ae4	Unactive user place on bottom list ... More usefull	2016-10-10 18:15:46 +02:00
Laurent Destailleur	6489cd6164	Debug accounting module	2016-10-07 12:10:16 +02:00
gauthier	fee0a88d27	Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card	2016-10-07 09:25:18 +02:00
gauthier	18496f9159	FIX : params order	2016-10-07 09:19:10 +02:00
Laurent Destailleur	c908af6758	Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month ... NEW Develop new cdr (current or next month) for payment terms.	2016-10-07 00:06:59 +02:00
Laurent Destailleur	db3e3642b0	NEW Can generate SEPA mandate for each bank account of your customers	2016-10-06 00:14:25 +02:00
Laurent Destailleur	e79a84a89b	Uniformize code	2016-10-05 21:49:04 +02:00
gauthier	ee014681b0	Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card	2016-10-05 15:30:23 +02:00
gauthier	9c8ecdc8d8	NEW : filter by supplier on replenish.php	2016-10-05 15:06:30 +02:00
Laurent Destailleur	9ec520a37a	Fix link to on proposal	2016-10-04 20:52:15 +02:00
gauthier	b35a4eb1b2	Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month	2016-10-04 16:01:26 +02:00
gauthier	1c98979ca1	NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month	2016-10-04 15:45:23 +02:00
Laurent Destailleur	b607fb6be2	Fix do not show link to for disabled modules	2016-10-04 12:52:00 +02:00
Laurent Destailleur	3599f2c840	Uniformize code for recurring invoices	2016-10-04 12:31:45 +02:00
Laurent Destailleur	e37e30cc39	Better responsive	2016-10-04 11:29:48 +02:00
Laurent Destailleur	7967c80179	Code comment	2016-10-03 12:16:32 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +02:00
Laurent Destailleur	0d9f28bd61	Fix dash in incoterm label	2016-10-02 16:50:28 +02:00
Laurent Destailleur	f92ca518f7	Uniformize look and feel	2016-10-02 16:38:58 +02:00
Laurent Destailleur	2579cb35dd	Minor fix	2016-10-02 11:03:36 +02:00
Laurent Destailleur	e62a12ebe9	Merge pull request #5817 from atm-arnaud/FIX_develop_maxwidthonsmartphone_on_extrafields ... Fix Extrafields edit crashed by maxwidthonsmartphone ...	2016-10-01 18:59:37 +02:00
Laurent Destailleur	ee252f549a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog dev/skeletons/skeleton_list.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/lib/cron.lib.php htdocs/core/tpl/admin_extrafields_add.tpl.php	2016-10-01 18:42:50 +02:00
Laurent Destailleur	cf7327a2a2	FIX #5750 Bug: CmailFile::server_parse enters an infinite loop if ... $server_response is false	2016-10-01 16:41:12 +02:00
arnaud	0bb7aaa62f	Fix Extrafields edit crashed by maxwidthonsmartphone ...	2016-09-30 14:26:04 +02:00
Laurent Destailleur	5c9fa28e79	Fix search on invoice type	2016-09-29 10:38:15 +02:00
Laurent Destailleur	6232e59fd2	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-26 14:17:36 +02:00
Laurent Destailleur	fac946dbb8	FIX The email test sender in email setup was broken	2016-09-26 14:08:14 +02:00
Laurent Destailleur	48b188d200	Merge pull request #5785 from EuskalMoneta/rest-api-add-countries-and-towns ... NEW Add Countries and Towns to the REST API.	2016-09-26 01:33:56 +02:00
Laurent Destailleur	100312aac2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/adherents/class/cotisation.class.php	2016-09-26 01:32:50 +02:00
Laurent Destailleur	ea09eb13da	Uniformize code	2016-09-26 00:10:29 +02:00
Xebax	d5ee73a1b7	Add Countries to the REST API.	2016-09-25 17:43:15 +02:00
aspangaro	2dbeeedd14	Move tab menu for subscription in member.lib ... Move all pages for subscription member in adherent/subscription (Card / Info / List) Rename llx_cotisation in llx_subscription Rename all db field cotisation in subscription Rename class Cotisation in class Subscription	2016-09-24 06:48:40 +02:00
florian HENRY	984a56adc5	FIX : #5776	2016-09-23 10:51:31 +02:00
Laurent Destailleur	d4e324d15a	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/facture.php	2016-09-21 18:38:30 +02:00
Laurent Destailleur	9c12444a03	Fix size of warehouse and height of confirm box	2016-09-21 18:20:18 +02:00
Laurent Destailleur	39c4feaef7	Enhancement for usage on smartphone	2016-09-21 03:54:54 +02:00
Laurent Destailleur	133657a8c7	Uniformize code	2016-09-21 01:25:34 +02:00
Laurent Destailleur	c4c7ccc226	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/societe/note.php htdocs/societe/rib.php	2016-09-19 14:05:16 +02:00
Laurent Destailleur	4f842fd2cb	Uniformize look and feel	2016-09-19 13:57:50 +02:00
Laurent Destailleur	079ed88119	Fix missing css	2016-09-19 13:57:18 +02:00
Laurent Destailleur	af28a67803	Uniformize look using dol_banner	2016-09-19 10:43:30 +02:00
Laurent Destailleur	c8b8e13014	Work on dol_banner for proposals.	2016-09-18 21:38:20 +02:00
Laurent Destailleur	6093dfe333	Uniformize code	2016-09-18 12:33:30 +02:00
Laurent Destailleur	72aacb81ae	NEW Can use native php and dolibarr object on pages of module website.	2016-09-16 01:13:52 +02:00
Laurent Destailleur	68b3de5b37	NEW ckeditor accept a parameter to disable all html filtering	2016-09-15 23:23:10 +02:00
Sergio Sanchis Climent	93b216e628	FIX: #5699	2016-09-15 05:18:08 +02:00
Laurent Destailleur	39d47eab18	NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment ... term on company level.	2016-09-14 11:17:44 +02:00
phf	0cf5ee2f28	Fix clone object with "link" as extrafield	2016-09-13 10:12:55 +02:00
Laurent Destailleur	0ab377440d	Complete param of setValueFrom	2016-09-12 20:16:39 +02:00
Laurent Destailleur	5c1127fc54	NEW Enhance function setValueFrom so we can use it for "edit in form" ... feature.	2016-09-12 20:00:47 +02:00
Laurent Destailleur	efb05fda6a	Cleaner code to avoid to log when nothing is done	2016-09-12 19:58:43 +02:00
Laurent Destailleur	1f9aa856d5	NEW the list of linked files on card does not forget external links.	2016-09-12 18:37:40 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
Laurent Destailleur	9ff1809f85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php	2016-09-12 02:05:38 +02:00
Laurent Destailleur	1bb278a587	Fix #5712	2016-09-11 23:01:04 +02:00
Laurent Destailleur	6d6eceb0ca	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-08 11:39:38 +02:00
Laurent Destailleur	5fdca121aa	NEW Can renamed attached files on products and expense reports	2016-09-07 01:54:16 +02:00
Marcos García de La Fuente	05728075d6	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-09-06 21:06:33 +02:00
Laurent Destailleur	666c62af04	Fix http into https	2016-09-06 00:59:31 +02:00
Laurent Destailleur	d24045d831	NEW Editing translation GUI become easier with search translation tool.	2016-09-04 14:45:43 +02:00
Laurent Destailleur	cb27b01812	Work on feature to find a translation key	2016-09-03 18:47:04 +02:00
Laurent Destailleur	0e4b4ee321	Merge branch 'develop-external-logging' of ... https://github.com/GPCsolutions/dolibarr into GPCsolutions-develop-external-logging Conflicts: composer.json	2016-09-02 21:51:25 +02:00
Laurent Destailleur	524dd79198	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/bank/search.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/projet/tasks/time.php	2016-08-31 00:16:07 +02:00
Laurent Destailleur	5e88de7e2c	Fix field customer/prospect/supplier in list of thirdparties	2016-08-28 15:21:09 +02:00
Laurent Destailleur	2e7e5151b7	Merge pull request #5463 from hregis/develop_origin ... New: Add entity field in llx_societe_remise_except and llx_societe_remise	2016-08-28 12:23:04 +02:00
Laurent Destailleur	fac28f9589	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php	2016-08-28 02:40:20 +02:00
Regis Houssin	6e40f9e700	Merge remote-tracking branch 'dolibarr/develop' into develop_origin ... Conflicts: htdocs/core/class/html.form.class.php Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59	2016-08-25 10:15:26 +02:00
Maxime Kohlhaas	52cbdf04c3	Allow to use textwithpicto with a custom picto	2016-08-23 11:03:47 +02:00
Laurent Destailleur	83107746ad	Fix no way to fix the ref of recurring invoice when an error was done ... into typing.	2016-08-19 16:18:39 +02:00
Laurent Destailleur	fead7967f2	Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/commande/list.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/resource/class/resource.class.php	2016-08-17 16:55:39 +02:00
Laurent Destailleur	282c50ef34	Merge pull request #5631 from atm-florian/4.0 ... FIX #5594	2016-08-17 14:08:06 +02:00
Laurent Destailleur	caa0dd75aa	Fix responsive design on small smartphone	2016-08-17 11:47:39 +02:00
florian HENRY	0ac090e959	FIX : #5629 DoliDBPgsql::query SQL Error message: ERROR: 22P02: invalid ... input syntax for integer: ""	2016-08-16 09:07:08 +02:00
florian HENRY	3932a32399	FIX : #5629 PgSQL Interger string stylish error	2016-08-16 09:00:52 +02:00
florian HENRY	aa17564e93	FIX: #5594	2016-08-16 08:54:12 +02:00
Raphaël Doursenaud	49cb61b530	CLOSE #5627 Allowed external logging modules. ... Removed Sentry logging.	2016-08-16 03:24:04 +02:00
Laurent Destailleur	6b6ee8795c	Button filter on boxes is at end of title line	2016-08-11 19:55:29 +02:00
florian HENRY	321814fae3	better fix for #5594	2016-08-09 15:17:19 +02:00
Laurent Destailleur	4d4fc87e2b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/dispatch.php htdocs/product/stock/productlot_list.php htdocs/websites/index.php	2016-08-09 13:26:08 +02:00
florian HENRY	90cb71f341	revert better fix	2016-08-08 13:54:51 +02:00
florian HENRY	15f187c466	better test	2016-08-08 13:54:03 +02:00
florian HENRY	94487cf411	FIX #5594	2016-08-08 13:43:44 +02:00
Laurent Destailleur	bcd055b378	Move button to link to, in same part of code than code to output links.	2016-08-05 15:30:28 +02:00
Laurent Destailleur	890e6f59c8	NEW Support mass actions for proposals	2016-08-05 13:08:23 +02:00
Laurent Destailleur	e168888c59	NEW Reduce nb of picto on ref into list, merging preview and download	2016-08-05 12:20:11 +02:00
Laurent Destailleur	e1e8254bcf	Fix thumbs are using same extension than original.	2016-08-05 04:31:19 +02:00
Laurent Destailleur	544d5af49b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-05 01:15:35 +02:00
Laurent Destailleur	33d12a4492	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/admin.lang	2016-08-05 01:15:19 +02:00
Laurent Destailleur	7211542e41	Merge pull request #5569 from olsesacl/develop-show-preview-documents ... NEW Preview documents	2016-08-05 01:13:35 +02:00
Laurent Destailleur	4e483c675e	Merge branch 'dev_add_color_on_select_product' of ... https://github.com/atm-florian/dolibarr into atm-florian-dev_add_color_on_select_product Conflicts: htdocs/core/class/html.form.class.php	2016-08-05 00:44:24 +02:00
Laurent Destailleur	26f553a1a8	Fix bad position of test	2016-08-04 12:04:43 +02:00
Laurent Destailleur	7a7e7b330f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-04 11:58:11 +02:00
Laurent Destailleur	7f6e2a277a	NEW Link between objects can be done on both side and on all objects	2016-08-04 11:57:37 +02:00
Laurent Destailleur	e0b9496f9e	Fix link sometimes fails because of id not defined	2016-08-04 10:44:17 +02:00
florian HENRY	13f33ab9c7	syntax	2016-08-04 09:23:10 +02:00
florian HENRY	a013e84e0e	NEW : Add color regarding stock even on ajax autocompleter product ... selector	2016-08-04 09:21:04 +02:00
Laurent Destailleur	b97223edd7	Fix: link to link to objects not visible	2016-08-03 19:01:51 +02:00
Laurent Destailleur	6ae8d26a89	Fix max width on combo of tasks	2016-08-03 00:04:38 +02:00
Laurent Destailleur	f0c75388cb	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/api_commande.class.php htdocs/compta/facture/class/api_invoice.class.php htdocs/product/class/api_product.class.php htdocs/societe/class/api_contact.class.php htdocs/societe/class/api_thirdparty.class.php	2016-08-02 17:43:12 +02:00
Sergio Sanchis Climent	5fe0d601da	New: Preview documents	2016-08-02 03:35:22 +02:00
Laurent Destailleur	e335ce6f45	Fix bad var declared	2016-08-01 19:54:03 +02:00
Laurent Destailleur	b267402df6	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/main.lang htdocs/societe/rib.php	2016-08-01 15:15:32 +02:00
Laurent Destailleur	51e941b9b4	Fix for option MAIN_OPTIMIZEFORTEXTBROWSER	2016-07-31 13:07:55 +02:00
Laurent Destailleur	79222c732d	Fix bad var	2016-07-31 02:56:08 +02:00
Laurent Destailleur	d60ac77ad3	NEW The autofill zip/town table option is on by default.	2016-07-30 15:49:39 +02:00
Laurent Destailleur	45e37c82cd	FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/fourn/facture/list.php	2016-07-29 16:29:31 +02:00
Laurent Destailleur	b85bb8c0f8	Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2016-07-29 16:24:02 +02:00
Laurent Destailleur	b3cdb1f163	FIX tag for date rfc in odt substitution	2016-07-29 16:21:28 +02:00
Laurent Destailleur	9ca7f2cb66	Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by ... default).	2016-07-28 19:02:23 +02:00
Laurent Destailleur	00118610bb	A fix to make editinplace working better	2016-07-28 15:29:46 +02:00
Laurent Destailleur	aae2086ada	Move notes on dedicated tabs like other elements. ... Rename also the note available into translation tab into "other" to avoid confusion because it was not the same usage.	2016-07-28 13:53:17 +02:00
Regis Houssin	6bf655c882	Merge remote-tracking branch 'dolibarr/develop' into develop_origin ... Conflicts: htdocs/societe/class/societe.class.php Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb	2016-07-28 09:53:10 +02:00
Laurent Destailleur	8b3136cb96	Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/langs/en_US/admin.lang htdocs/langs/fr_FR/companies.lang	2016-07-27 19:04:55 +02:00
Sergio Sanchis Climent	3b57727542	PHP7 warnings on project module's configuration page	2016-07-26 22:22:55 +02:00
Regis Houssin	4b8f42949c	# WARNING: head commit changed in the meantime ... Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670	2016-07-25 21:05:11 +02:00
Marcos García de La Fuente	3029fd0fe1	FIX #5540 getFormMail is not registered as addReplace hook	2016-07-25 13:18:41 +02:00
Marcos García de La Fuente	3ef3a038cf	Merge branch '3.9' into bug-5537	2016-07-25 11:50:08 +02:00
Marcos García de La Fuente	a9d75b2c91	FIX #5537 AJAX project search does not work properly	2016-07-25 11:49:04 +02:00
BENKE Charlie	415bdbe9b5	Update html.formfile.class.php	2016-07-25 11:22:53 +02:00
Marcos García de La Fuente	b1c552ee9d	Merge branch 'develop' into prod-attr ... # Conflicts: # htdocs/install/mysql/tables/llx_product_attribute.key.sql # htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql	2016-07-24 11:54:38 +02:00
Marcos García de La Fuente	c082505021	NEW Added product attributes feature	2016-07-24 11:27:52 +02:00
Laurent Destailleur	08d23b482b	NEW Introduce mass action "delete" on sales orders.	2016-07-23 12:17:47 +02:00
Laurent Destailleur	af09528738	NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and ... __AMOUNT_WO_TAX__ into emails templates.	2016-07-21 20:45:30 +02:00
Laurent Destailleur	93bb929219	Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type ... NEW : Add new password extrafields type	2016-07-21 14:01:07 +02:00
Laurent Destailleur	058c431483	FIX The project was lost when creating the event "sent by email". Also, ... event company "create" was not tracked by default like others.	2016-07-21 13:49:10 +02:00
Laurent Destailleur	34d1c0af72	Merge pull request #5321 from frederic34/patch-7 ... Fix quotes not required on int	2016-07-20 19:09:09 +02:00
Laurent Destailleur	e2a03d18dd	Merge remote-tracking branch 'origin/4.0' into develop	2016-07-16 19:58:36 +02:00
Laurent Destailleur	553981426e	Several minor fixes in expense reports	2016-07-16 15:21:38 +02:00
Laurent Destailleur	6fcd9e8dbf	Merge pull request #4612 from bafbes/abb-1 ... FIX Target object does not need to have all extrafields of source object.	2016-07-15 17:41:29 +02:00
Laurent Destailleur	9ba1ca5acb	Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 ... Conflicts: htdocs/langs/en_US/companies.lang	2016-07-15 17:05:12 +02:00
Laurent Destailleur	1b070babc8	Merge remote-tracking branch 'origin/4.0' into develop	2016-07-15 14:23:44 +02:00
Laurent Destailleur	fdfe4d9ac5	Fix missing getFormMail as "addreplace" hook	2016-07-15 14:21:07 +02:00
Bahfir Abbes	5966170a0d	Done, thanks	2016-07-15 10:43:01 +01:00
Laurent Destailleur	a5123c06db	Save the virtualhost so we can test without entering it each time.	2016-07-14 19:42:04 +02:00
Laurent Destailleur	fabd74169f	Fix: missing 'Maximize' button on full toolbar set of ckeditor.	2016-07-14 11:46:32 +02:00
Laurent Destailleur	329bdfc9fd	FIX We must take last recent price when using several level of prices	2016-07-11 11:35:38 +02:00
Laurent Destailleur	0367cee671	FIX We must take the last recent defined price when using price level	2016-07-11 11:34:11 +02:00
Laurent Destailleur	a258663175	Fix edition of status were loosing old percent. We show it to allow user ... to keep it if required.	2016-07-09 14:58:51 +02:00
Laurent Destailleur	93c9e81c33	Fix better size on list	2016-07-09 12:05:09 +02:00
Laurent Destailleur	d8d938e82c	Fix performance problems Enter new time spent duration becoma < 1s ... instead of 30s with 5000 tasks.	2016-07-08 17:06:12 +02:00
Laurent Destailleur	a95335d869	Fix missing ref of task	2016-07-08 16:20:11 +02:00
Laurent Destailleur	d940cc392a	FIX Several fix to exclude WON/LOST of reporting of opportunities amount ... (sometimes we need, sometimes not).	2016-07-08 10:59:13 +02:00
Laurent Destailleur	5ebbe02853	Fix missing trackid into parameters of hooks	2016-07-07 16:26:00 +02:00
Regis Houssin	ee02ff43d7	Fix: add entity field in llx_societe_remise_except, useful when ... third-sharing is used with multicompany	2016-07-07 12:26:30 +02:00
florian HENRY	2d932066c7	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type	2016-07-07 09:17:39 +02:00
Laurent Destailleur	f756f3db0e	Fix hook context 'all'	2016-07-07 01:23:20 +02:00
Laurent Destailleur	8505c5db09	Code comment	2016-07-06 13:26:49 +02:00
Laurent Destailleur	759b265eeb	Merge pull request #5447 from atm-florian/dev_fix5446 ... FIX #5446 Extrafields select list filter on other select list do not work	2016-07-06 11:46:21 +02:00
Laurent Destailleur	c360189d94	Code comment	2016-07-06 11:14:17 +02:00
Laurent Destailleur	b4c8822281	Fix style of text after ref on invoices	2016-07-05 16:27:14 +02:00
florian HENRY	fc2e7fb1ad	FIX #5446	2016-07-05 15:45:33 +02:00
Laurent Destailleur	525b2cf297	Fix: Edition of contract on intervention failed	2016-07-02 12:02:51 +02:00
Laurent Destailleur	59f86a12d2	Fix delete of documents generated on project. ... Fix missin translation	2016-07-01 17:49:13 +02:00
Laurent Destailleur	62d7303d8f	Add comment	2016-07-01 03:40:48 +02:00
Laurent Destailleur	05384b2f88	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/list.php htdocs/projet/card.php htdocs/societe/consumption.php	2016-07-01 02:39:29 +02:00
Laurent Destailleur	29e26c2342	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/lib/sendings.lib.php	2016-07-01 02:06:30 +02:00
florian HENRY	215f397f33	Cannot reproduce 4793 still fix other bug on PgSQL	2016-06-30 17:28:13 +02:00
fmarcet	e4a2b5abb3	Fix: Incorrect document link on supplier invoices's list	2016-06-30 11:27:29 +02:00
Laurent Destailleur	dcfc385645	Fix to avoid blocking error in auto upgrade process	2016-06-29 12:26:01 +02:00
florian HENRY	52f2e228f1	Add new password extrafields type	2016-06-28 10:21:10 +02:00
Laurent Destailleur	5aa561598f	Fix exit into functions	2016-06-28 02:22:01 +02:00
Laurent Destailleur	d6e15fe8f3	Increase max size of number of product into list	2016-06-26 23:15:20 +02:00
Laurent Destailleur	f021a8ca31	FIX Bad error management into trigger of mailmanspip	2016-06-25 18:48:50 +02:00
Laurent Destailleur	2767df2e01	FIX Solve problem of sending joinded files of another email when several ... tabs are opened on form to send emails.	2016-06-24 16:10:52 +02:00
Laurent Destailleur	6033b09344	FIX: A constructor must not return a value. ... FIX: A topic is required to send an email (probability to be spam of 99%)	2016-06-24 15:36:20 +02:00
Laurent Destailleur	0bf0937cc6	FIX: disabled templates must be not visible.	2016-06-24 13:08:34 +02:00
Laurent Destailleur	453c6264bf	FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly	2016-06-24 02:19:41 +02:00
Laurent Destailleur	227bdb9838	FIX extrafields was not visible on tab "subscription" ... FIX Link between membership and invoice was not saved	2016-06-24 00:45:35 +02:00
Laurent Destailleur	d72d22cda4	Fix confusing translation	2016-06-23 23:22:30 +02:00
Laurent Destailleur	91e13d23fe	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-06-23 20:20:16 +02:00
Scrutinizer Auto-Fixer	23620e3133	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-06-23 18:19:43 +00:00
Laurent Destailleur	2223ec15d1	Fix doxygen errors	2016-06-23 20:19:35 +02:00
Laurent Destailleur	4a408e76e7	Fix download of mass generated files.	2016-06-22 21:06:08 +02:00
Laurent Destailleur	52f414ad73	Fix selection of visible fields on customer and supplier lists. Filters ... are ok now. Order of list of fields in selection is same than in output array.	2016-06-21 15:16:33 +02:00
Laurent Destailleur	6317cb53f2	FIX Merge of 2 thirdparties when there is one common tag.	2016-06-20 15:42:16 +02:00
Laurent Destailleur	7f4e163a52	Fix scrutinizer reports	2016-06-20 02:37:02 +02:00
Laurent Destailleur	8187dc2006	Fix css	2016-06-19 16:07:34 +02:00
Laurent Destailleur	34c741bf0d	FIX CSS and responsive behaviour (feature with a menu hider is on on ... smarpthone)	2016-06-17 16:28:16 +02:00
Laurent Destailleur	5b5b7a2bf9	FIX Bad value used for task warning delay ... FIX Compatibility datee and date_end for warning of tasks	2016-06-15 14:05:48 +02:00
Laurent Destailleur	aed2c5cb30	Clean css	2016-06-10 18:41:18 +02:00
Frédéric FRANCE	262dcbea2c	Update commonobject.class.php	2016-06-07 18:08:33 +02:00
Laurent Destailleur	9019576394	Fix css class opacitymedium was not used everywhere.	2016-06-07 15:58:02 +02:00
Laurent Destailleur	c7065cc3b8	Minor esthetic fixes	2016-06-07 13:15:38 +02:00
Laurent Destailleur	293c8e145a	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/imports/import.php htdocs/langs/en_US/admin.lang	2016-06-05 02:20:27 +02:00
Laurent Destailleur	c09dbe05b3	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/class/ldap.class.php htdocs/expensereport/card.php htdocs/langs/en_US/admin.lang	2016-06-05 00:25:08 +02:00
Laurent Destailleur	db2269b9dd	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/class/ldap.class.php htdocs/langs/en_US/admin.lang	2016-06-05 00:12:34 +02:00
Maxime Kohlhaas	3ef9fe2c40	Fix product supplier price modification with multicompany	2016-06-04 18:10:40 +02:00
BENKE Charlie	d86f89a8fa	fix : #4853 ... append if not contact type for the element	2016-06-04 17:55:28 +02:00
phf	8ccda16ef3	Fix call function ldap_connect but not exists	2016-06-04 14:50:32 +02:00
Laurent Destailleur	bfb7923d4c	Merge pull request #5268 from atm-ph/fix_multicurrency_conf ... Fix conf useful has been commented	2016-06-04 11:37:01 +02:00
Laurent Destailleur	b57476153f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/societe/consumption.php	2016-06-04 01:14:36 +02:00
phf	495ce2463d	Fix switch currency on document do not get the associate rate	2016-06-04 01:13:23 +02:00
phf	cd79675f7a	Fix using extrafield type "link to object" show error on edit card	2016-06-03 21:16:25 +02:00
Laurent Destailleur	5106f40a56	Merge branch 'develop_NEW_decrease_stock_expedition_classify' of ... https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_decrease_stock_expedition_classify Conflicts: htdocs/expedition/class/expedition.class.php	2016-06-02 11:23:49 +02:00
Laurent Destailleur	c663ca13b8	Fix edit left menu	2016-06-01 21:41:47 +02:00
Laurent Destailleur	028ff5e84c	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/card.php htdocs/langs/en_US/products.lang htdocs/societe/list.php	2016-06-01 17:59:50 +02:00
Laurent Destailleur	40005b8f65	FIX Missing search on barcode, only if defined	2016-06-01 12:15:54 +02:00
Laurent Destailleur	1bc6c4ffa3	Clean code	2016-05-30 20:50:49 +02:00
Laurent Destailleur	460d7ce915	FIX Split of credit note into discount page generates records not ... correctly recognised as credit note.	2016-05-30 19:38:28 +02:00
Laurent Destailleur	22d6d9497e	Fix ambiguous test on ldap return of getAttributes	2016-05-29 11:20:12 +02:00
Laurent Destailleur	9bd9cda224	Move to HTML5	2016-05-24 16:02:43 +02:00
Laurent Destailleur	3119d77565	Add warning on deprecated param	2016-05-22 16:36:48 +02:00
Laurent Destailleur	634ebaa3b6	Fix into conf.class.php file we must use $this and not $conf	2016-05-21 16:01:14 +02:00
Laurent Destailleur	e6a78739bd	Fix translation from a key that is a numeric	2016-05-19 21:12:09 +02:00
Laurent Destailleur	901c7c9517	Link "Backtolist" was missing on products	2016-05-17 02:16:28 +02:00
Alexis Algoud	8d0e5479a0	Rename var	2016-05-14 19:22:27 +02:00
Alexis Algoud	e74e70287f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/product/stock/replenish.php	2016-05-14 19:14:39 +02:00
Laurent Destailleur	d1d1b824b4	Better coding of #5181. I removed need of external lib.	2016-05-13 20:20:48 +02:00
Laurent Destailleur	698b93cf1e	FIX #5179	2016-05-08 12:38:30 +02:00
Laurent Destailleur	5cf8612c58	Fix scrutinizer errors	2016-05-08 12:08:23 +02:00
Juanjo Menent	ae6e233781	Merge pull request #5176 from Dolibarr/scrutinizer-patch-3 ... Scrutinizer Auto-Fixes	2016-05-07 00:49:57 +02:00
Laurent Destailleur	d484383467	Minor errors	2016-05-06 22:06:23 +02:00
Scrutinizer Auto-Fixer	9508d8a5c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-05-06 19:10:59 +00:00
Laurent Destailleur	aa55cdadac	Merge pull request #4944 from FHenry/develop_advtargetemailiing ... NEW : Advance target emailing	2016-05-05 23:18:27 +02:00
Laurent Destailleur	d2df537d43	Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project ... NEW allow a document to be linked to project from another customer	2016-05-05 22:24:32 +02:00
Laurent Destailleur	461f62c200	Use the new global search form	2016-05-05 13:29:42 +02:00
Florian HENRY	3d57e83094	Merge branch 'develop' into develop_advtargetemailiing ... Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/install/mysql/tables/llx_c_accounting_category.sql	2016-05-02 20:40:42 +02:00
Florian HENRY	fda5e6002f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/websites/index.php	2016-05-02 20:27:34 +02:00
abb	23c0a0a64e	conflict solved Merge branch 'develop' into abb-14 ... Conflicts: htdocs/langs/en_US/companies.lang	2016-05-02 01:28:46 +01:00
abb	9ba129aa0c	Merge branch 'develop' into abb-1	2016-05-02 01:17:27 +01:00
Laurent Destailleur	46e2ed2810	NEW: All variant of ckeditor config can be tested into the setup page of ... module.	2016-05-01 20:36:42 +02:00
Laurent Destailleur	f59f3032c6	NEW: Rename path for generic medias files into '/medias' instead of ... fckeditor. Add location of medias into title of media browser of ckeditor. Work on website module	2016-05-01 16:34:50 +02:00
Laurent Destailleur	6a123c91b5	Solve warnings that appears because code is using statically a mehtod ... that can't be static yet.	2016-04-30 19:30:28 +02:00
Laurent Destailleur	97bf91cc5d	Show both currency symbol and code	2016-04-30 14:09:00 +02:00
Laurent Destailleur	0cde6ad98f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/filefunc.inc.php	2016-04-29 20:43:42 +02:00
Laurent Destailleur	3d9456b202	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/fourn/facture/list.php	2016-04-29 20:42:35 +02:00
Laurent Destailleur	53386e22ea	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/expedition/class/expedition.class.php htdocs/index.php	2016-04-29 20:39:17 +02:00
Laurent Destailleur	0735413e7c	Merge pull request #5101 from altatof/fix_fournprice_select ... FIX: end of select when no fournprice	2016-04-29 20:36:44 +02:00
BENKE Charlie	31a9acc77d	</option> not present in some select list	2016-04-29 20:18:26 +02:00
Laurent Destailleur	db4024035e	Merge pull request #5092 from defrance/patch-1 ... </option> not present in some select list	2016-04-29 20:17:56 +02:00
esprit libre	f5a541d469	Fix problem about unit buy price fetching ... To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price. Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges	2016-04-29 19:41:47 +02:00
Laurent Destailleur	b17b30f5a2	Merge pull request #5114 from esprit-libre/develop ... FIX When buy price not explicetly defined, it is return by defineBuyPrice function that return total price instead of unit price	2016-04-29 19:40:29 +02:00
Alexis Algoud	e5b6d39e51	NEW allow a document to be linked to project from another customer on config	2016-04-29 18:04:59 +02:00
Florian HENRY	6ff71792a0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-04-29 09:00:42 +02:00
Laurent Destailleur	2ea5bf3d5e	FIX: Pre selected value was not used on supplier list ouput	2016-04-28 20:04:48 +02:00
esprit libre	75a9178549	Fix problem about unit buy price fetching ... To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price. Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges	2016-04-27 16:42:59 +02:00
Florian HENRY	1d75c5f720	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/commonobject.class.php	2016-04-27 09:41:42 +02:00
Laurent Destailleur	78cda5dc07	Fix problem with code of reccuring invoices	2016-04-26 22:00:41 +02:00
Florian HENRY	b82a216879	fix confilct	2016-04-26 14:21:40 +02:00
Florian HENRY	c7a9f26ee5	NEW : continue hidden extrafield feature	2016-04-26 14:17:19 +02:00