45041 Commits

Author	SHA1	Message	Date
Florian HENRY	b8af7625ff	fix new extrafields feature	2015-11-20 15:29:31 +01:00
Florian HENRY	87c9132a6d	avoid error	2015-11-20 13:59:58 +01:00
Florian HENRY	101b45e397	Continue extrafeild $ID$ and select feature	2015-11-20 13:52:47 +01:00
Florian HENRY	b8cab9f4d9	continue extrafeild $ID$ and SELECT feature	2015-11-20 13:51:57 +01:00
Florian HENRY	4ff0c22e29	continue extrafield ID filter	2015-11-20 13:22:45 +01:00
Florian HENRY	eac28076c9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-20 11:59:39 +01:00
Florian HENRY	1566be35a1	NEW : add $ID$ into extrafields management to allow use current object ... id on filter for select list from table and checkbox list from table	2015-11-20 11:59:28 +01:00
arnaud	4233d24f4b	FIX export with category contact extrafields	2015-11-19 18:01:58 +01:00
Frédéric FRANCE	47485b39ce	Update commande.class.php	2015-11-19 16:41:11 +01:00
Florian HENRY	80f19de223	fix && vs and	2015-11-19 16:32:25 +01:00
Frédéric FRANCE	6c8ac1e95c	typo	2015-11-19 16:31:55 +01:00
Frédéric FRANCE	3a2cb63575	Update list.php	2015-11-19 16:20:06 +01:00
Maxime Kohlhaas	9c1545bc1b	NEW add info page on product card	2015-11-19 14:45:05 +01:00
Maxime Kohlhaas	826592c480	Fix info and banner on societe	2015-11-19 14:43:00 +01:00
Maxime Kohlhaas	e4125c9802	NEW : info function for product card	2015-11-19 14:26:32 +01:00
philippe grand	4f280f63d0	[Qual] Uniformize code	2015-11-19 13:59:58 +01:00
Florian HENRY	0c4f7a1b22	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-19 12:55:20 +01:00
aspangaro	98d5f21787	Debug state	2015-11-19 06:21:37 +01:00
Juanjo Menent	a627e32fca	Merge pull request #4034 from fmarcet/3.7 ... FIX Not use localtaxes when invoice some orders	2015-11-18 23:07:24 +01:00
Juanjo Menent	3094f9ed32	Merge pull request #4032 from grandoc/develop ... [Qual] Uniformize code	2015-11-18 23:05:04 +01:00
Juanjo Menent	5218501c04	Merge pull request #4024 from defrance/patch-81 ... bad limittoshow usage	2015-11-18 22:31:57 +01:00
Juanjo Menent	9ecdfa8be8	Merge pull request #4017 from apachler/develop ... added Regions, Departements and Forme Juridique for Austria	2015-11-18 22:04:19 +01:00
Frédéric FRANCE	dfdc220c6b	Update list.php	2015-11-18 18:16:03 +01:00
Frédéric FRANCE	c647ad6425	Update list.php	2015-11-18 18:15:02 +01:00
Frédéric FRANCE	fe7cc95efd	Update list.php	2015-11-18 18:13:19 +01:00
fmarcet	f615927d24	FIX Not use localtaxes when invoice some orders	2015-11-18 17:56:04 +01:00
arnaud	85a58f666a	FIX product link in project box	2015-11-18 17:22:53 +01:00
philippe grand	42ed3d2bb7	[Qual] Uniformize code	2015-11-18 16:05:41 +01:00
Florian HENRY	fbe8a181a9	fix pgsql	2015-11-18 14:03:25 +01:00
fmarcet	0cbf8ca1dd	FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO ... variable is empty or not	2015-11-18 13:59:25 +01:00
Laurent Destailleur	735c7b7d68	Code comment	2015-11-18 13:57:01 +01:00
Florian HENRY	0ffc2a226c	fix pg migration script	2015-11-18 13:53:04 +01:00
Laurent Destailleur	fbd1d2360f	Comment	2015-11-18 13:42:38 +01:00
Laurent Destailleur	5c6f7425f1	FIX: List of user to assign a task is not visible	2015-11-18 13:23:01 +01:00
Florian HENRY	28196a5fd9	add pgsql function	2015-11-18 12:24:52 +01:00
aspangaro	1e4d8ec104	New: HRM #3699 Add address informations in user card	2015-11-18 06:34:08 +01:00
aspangaro	ad457b416d	Use menu & add mode 'employee' in user/index.php	2015-11-17 22:51:34 +01:00
aspangaro	96d97657fd	Remove obsolete code	2015-11-17 22:17:18 +01:00
aspangaro	258ac45519	Remove obsolete code	2015-11-17 22:14:39 +01:00
aspangaro	1f9960d1bb	Remove info on employee card	2015-11-17 21:25:07 +01:00
aspangaro	c7df6c15a2	Different display if employee mode	2015-11-17 21:22:45 +01:00
aspangaro	b7b25c9682	Remove some code	2015-11-17 21:04:11 +01:00
aspangaro	a5ca6cb732	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-17 20:34:37 +01:00
Nikos Drosis	5082b1cc66	Fix for utf-8 characters in the mask mercure	2015-11-17 20:22:27 +02:00
Laurent Destailleur	683ad24ece	Take number of entry into top menu to defined the trigger to change size ... of top menu thumbs	2015-11-17 19:16:40 +01:00
Laurent Destailleur	b1c5768de9	NEW Add fields into llx_cronjobs to be able to use job table to queue ... one shot jobs.	2015-11-17 18:22:39 +01:00
BENKE Charlie	ce367bfa31	bad limittoshow usage ... the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector	2015-11-17 14:42:34 +01:00
Laurent Destailleur	6dc6bab556	Support of 'small', 'mini' and '' image size everywhere.	2015-11-17 10:38:00 +01:00
Laurent Destailleur	86db029cb3	Merge pull request #4013 from fappels/develop ... Fix migration - remove default for text field	2015-11-17 10:06:07 +01:00
BENKE Charlie	4aad7122e0	add odt feature on supplier admin page ... add odt feature on supplier admin page	2015-11-17 10:06:03 +01:00
BENKE Charlie	8630a2d56b	add odt feature on supplier admin page ... add odt feature on admin page	2015-11-17 10:04:13 +01:00
Andreas Pachler	161b75acfc	added Regions, Departements and Forme Juridique for Austria	2015-11-17 06:56:49 +01:00
Laurent Destailleur	c6e7413349	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-17 00:58:22 +01:00
Laurent Destailleur	f5631cac45	NEW Introduce property module_position so a module can decide where it ... appears into list of modules.	2015-11-17 00:58:12 +01:00
Paris Liakos	fb6819764d	Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product	2015-11-17 01:20:58 +02:00
Laurent Destailleur	a8bfa1a258	Merge pull request #4011 from ParisLiakos/develop ... Add triggers for product and category translation changes	2015-11-16 23:50:18 +01:00
Laurent Destailleur	508b11733a	Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name ... FIX 3.8 allow to search on alias name into select	2015-11-16 23:48:18 +01:00
Laurent Destailleur	2f1a1c5111	Merge pull request #4008 from atm-ph/fix_38_trigger_propal_clone ... FIX can not have access to the new ids or propal lines on PROPAL_CLONE	2015-11-16 23:46:03 +01:00
Laurent Destailleur	835700bb25	Merge pull request #4006 from marcosgdf/bug-3989 ... FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl	2015-11-16 23:42:38 +01:00
Laurent Destailleur	04ffe1c7f0	Merge pull request #4005 from marcosgdf/bug-3988 ... FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline	2015-11-16 23:42:04 +01:00
Laurent Destailleur	76eeb0d2f1	Merge pull request #4004 from marcosgdf/bug-3992 ... FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be	2015-11-16 23:41:46 +01:00
Laurent Destailleur	0e511027f6	Merge pull request #4003 from marcosgdf/bug-3996 ... FIX #3996 Dictionnary hooks are not working in 3.8	2015-11-16 23:41:06 +01:00
Laurent Destailleur	9693982f27	Merge pull request #4002 from marcosgdf/bug-3997 ... FIX #3997 Wrong permission key used for Margins > Read all	2015-11-16 23:40:47 +01:00
Laurent Destailleur	dbf384ec6b	Merge pull request #4000 from fmarcet/develop_bolivia ... New: Bolivian regions and departments	2015-11-16 23:40:16 +01:00
Laurent Destailleur	d16efbaf24	Merge pull request #3999 from fmarcet/3.8 ... FIX: Can't update line's duration	2015-11-16 23:39:44 +01:00
Laurent Destailleur	66f24ff400	Merge pull request #3983 from grandoc/develop ... [Qual] Uniformize code	2015-11-16 23:31:40 +01:00
Laurent Destailleur	2fbb030d61	Merge pull request #3984 from frederic34/warehouse ... Select warehouse on order card	2015-11-16 23:31:25 +01:00
Laurent Destailleur	de70321149	Merge pull request #3982 from frederic34/imgstatut ... Add statut2 icon and adjust some other	2015-11-16 23:30:49 +01:00
Frédéric FRANCE	59dd1502de	Update list.php	2015-11-16 21:29:39 +01:00
fappels	e9be3d19f4	Fix migration - remove default for text field ... remove default for user_param value text field lang typo	2015-11-16 21:24:08 +01:00
Paris Liakos	146aa7815b	Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories	2015-11-16 20:27:51 +02:00
Alexis Algoud	a7d2bdc2c1	FIX 3.8 allow to search on alias name into select	2015-11-16 19:10:20 +01:00
Frédéric FRANCE	0424a2bb3d	Update list.php	2015-11-16 16:27:37 +01:00
phf	c21354101f	FIX can not have access to the new ids or propal lines on PROPAL_CLONE	2015-11-16 15:36:02 +01:00
Alexis Algoud	55b23c4918	FIX add billed field in supplier order	2015-11-16 14:55:46 +01:00
Marcos García de La Fuente	53fb085766	Corrected indent	2015-11-16 13:29:37 +01:00
Marcos García de La Fuente	ec7e4cb3d4	FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl	2015-11-16 13:25:00 +01:00
Marcos García de La Fuente	0880b13142	FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline	2015-11-16 13:24:11 +01:00
Marcos García de La Fuente	be460b6cbf	FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be	2015-11-16 13:20:56 +01:00
Marcos García de La Fuente	8e9e2911ae	FIX #3996 Dictionnary hooks are not working in 3.8	2015-11-16 13:18:25 +01:00
Marcos García de La Fuente	73da011461	FIX #3997 Wrong permission key used for Margins > Read all	2015-11-16 13:16:54 +01:00
fmarcet	9e51cf66dd	New: Bolivian regions and departmens	2015-11-16 12:34:59 +01:00
fmarcet	0a92849de3	FIX: Can't update line's duration	2015-11-16 10:57:47 +01:00
aspangaro	06f752b250	Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy	2015-11-16 06:50:04 +01:00
Frédéric FRANCE	ba60313f88	Update list.php	2015-11-16 00:11:03 +01:00
Frédéric FRANCE	faff8e2cd8	Update list.php	2015-11-16 00:01:34 +01:00
Laurent Destailleur	dfc01e971f	Update files for transifex sync	2015-11-15 20:27:43 +01:00
Florian HENRY	c3b7bbfb3b	FIX : #3990	2015-11-15 20:00:11 +01:00
Laurent Destailleur	7afedd3f8b	Minor enhancement of theme MD	2015-11-15 19:29:18 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to ... do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Laurent Destailleur	388748055a	Fix missing translation for VAT	2015-11-15 15:08:54 +01:00
frederic34	e0ee6718ad	Select warehouse on order card	2015-11-15 11:42:47 +01:00
Laurent Destailleur	db941d5395	NEW Enhance style engine. Add option to set color of links	2015-11-15 11:31:09 +01:00
philippe grand	f308606ee1	[Qual] Uniformize code	2015-11-15 07:47:35 +01:00
Laurent Destailleur	192fdbdcc4	Minor look uniformization	2015-11-14 23:10:12 +01:00
Laurent Destailleur	c2ec4a4fd2	Move online help link at a better place (top right). Link is also always ... visible.	2015-11-14 22:49:34 +01:00
Laurent Destailleur	6895daa5e9	Fix tr/td not correctly open/closed ... Fix default value was not set	2015-11-14 19:31:50 +01:00
Laurent Destailleur	80127cbbc9	Fix tr/td not correctly open/closed ... Fix default value was not set	2015-11-14 19:31:16 +01:00
Laurent Destailleur	1da53501a1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-14 17:54:28 +01:00
Laurent Destailleur	01058be44c	NEW Introduce a "code" into fiels to describe vat. This will allow to ... suggest different vat lines with same value with ability to differentiate them.	2015-11-14 17:53:58 +01:00
Laurent Destailleur	b4af55ab40	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-14 14:57:49 +01:00
Laurent Destailleur	b75923871c	FIX: Too many information were hidden. A lot of users still need bank ... account on PDF.	2015-11-14 14:56:44 +01:00
frederic34	488acfd177	Add statut2 icon and adjust some other	2015-11-14 10:50:26 +01:00
Laurent Destailleur	653fb00a0e	Merge pull request #3981 from ParisLiakos/develop ... getListOfProductsOrServices() filters are broken	2015-11-13 19:47:44 +01:00
Paris Liakos	298a671342	getListOfProductsOrServices() filters are broken	2015-11-13 20:25:12 +02:00
Laurent Destailleur	5b1e20494b	Merge pull request #3977 from FHenry/3.8 ... FIX : showrefnav htmlspecialchar instead of < >	2015-11-13 19:22:41 +01:00
Laurent Destailleur	3ff42a45d4	Merge pull request #3976 from atm-alexis/3.9_FIX_htmlname_for_ajax_contact ... FIX htmlname parameters wasnt applied	2015-11-13 19:22:18 +01:00
Laurent Destailleur	85c0ed39f1	Merge pull request #3974 from atm-ph/fix_38_aufocus ... FIX autofocus on input search product	2015-11-13 19:21:52 +01:00
Laurent Destailleur	510e3bc4c2	Merge pull request #3975 from All-3kcis/develop-patch-12 ... Fix #3542	2015-11-13 19:20:24 +01:00
Florian HENRY	2a2155a239	FIX : showrefnav htmlspecialchar instead of < >	2015-11-13 14:40:52 +01:00
Laurent Destailleur	8068d01cfc	Add style maxwidth150	2015-11-13 14:16:45 +01:00
Laurent Destailleur	5e67eefff3	Removed phpcs warning	2015-11-13 12:48:17 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Laurent Destailleur	93be4305c4	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: build/makepack-dolibarr.pl htdocs/accountancy/customer/card.php htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/card.php htdocs/accountancy/supplier/list.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/fichinter/card.php htdocs/societe/rib.php	2015-11-13 12:18:46 +01:00
Alexis Algoud	965de406d3	FIX htmlname parameters wasnt applied	2015-11-13 11:47:15 +01:00
Laurent Destailleur	bad28c6d92	Fi sntax error	2015-11-13 11:44:55 +01:00
Laurent Destailleur	eac80d7db4	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: ChangeLog build/debian/changelog htdocs/commande/fiche.php htdocs/compta/facture.php	2015-11-13 11:43:29 +01:00
All-3kcis	c59482fea1	Fix #3542	2015-11-13 11:17:23 +01:00
Laurent Destailleur	c7546dbad2	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-11-13 11:13:04 +01:00
Laurent Destailleur	b3be7f65cd	Fix syntax error . = instead of .=	2015-11-13 11:12:49 +01:00
Laurent Destailleur	682842f15f	Fix into title of login page, we must report the tru dolibarr version ... after the @ (technical information), event if application name/version was replaced with a constant.	2015-11-13 10:37:51 +01:00
phf	81a8933256	FIX autofocus on input search product	2015-11-13 10:36:32 +01:00
aspangaro	0f75d76296	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-13 07:52:44 +01:00
Laurent Destailleur	9a98206d5a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-13 03:36:08 +01:00
Laurent Destailleur	64c783623b	NEW Framework feature. To have a page being loaded at same scrollbar ... level wafter a click on a href link, just add the class "reposition" on this link.	2015-11-13 03:35:55 +01:00
Laurent Destailleur	778941b549	Merge pull request #3948 from marcosgdf/missing-changes ... Missing changes of PR #3927	2015-11-13 02:29:56 +01:00
Laurent Destailleur	7d9fde803b	Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter ... NEW Develop multi type event filter	2015-11-13 02:27:53 +01:00
Laurent Destailleur	471bcdd29f	Remove hard coded list of permissions.	2015-11-13 02:21:27 +01:00
Laurent Destailleur	ea6fe02f18	Merge pull request #3923 from altatof/customerinfos ... NEW FEATURE PROPOSAL: on propale, order or invoice creation from	2015-11-13 00:35:39 +01:00
Laurent Destailleur	0ca9027459	Merge pull request #3973 from frederic34/patch-3 ... llx_accounting_account ADD INDEX account_number	2015-11-13 00:34:02 +01:00
Laurent Destailleur	e2e804e37a	Minor fix	2015-11-13 00:30:10 +01:00
Laurent Destailleur	4065b3f1df	Better management of the Dolibarr tracking id into email. ... This will allow an imap scanner to link email	2015-11-13 00:19:11 +01:00
Laurent Destailleur	74a4006a84	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-12 21:25:30 +01:00
Laurent Destailleur	b2285ca5e0	Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. ... All emails sent from Dolibarr have a dedicated tracking id.	2015-11-12 21:25:01 +01:00
Laurent Destailleur	60535086d4	Merge pull request #3965 from jpfox/patch-2 ... Correct pattern to match all odt var tags	2015-11-12 18:32:45 +01:00
Laurent Destailleur	816bacc37e	Merge pull request #3968 from atm-arnaud/3.8_fix_export_extrafield_propal_order ... FIX export propal and order with extrafields	2015-11-12 18:31:59 +01:00
Frédéric FRANCE	bab41e40e7	Update 3.8.0-3.9.0.sql	2015-11-12 17:50:52 +01:00
Frédéric FRANCE	bd7687b6ab	Update llx_accounting_account.key.sql	2015-11-12 17:47:08 +01:00
Laurent Destailleur	924db5b8aa	Merge pull request #3969 from FHenry/3.8 ... FIX : better fix for #3805	2015-11-12 15:08:34 +01:00
Laurent Destailleur	8925717bbe	Merge pull request #3966 from atm-ph/fix_38_title_actioncomm ... FIX mail isn't display in title on event in mode view	2015-11-12 15:07:29 +01:00
Laurent Destailleur	8a26e27ef3	Merge pull request #3967 from grandoc/develop ... [Qual] Uniformize code	2015-11-12 15:01:20 +01:00
Laurent Destailleur	9a9be97c2c	Add a log to help diagnose bad usage of method ad of event	2015-11-12 14:36:35 +01:00
Regis Houssin	52bd90f950	Fix: wrong var name	2015-11-12 14:12:56 +01:00
Florian HENRY	019575d9ed	FIX : better fix for #3805	2015-11-12 13:21:35 +01:00
arnaud	aaa6f00d11	FIX export propal and order with extrafields	2015-11-12 12:37:04 +01:00
Laurent Destailleur	f49a33b600	Try a change for better compatibility with old search form	2015-11-12 12:22:21 +01:00
philippe grand	c712532bf6	[Qual] Uniformize code	2015-11-12 11:59:15 +01:00
phf	f041c017e9	FIX mail isn't display in title on event in mode view	2015-11-12 11:30:44 +01:00
Marcos García de La Fuente	3c42df935d	Corrected HTML closing tag	2015-11-12 10:26:05 +01:00
Jean-Pierre Morfin	0cb9cc2213	Correct pattern to match all odt var tags ... some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax	2015-11-12 09:24:04 +01:00
Alexis Algoud	d997ac83e7	Add function param description	2015-11-12 09:08:08 +01:00
Alexis Algoud	a2c8c7c20e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter	2015-11-12 09:05:26 +01:00
aspangaro	30c4f1c896	HRM : language	2015-11-12 07:40:46 +01:00
aspangaro	bedba7ffb7	HRM: add a mode 'employee' for development to show tab	2015-11-12 07:26:51 +01:00
aspangaro	154f88a58c	HRM: Copy info from user	2015-11-12 07:24:52 +01:00
aspangaro	7693b407e8	HRM: Begin to work on employee card	2015-11-12 06:59:40 +01:00
aspangaro	20872498ba	HRM: Add a tab for holiday module in employee card	2015-11-12 06:58:26 +01:00
aspangaro	4ce6287d52	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-12 05:51:12 +01:00
aspangaro	f602e1fba7	HRM : Add an email address in admin to prevent HRM external service (public accountant for exemple)	2015-11-12 05:48:56 +01:00
Laurent Destailleur	2bd0f04d8f	Add feature to get nb of top menu entrie ... Fix translation of units	2015-11-12 00:48:37 +01:00
Laurent Destailleur	1f4742b77b	Remove useles html generated code. More code comment.	2015-11-11 19:38:19 +01:00
Laurent Destailleur	cb29f91434	FIX An external libray must contains also non obfuscated code into ... source	2015-11-11 19:11:43 +01:00
Laurent Destailleur	327d764284	Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr ... into GPCsolutions-dolibarr-php7 Conflicts: .gitignore	2015-11-11 19:03:36 +01:00
Laurent Destailleur	9ee06e8f0d	Merge pull request #3951 from frederic34/fccard ... add messages	2015-11-11 18:32:30 +01:00
Laurent Destailleur	f6a9597507	Merge pull request #3959 from aspangaro/develop-hrm ... HRM: Correct getNomUrl	2015-11-11 18:32:14 +01:00
Laurent Destailleur	ca62689a96	Merge pull request #3961 from frederic34/escpos ... Escpos : install lib with composer	2015-11-11 18:30:57 +01:00
frederic34	954291ae0b	re-add library escpos	2015-11-11 18:02:47 +01:00
frederic34	765e83d456	delete directory	2015-11-11 18:01:13 +01:00
frederic34	cd738ef483	Merge remote branch 'upstream/develop' into fccard ... Conflicts: htdocs/commande/card.php	2015-11-11 17:23:37 +01:00
frederic34	01d4bd6cf5	bad invert	2015-11-11 17:19:53 +01:00
Laurent Destailleur	21ca7dc823	Merge pull request #3960 from aspangaro/develop-hrm2 ... HRM: Add fk_establishment in llx_user to link an user to an establish…	2015-11-11 17:08:42 +01:00
Laurent Destailleur	59a79442b0	Enhance code for select field list feature. ... Add gender and employee on user list.	2015-11-11 17:05:18 +01:00
Laurent Destailleur	4ddfa6e1b5	Merge pull request #3956 from frederic34/patch-3 ... Update product.php	2015-11-11 15:51:09 +01:00
Laurent Destailleur	a0606cece9	Merge pull request #3955 from grandoc/develop ... [Qual] Uniformize code	2015-11-11 15:50:48 +01:00
Christophe Battarel	cc35f2b738	Merge branch 'develop' into customerinfos	2015-11-11 15:46:22 +01:00
aspangaro	05b0ab2eab	HRM: Add fk_establishment in llx_user to link an user to an establishment	2015-11-11 15:45:55 +01:00
aspangaro	bbab5e5bc3	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-11-11 15:38:52 +01:00
Laurent Destailleur	e673b18871	Merge pull request #3949 from marcosgdf/bug-3865 ... FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname	2015-11-11 15:36:34 +01:00
Christophe Battarel	0c40a6dda5	add hidden constant	2015-11-11 15:32:42 +01:00
aspangaro	54091a0661	Correct getNomUrl	2015-11-11 15:31:39 +01:00
philippe grand	12c5d02a7a	[Qual] Uniformize code	2015-11-11 12:27:09 +01:00
aspangaro	e157d8b8d2	Update for fk_country	2015-11-11 08:52:28 +01:00
aspangaro	ca0c68a8e2	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-11-11 08:20:12 +01:00
aspangaro	e1b329e80a	HRM: Update work	2015-11-11 08:16:06 +01:00
Frédéric FRANCE	2799dbf45b	Update product.php	2015-11-10 23:02:54 +01:00
philippe grand	d06a445e01	[Qual] Uniformize code	2015-11-10 19:22:27 +01:00
Laurent Destailleur	13a0fa2c69	Missing css	2015-11-10 15:50:13 +01:00
Laurent Destailleur	b0419557b1	Exclude dir	2015-11-10 00:37:30 +01:00
Laurent Destailleur	98c32fa1ec	FIX The label hidden was not supported when using jmobile	2015-11-10 00:36:33 +01:00
Alexis Algoud	99513ac9f3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter	2015-11-09 18:31:21 +01:00
frederic34	b8a84d68ec	add messages	2015-11-09 18:19:10 +01:00
Alexis Algoud	68cbd4699b	NEW multi event type for filter and get form in order to allow bookmark	2015-11-09 17:18:23 +01:00
Laurent Destailleur	19684f9a36	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-09 16:48:41 +01:00
Laurent Destailleur	f49fab8a7e	Rename some files in english and increase fields size.	2015-11-09 16:48:30 +01:00
Raphaël Doursenaud	c3ed30ffd8	Moved to new package for TCPDF ... Previous one has been deprecated by upstream	2015-11-09 12:21:08 +01:00
Raphaël Doursenaud	e5915ce8d9	Upgraded PHPExcel to v1.8.1 ... Fixes issues with PHP 7	2015-11-09 12:19:48 +01:00
Raphaël Doursenaud	0e155be4e8	Reinstall ckeditor with composer ... This time using the correct full package Also used the branch + tag commit to work around that bug: https://github.com/ckeditor/ckeditor-releases/issues/41	2015-11-09 12:18:50 +01:00
Raphaël Doursenaud	442431704b	Upgraded ADOdb Date to v0.36 ... Extracted from ADOdb v5.19 Fixes PHP 7 fatal error	2015-11-09 12:16:04 +01:00
Raphaël Doursenaud	7c44198022	[Qual] Prevent GIT submodules in composer deps ... Dependencies installed with composer should not be added as submodules. Restored missing Escpos-php library.	2015-11-09 12:12:05 +01:00
Marcos García de La Fuente	80ef746348	Reverted unwanted changes	2015-11-08 19:23:02 +01:00
Laurent Destailleur	71fa347e8e	FIX Better compatibility for users that used the not supported option ... MAIN_USE_JQUERY_MULTISELECT set to 1.	2015-11-08 18:40:12 +01:00
Marcos García de La Fuente	9cdf45e0a6	Fixed JS compatibility with multiprices price generator	2015-11-08 16:54:54 +01:00
Marcos García de La Fuente	9bc4b9f0bc	Moved update function after updatePrice	2015-11-08 16:45:42 +01:00
Marcos García de La Fuente	7ebe032d6f	FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname ... Close #3865	2015-11-08 16:01:12 +01:00
Laurent Destailleur	096ec3100d	Merge pull request #3926 from frederic34/fccard ... allow chaining and remove header exit	2015-11-08 15:49:33 +01:00
Laurent Destailleur	6ec33a94c6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-08 15:39:10 +01:00
Laurent Destailleur	bd56396394	Fix migration error	2015-11-08 15:38:57 +01:00
Marcos García de La Fuente	7f0d81d255	Missing changes of PR #3927	2015-11-08 15:12:31 +01:00
Marcos García de La Fuente	04243510f3	Little changes	2015-11-08 14:54:29 +01:00
Laurent Destailleur	e6ab6bdb8e	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-11-08 14:38:01 +01:00
Laurent Destailleur	7a0206adce	FIX Missing to set context into workflow actions, so triggers can't know ... we are creating an invoice from order or an order from a proposal.	2015-11-08 14:37:50 +01:00
Juanjo Menent	0ce7cad48c	Merge pull request #3946 from aspangaro/3.7-1 ... Fix: Accountancy compatibility with subtotal & jalon module	2015-11-08 11:26:06 +01:00
Juanjo Menent	8eb74b5bd4	Merge pull request #3945 from grandoc/develop ... [Qual] Uniformize code	2015-11-08 11:25:11 +01:00
Juanjo Menent	7673a73a65	Merge pull request #3939 from marcosgdf/bug-3836 ... FIX #3836 Unable to upload a document to an invoice under some circunstances	2015-11-08 11:21:16 +01:00
Juanjo Menent	59b3124d7d	Merge pull request #3938 from marcosgdf/fr-3876 ... NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2	2015-11-08 11:20:36 +01:00
Juanjo Menent	f15e83e918	Merge pull request #3937 from marcosgdf/bug-3877 ... FIX #3877 HTML encoded strings when searching for a supplier invoice	2015-11-08 11:19:49 +01:00
Juanjo Menent	509b45a0d0	Merge pull request #3936 from marcosgdf/bug-3931 ... FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261	2015-11-08 11:19:13 +01:00
Juanjo Menent	77284982d5	Merge pull request #3935 from marcosgdf/bug-3897 ... FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates	2015-11-08 11:18:29 +01:00
Juanjo Menent	8377d6967a	Merge pull request #3934 from marcosgdf/bug-3679 ... FIX #3679 Error when deleting a Localtax2 special payment	2015-11-08 11:16:07 +01:00
Juanjo Menent	a6f0baefc1	Merge pull request #3933 from marcosgdf/bug-3980 ... FIX #3890 Expected transactions bank account page, shows negative numbers	2015-11-08 11:15:31 +01:00
Juanjo Menent	9e11289f5b	Merge pull request #3927 from marcosgdf/fr-3767 ... NEW #3767 Allow changing multiple prices of a product at once	2015-11-08 11:13:04 +01:00
Juanjo Menent	a02100e3c7	Merge pull request #3924 from atm-gauthier/develop_fix_script_creation ... FIX : wrong coma in llx_opensurvey_sondage.sql creation script	2015-11-08 11:03:26 +01:00
aspangaro	f0a3bca4c2	Fix: Accountancy compatibility with subtotal & jalon module	2015-11-08 04:22:49 +01:00
Laurent Destailleur	1d2dab63a3	More space	2015-11-08 02:32:22 +01:00
Laurent Destailleur	333dd10874	Add a way to lin on bank receipt tab directly	2015-11-08 02:09:32 +01:00
Laurent Destailleur	7a423c04d4	Fix The only default value is value we just entered	2015-11-08 02:00:28 +01:00
Laurent Destailleur	fa8863d2ea	Fix sql migration requests	2015-11-08 01:38:03 +01:00
Laurent Destailleur	e350b759d3	Increase number of last bank receits visible links	2015-11-08 00:52:25 +01:00
Laurent Destailleur	24dff1d842	NEW Statistic graphs on products offer a filter on product type (product ... / service or both)	2015-11-08 00:35:30 +01:00
Laurent Destailleur	b5c9602da4	Fix Use new look for left-right arrow	2015-11-08 00:08:50 +01:00
Laurent Destailleur	031b33d582	FIX Checkbox reconciliated no correctly checked with some Chrome ... versions	2015-11-07 23:54:11 +01:00
Laurent Destailleur	3906cb79c5	NEW: Add parameter to add a link to use "date of invoice" in one click ... when fille a payment card.	2015-11-07 23:46:07 +01:00
philippe grand	b34edeb751	[Qual] Uniformize code	2015-11-07 21:56:21 +01:00
Florian HENRY	a4fafae109	FIX : Remove column creation for table llx_product_fournisseur_price, ... the column use un calss is fk_supplier_price_expression, and fk_price_expression does not exist into lx_product_fournisseur_price sql file declaration	2015-11-07 17:19:13 +01:00
Laurent Destailleur	4e64230ac9	NEW Add chart of product statistics	2015-11-07 16:25:14 +01:00
Laurent Destailleur	57e162d7f8	The component selectAjaxArray can return javascript part into a global ... "delayed" variable so caller can output it at end of page. This reduce the Flash Over Unstyle Content effect.	2015-11-07 15:46:06 +01:00
Marcos García de La Fuente	4a52d3c1b1	Removed unwanted change	2015-11-07 15:35:00 +01:00
Marcos García de La Fuente	84a152dc2e	FIX #3836 Unable to upload a document to an invoice under some circunstances	2015-11-07 15:33:48 +01:00
Marcos García de La Fuente	75b4cb4727	NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2	2015-11-07 14:37:47 +01:00
Marcos García de La Fuente	ba42a7779f	FIX #3877 HTML encoded strings when searching for a supplier invoice ... Close #3877	2015-11-07 14:34:26 +01:00
Marcos García de La Fuente	0451cc1e73	FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261 ... Close #3931	2015-11-07 14:31:12 +01:00
Marcos García de La Fuente	8ccb8c92e0	FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates ... Close #3897	2015-11-07 14:29:38 +01:00
Marcos García de La Fuente	01854b3259	FIX #3679 Error when deleting a Localtax2 special payment	2015-11-07 13:51:09 +01:00
Marcos García de La Fuente	728f469c1e	FIX #3890 Expected transactions bank account page, shows negative numbers	2015-11-07 13:43:59 +01:00
Marcos García de La Fuente	3bbedf1795	FIX #3707 Thirdparty bank account page table has a glitch	2015-11-07 13:39:34 +01:00
Laurent Destailleur	c0872d690e	Use new banner for other tabs of product	2015-11-07 13:32:14 +01:00
Marcos García de La Fuente	b4c3804c91	FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card	2015-11-07 13:21:03 +01:00
Laurent Destailleur	439e4a483d	Doc comment	2015-11-07 12:37:05 +01:00
Laurent Destailleur	350ef610e9	Fix beluga pdf for projects. Add missing expense reports.	2015-11-07 12:36:34 +01:00
Marcos García de La Fuente	45b4122a95	NEW #3767 Allow changing multiple prices of a product at once	2015-11-07 12:29:51 +01:00
Laurent Destailleur	99f5211070	NEW Can use the * as a joker characters into search boxes of lists	2015-11-07 11:48:35 +01:00
Laurent Destailleur	09fb87e47d	Prepare tables for categories/tags on projects. Looking for a dev to ... implement categories/tags on projects !	2015-11-07 11:40:31 +01:00
frederic34	7349862b64	translations	2015-11-07 11:19:31 +01:00
frederic34	a597d6c379	allow chaining	2015-11-07 10:23:56 +01:00
frederic34	becce332dd	allow chaining and remove header exit	2015-11-07 09:52:00 +01:00
Laurent Destailleur	e7554d377f	Fix better error message	2015-11-06 19:07:05 +01:00
Laurent Destailleur	b2d9f21253	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-06 18:57:46 +01:00
Laurent Destailleur	d0e6db7f89	Use the new banner for first tab of products.	2015-11-06 18:57:35 +01:00
Gauthier	ef3c7f927e	FIX : wrong coma in llx_opensurvey_sondage.sql creation script	2015-11-06 16:38:26 +01:00
Christophe Battarel	f52ae35dc6	NEW FEATURE PROPOSAL: on propale, order or invoice creation from ... scratch, reload page after customer selection so its informations can be loaded	2015-11-06 16:14:00 +01:00
Laurent Destailleur	9cb2d046d0	Merge pull request #3919 from marcosgdf/bug-3914 ... FIX #3194 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared	2015-11-06 12:32:26 +01:00
Laurent Destailleur	fdd93554ce	Merge pull request #3921 from marcosgdf/fr-3898 ... NEW #3898 Remove deprecated Product::hidden property	2015-11-06 12:31:44 +01:00
Laurent Destailleur	b723ca7d16	Merge pull request #3920 from marcosgdf/fr-3768 ... NEW Deprecated Product::setPriceExpression. Use Product::update instead	2015-11-06 12:30:57 +01:00
Laurent Destailleur	2c4b0c0d24	Merge pull request #3918 from FHenry/develop ... FIX: #3913	2015-11-06 12:20:22 +01:00
Marcos García de La Fuente	ac8bee28ef	NEW #3898 Remove deprecated Product::hidden property ... Close #3898	2015-11-06 11:40:22 +01:00
Marcos García de La Fuente	9969179267	NEW Deprecated Product::setPriceExpression. Use Product::update instead	2015-11-06 11:35:39 +01:00
Laurent Destailleur	bef4dd2bae	Merge pull request #3917 from atm-maxime/develop ... Fix : finally, autofocus on product search field is a bad idea...	2015-11-06 11:27:37 +01:00
Marcos García de La Fuente	610ef2359d	FIX #3914 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared ... Close #3914	2015-11-06 11:26:06 +01:00
Florian HENRY	28b229c83a	FIX: #3916	2015-11-06 11:24:52 +01:00
Laurent Destailleur	11f0cad2ab	FIX #3912	2015-11-06 11:22:50 +01:00
Florian HENRY	d3d62f7db5	FIX: #3913	2015-11-06 11:11:23 +01:00
Maxime Kohlhaas	dac0a7bc50	Fix : finally, autofocus on product search field is a bad idea	2015-11-06 11:09:54 +01:00
Marcos García de La Fuente	f62d6d1950	FIX Product::updatePrice() now sets new prices to Product::multiprices_* arrays	2015-11-06 11:08:41 +01:00
Florian HENRY	b0be2b04c7	FIX : #3912	2015-11-06 10:53:33 +01:00
Florian HENRY	f6b8c3a130	FIX : #3912	2015-11-06 10:50:08 +01:00
Florian HENRY	121d2beb80	fix spacing	2015-11-06 10:34:18 +01:00
Florian HENRY	f220f584ce	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-06 10:31:03 +01:00
Florian HENRY	126b5d6eca	FIX : only active customer should be available into select list ... thirdparty on invoice creation	2015-11-06 10:19:10 +01:00
Juanjo Menent	f33157033c	Merge pull request #3909 from altatof/fixcloseshipping ... FIX: change object statut on close shipping and remove erratic db commit	2015-11-06 10:16:00 +01:00
Christophe Battarel	4d11205a01	FIX: change object statut on close shipping and remove erratic db commit	2015-11-06 09:51:33 +01:00
Florian HENRY	600dbced7e	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-11-06 09:49:48 +01:00
Florian HENRY	8d829dca32	FIX : only active customer should be return into new invoice creation ... select list	2015-11-06 09:49:02 +01:00
philippe grand	5f74a0f1c0	Traduction	2015-11-06 09:46:18 +01:00
philippe grand	67c9db6a51	[Qual] Uniformize code	2015-11-06 09:36:16 +01:00
Juanjo Menent	75c0331b38	Merge pull request #3907 from olsesacl/develop-fix ... Maintain origin_id and origin for copy document	2015-11-06 09:15:36 +01:00
Sergio Sanchis Climent	6bf8b7f328	Default value origin_id and origin	2015-11-06 02:25:51 +01:00
Laurent Destailleur	f9d0c887ae	NEW Add a refresh button on page list of direct print jobs.	2015-11-06 02:20:42 +01:00
Sergio Sanchis Climent	6b01db5960	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2015-11-06 02:08:55 +01:00
Laurent Destailleur	e78ebf041a	Fix deprecated code not working in jcrop. $.browser.msie and $.browser ... is no more available in jquery 1.9+.	2015-11-06 02:03:41 +01:00
Laurent Destailleur	0f358eea49	Fix path definition of thumbs with the new function	2015-11-06 01:56:56 +01:00
Sergio Sanchis Climent	de8e7107ee	Maintain origin_id and origin for copy document ... Fix any errors.	2015-11-06 01:53:20 +01:00
Laurent Destailleur	2dc644da30	Debug Direct print module using the OAuth setup.	2015-11-06 01:33:49 +01:00
Laurent Destailleur	80ec28f9c0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-05 22:20:40 +01:00
Laurent Destailleur	0433f20354	Code comment	2015-11-05 22:20:31 +01:00
Laurent Destailleur	c673b1c0c8	Merge pull request #3905 from GPCsolutions/develop-3893 ... Fix missing category selector	2015-11-05 22:14:38 +01:00
Laurent Destailleur	04664c203d	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:13:08 +01:00
Laurent Destailleur	58cac2d895	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:09:54 +01:00
Laurent Destailleur	fe78996026	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/product/stock/fiche.php htdocs/product/stock/valo.php	2015-11-05 22:04:18 +01:00
Laurent Destailleur	e4bd99aaf3	Merge pull request #3904 from frederic34/printgcp ... Google Cloud Print	2015-11-05 21:57:08 +01:00
Laurent Destailleur	a7cea65710	Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement ... NEW add an option to use standard ISO location for bill in crabe model	2015-11-05 21:51:38 +01:00
Laurent Destailleur	5777c16b72	Merge pull request #3902 from altatof/clonedorderdate ... FIX: change order date on clone (as everywhere else)	2015-11-05 21:49:50 +01:00
Laurent Destailleur	fdf9617e42	Merge pull request #3900 from GPCsolutions/dolibarr-3864 ... Fix #3864 Really fixed invalid jQuery code	2015-11-05 21:47:40 +01:00
Laurent Destailleur	64fb4a30bb	Merge pull request #3899 from grandoc/develop ... Typo	2015-11-05 21:46:33 +01:00
Laurent Destailleur	6948c65a13	Merge pull request #3895 from marcosgdf/fix-bug-pricerules ... Fixed feature malfunction caused by a commit and previous changes	2015-11-05 21:46:17 +01:00
Laurent Destailleur	d499fafdb9	Merge pull request #3901 from altatof/3.6 ... FIX bad calculation for stock value	2015-11-05 21:44:21 +01:00
Laurent Destailleur	5860491b14	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2015-11-05 21:33:54 +01:00
Laurent Destailleur	f3b8df3ea5	Merge pull request #3889 from frederic34/escpos ... Receipt Printer conf and lang	2015-11-05 21:32:43 +01:00
frederic34	55dfa4859f	Install lib with composer	2015-11-05 21:09:14 +01:00
Raphaël Doursenaud	89411541b3	Fix missing category selector ... Complement to #3893	2015-11-05 18:49:39 +01:00
frederic34	3ef6a92bb1	Google Cloud Print	2015-11-05 18:04:00 +01:00
Christophe Battarel	316b7453e4	FIX bad stock valo	2015-11-05 17:04:08 +01:00
Christophe Battarel	80d2445540	FIX: bad stock valorisation	2015-11-05 17:00:22 +01:00
frederic34	8a765bf5fd	wip	2015-11-05 16:20:35 +01:00
Alexis Algoud	8221817087	NEW add an option to use standard ISO location for bill in crabe model ... For electronic sending solutions, it could be required	2015-11-05 16:17:09 +01:00
Christophe Battarel	ad82135879	FIX: change order date on clone (as everywhere else)	2015-11-05 15:36:13 +01:00
Christophe Battarel	75bcb7e53f	fix pmp	2015-11-05 15:32:56 +01:00
Christophe Battarel	f566b38296	FIX pmp	2015-11-05 15:29:51 +01:00
Christophe Battarel	fa088eb6cc	FIX bad calculation for stock value	2015-11-05 14:57:58 +01:00
Raphaël Doursenaud	b0cf9bd0be	Fix #3864 Really fixed invalid jQuery code	2015-11-05 14:38:11 +01:00
philippe grand	04238da75d	Typo	2015-11-05 14:16:13 +01:00
Laurent Destailleur	1927f47eaa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-05 13:43:33 +01:00
Laurent Destailleur	d2fa580f5d	The code generator can generate a list.php page with all feature ... immediatly working (sort, extrafields, hooks, select fields to show...)	2015-11-05 13:43:22 +01:00
Marcos García de La Fuente	e64057c276	Removed unnecesary attribute	2015-11-05 13:07:44 +01:00
Marcos García de La Fuente	6e8a6eca7a	Fixed feature malfunction caused by commit a161e6d47a and previous changes	2015-11-05 13:06:14 +01:00
Christophe Battarel	9b797c1831	FIX bad calculation for stock value	2015-11-05 12:49:43 +01:00
fmarcet	015dedc3ab	FIX: Show category selector if we have permission to view products or ... services	2015-11-05 11:53:45 +01:00
Alexis Algoud	e1ea2215a3	FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch	2015-11-05 11:25:04 +01:00
philippe grand	b9c0cd316f	[Qual] Fix : TODO:translate	2015-11-05 11:11:51 +01:00
Alexis Algoud	0543a31920	FIX event's data lost on user assign update	2015-11-05 11:11:03 +01:00
Laurent Destailleur	41ccfc411a	Better error message	2015-11-05 10:11:39 +01:00
frederic34	1a374ddd2c	Receipt Printer conf and lang	2015-11-05 08:42:03 +01:00
Laurent Destailleur	fa413fea76	FIX #3813	2015-11-05 03:12:57 +01:00
Laurent Destailleur	f319976e5d	FIX #3878 Storing and deleting files on emailing was done at wrong place ... Conflicts: htdocs/comm/mailing/card.php	2015-11-05 03:08:15 +01:00
Laurent Destailleur	a612289136	FIX Storing and deleting files on emailing was done at wrong place	2015-11-05 03:02:31 +01:00
Laurent Destailleur	1f4481a6b0	Merge pull request #3172 from atm-maxime/new_creditnote ... NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice	2015-11-05 02:45:15 +01:00
Laurent Destailleur	7a5a5459cd	Merge pull request #3888 from olsesacl/develop-hook-origin ... When you create a "commande" from a "propal" lost $object->origin and $object->origin_id in hook	2015-11-05 02:39:22 +01:00
Laurent Destailleur	14ec86047f	Merge pull request #3886 from GPCsolutions/dolibarr-3805 ... Fix #3805 Enhanced Facture::is_last_in_cycle()	2015-11-05 02:33:48 +01:00
Laurent Destailleur	e12c8fea79	Merge pull request #3885 from GPCsolutions/dolibarr-3870 ... Fix #3870 Missing translation	2015-11-05 02:32:48 +01:00
Laurent Destailleur	4bb21fd218	Merge pull request #3884 from FHenry/3.8 ... FIX #3880	2015-11-05 02:32:32 +01:00
Laurent Destailleur	11b7d8a44c	Merge pull request #3873 from frederic34/escpos ... Escpos Receipt printer	2015-11-05 02:18:09 +01:00
Laurent Destailleur	bd96d2f5b1	Merge pull request #3869 from atm-alexis/3.9_FIX_hook_for_PDF ... FIX all PDF hook must be in addreplace type	2015-11-05 02:16:49 +01:00
Laurent Destailleur	e26940ddf7	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/lib/admin.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/filelist.xml htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/societe/price.php	2015-11-05 01:50:30 +01:00
Laurent Destailleur	f3421bcf6d	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-05 01:13:23 +01:00
Laurent Destailleur	77371af35a	FIX #3661 Margin is not selected correctly when adding a product	2015-11-05 01:08:30 +01:00
Sergio Sanchis Climent	f6991dd3ec	Moving new fields at the end	2015-11-04 23:18:28 +01:00
frederic34	644a104d5f	start to parse template	2015-11-04 23:14:50 +01:00
Raphaël Doursenaud	69ac75bef8	Fix #3864 Fixed invalid jQuery code	2015-11-04 22:55:14 +01:00
Sergio Sanchis Climent	eba0fa1b96	When you create an "commande" from a "propal" lost $object->origin and $object->origin_id in hook	2015-11-04 22:38:45 +01:00
aspangaro	337643e53e	Accountancy : Correct errors of display in bank journal	2015-11-04 22:31:24 +01:00
Raphaël Doursenaud	c534f5bcd5	Fix #3805 Enhanced Facture::is_last_in_cycle()	2015-11-04 20:35:20 +01:00
frederic34	ece9f68e0c	wip	2015-11-04 20:02:04 +01:00
Raphaël Doursenaud	23a5c303dd	Fix #3870 Missing translation	2015-11-04 19:56:12 +01:00
Florian HENRY	876ab4bb59	FIX : #3882	2015-11-04 18:30:09 +01:00
Florian HENRY	c0136daeb5	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-04 18:24:22 +01:00
Florian HENRY	d4ee183662	FIX : 3880	2015-11-04 18:21:59 +01:00
Laurent Destailleur	a7795f25fc	Fix Must make a difference between a buying/cost price == '' (not ... provided) and buying/cost price = '0'. We must use default value only if value is '' and not if forced to '0'.	2015-11-04 17:51:15 +01:00
Laurent Destailleur	09f3cd6f1d	Fix class cant be abstract	2015-11-04 16:43:24 +01:00
Laurent Destailleur	f15425be52	Include the link "Back to list" on banner of all user tabs.	2015-11-04 15:45:35 +01:00
Laurent Destailleur	6a9342f5a3	Move default application name into one place (as a constant)	2015-11-04 14:54:17 +01:00
Laurent Destailleur	3726b127a1	Remove duplicated code or useless code	2015-11-04 14:44:11 +01:00
Laurent Destailleur	81f0b516b9	Prepare module opensurvey for 'Form' type.	2015-11-04 11:08:46 +01:00
Laurent Destailleur	826cc6db1b	Repair old deprecated data	2015-11-04 09:54:13 +01:00
frederic34	614f9c8e98	wip	2015-11-03 23:26:07 +01:00
frederic34	4a67a94704	wip template edit	2015-11-03 23:11:04 +01:00
frederic34	5c725aceb8	sql	2015-11-03 22:12:03 +01:00
frederic34	d362d889f6	wip	2015-11-03 20:50:01 +01:00
Laurent Destailleur	d5b77bdc5f	Fix parameters are set at a better place	2015-11-03 19:51:07 +01:00
Laurent Destailleur	0d4c5c4452	Fix missing $db->jdate	2015-11-03 15:33:45 +01:00
Laurent Destailleur	3ba194f638	NEW Can select fields to show into the contact list	2015-11-03 15:32:16 +01:00
Alexis Algoud	e3a42a78f2	FIX all PDF hook must be in addreplace type, not return value to work as expected	2015-11-03 15:14:42 +01:00
Laurent Destailleur	df4f09e72f	FIX #3240	2015-11-03 14:02:36 +01:00
Laurent Destailleur	74be7bf334	FIX Filter in customer price per product of a thirdparty returned error	2015-11-03 11:40:06 +01:00
Laurent Destailleur	ea0bf44670	The ckecksum file should not be into sources. Only into packages.	2015-11-03 09:43:39 +01:00
Laurent Destailleur	12e11da6b4	Use better field	2015-11-02 21:44:52 +01:00
Laurent Destailleur	cd68ea9d0f	Fix: We must use external URL for OAuth.	2015-11-02 21:42:11 +01:00
Laurent Destailleur	1bcda200e3	A module to setup OAuth. OK, but what to do once setup of a client ... id/secret is done ?	2015-11-02 20:48:27 +01:00
Laurent Destailleur	563a020595	NEW Free text for cheque deposit receipt can be HTML content.	2015-11-02 20:35:33 +01:00
Laurent Destailleur	ffe1284a85	Merge pull request #3840 from frederic34/printgcp ... Printing with Google Cloud Print	2015-11-02 20:09:13 +01:00
Frédéric FRANCE	e7ced32245	Fix Can't edit DictionaryRevenueStamp	2015-11-02 20:08:33 +01:00
Laurent Destailleur	7b3828b68f	Merge pull request #3861 from frederic34/patch-7 ... Fix Can't edit DictionaryRevenueStamp	2015-11-02 20:07:09 +01:00
Laurent Destailleur	b8ffa56497	Fix #3857	2015-11-02 19:49:00 +01:00
Laurent Destailleur	da0aa2f937	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/langs/en_US/main.lang htdocs/product/list.php htdocs/product/stock/mouvement.php	2015-11-02 19:31:42 +01:00
Laurent Destailleur	d8796e4cc7	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/product/stats/commande.php htdocs/product/stats/commande_fournisseur.php htdocs/product/stats/facture.php htdocs/product/stats/facture_fournisseur.php htdocs/product/stats/propal.php	2015-11-02 19:25:51 +01:00
Laurent Destailleur	958c3851d7	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-02 19:17:32 +01:00
Laurent Destailleur	055fe5e275	FIX #3786 Translation of select box.	2015-11-02 19:17:22 +01:00
Frédéric FRANCE	ccb69d313c	Fix Can't edit DictionaryRevenueStamp	2015-11-02 18:18:00 +01:00
Laurent Destailleur	bb26e1c195	Merge pull request #3860 from frederic34/patch-5 ... Update resource.lang	2015-11-02 18:06:31 +01:00
Laurent Destailleur	67a2f6ee91	Merge pull request #3854 from fmarcet/3.8 ... FIX: Send emails to contacts who should not receive emails	2015-11-02 18:03:59 +01:00
Laurent Destailleur	2dab183240	Merge pull request #3858 from fappels/3.8 ... Fix always first warehouse in stock list lotserial	2015-11-02 17:59:33 +01:00
Laurent Destailleur	f928062e2b	FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO	2015-11-02 17:56:32 +01:00
Frédéric FRANCE	76c89884ba	Update resource.lang	2015-11-02 17:32:02 +01:00
Frédéric FRANCE	ebf6493987	Typo	2015-11-02 17:31:03 +01:00
fappels	d714d32424	Fix always first warehouse in reassortlot	2015-11-02 16:37:51 +01:00
Laurent Destailleur	3ba97627ff	FIX Default thirdparty when cloning invoice was not set.	2015-11-02 15:50:03 +01:00
Laurent Destailleur	85af140420	More complete example of odt template for invoices	2015-11-02 15:46:27 +01:00
Laurent Destailleur	e12a38d584	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-02 15:44:57 +01:00
Laurent Destailleur	d0d4c5e7f8	NEW The conditional IF into ODT templates works also on not defined var ... so we can show data only if defined. Close #3819	2015-11-02 15:44:47 +01:00
Laurent Destailleur	c06c2d0464	FIX #3841 creation of a task completed has not status set to finished by ... default	2015-11-02 14:21:45 +01:00
Frédéric FRANCE	7b8a33adfe	Update commonobject.class.php	2015-11-02 13:20:51 +01:00
Laurent Destailleur	c119859696	NEW The quick search box on left menu can also search into expense ... reports.	2015-11-02 13:14:46 +01:00
fmarcet	3c5903f75a	FIX: Contacts are not added to the list with the status "no contact"	2015-11-02 11:52:58 +01:00
fmarcet	ba4f306c83	FIX: Avoid changing the state to a thirdparty who shouldn't be ... contacted anymore	2015-11-02 11:52:58 +01:00
Laurent Destailleur	269fb87342	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-02 11:46:12 +01:00
Laurent Destailleur	20a1863866	FIX IF autocomplete was set on thirdparty list, it was not possible to ... open list of extrafields.	2015-11-02 11:45:59 +01:00
frederic34	9149032a03	Merge remote branch 'upstream/develop' into printgcp ... Conflicts: htdocs/core/actions_printing.inc.php	2015-11-02 11:43:34 +01:00
Laurent Destailleur	250be086b7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-02 11:36:39 +01:00
Laurent Destailleur	1ee9594e38	Merge pull request #3846 from frederic34/patch-21 ... Correction double translation which give bad html display	2015-11-02 11:29:04 +01:00
Laurent Destailleur	a9ddcc1a80	Merge pull request #3832 from frederic34/patch-16 ... NEW Add supplier order to the Direct Printing System	2015-11-02 11:27:00 +01:00
Laurent Destailleur	a14fee7296	Merge pull request #3852 from hregis/develop_origin ... FIX add Mac OS detection and show it into OS information of user popup	2015-11-02 11:26:20 +01:00
Laurent Destailleur	72915aa16d	Merge pull request #3784 from All-3kcis/develop-patch-11 ... NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"	2015-11-02 11:23:49 +01:00
Laurent Destailleur	bc29898621	Merge pull request #3814 from FHenry/3.8 ... FIX : missing tag myuser_job into ODT replacement	2015-11-02 11:22:52 +01:00
Laurent Destailleur	4cddb0175b	Merge pull request #3575 from atm-ph/fix_3.8_clone_order ... FIX clone customer order	2015-11-02 11:21:52 +01:00
Laurent Destailleur	1a0179dd1f	More complete help	2015-11-02 11:08:36 +01:00
Laurent Destailleur	200e4638f4	Merge pull request #3812 from fappels/develop-best-pmp-pos-margin ... Fix: #2591 Margin is incorrect used with POS	2015-11-02 11:06:20 +01:00
Laurent Destailleur	465ad6b3a7	Merge pull request #3802 from olsesacl/develop-hook ... hooks correctly implemented , printObjectLine, printObjectSubLine	2015-11-02 10:44:59 +01:00
Laurent Destailleur	8f2fb3cbee	Merge pull request #3845 from frederic34/patch-19 ... Remove incomplete llx_stock_lotserial migration	2015-11-02 10:43:55 +01:00
Laurent Destailleur	37f01f995c	Merge pull request #3853 from aspangaro/develop-71 ... Salaries : Replace "label for" by the function fieldLabel & add some notes & correct typo	2015-11-02 10:42:19 +01:00
All-3kcis	a658ff7e90	add commit or rollback if error	2015-11-02 10:26:07 +01:00
Laurent Destailleur	a161e6d47a	Continue debug of PRODUIT_MULTIPRICES option. ... Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have relative caculation of multiprice not yet visible.	2015-11-02 10:09:09 +01:00
frederic34	3e752ed5c8	Typo	2015-11-02 09:46:21 +01:00
Laurent Destailleur	6fe43cbbeb	Removed dead code	2015-11-02 09:08:08 +01:00
Laurent Destailleur	3409686405	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-02 08:57:01 +01:00
aspangaro	ac47c2f22e	Merge remote-tracking branch 'Upstream/develop' into develop-71	2015-11-02 06:44:16 +01:00
aspangaro	d8f77f58d7	Salaries : Replace "label for" by the function fieldLabel & add some notes	2015-11-02 06:42:17 +01:00
aspangaro	cc257d8abc	Typo	2015-11-01 22:54:33 +01:00
aspangaro	6df524bcb0	Remove blank page	2015-11-01 22:54:04 +01:00
Regis Houssin	0fd7ba478a	Fix: add Mac OS	2015-11-01 17:27:41 +01:00
frederic34	b9367bb196	Errors management	2015-11-01 11:24:51 +01:00
frederic34	2b4224d4c4	List Jobs	2015-11-01 10:10:14 +01:00
frederic34	2f3e6958f9	Receipt Printer	2015-11-01 00:58:08 +01:00
frederic34	bb06a55844	Work on list jobs	2015-10-31 23:27:10 +01:00
Juanjo Menent	a58b5f26f6	Merge pull request #3774 from marcosgdf/multiprice-generator ... NEW Level multiprice generator based on per cent variations over base price	2015-10-31 23:03:19 +01:00
Juanjo Menent	fb03643f42	Merge pull request #3850 from frederic34/paypal ... Translation in paypal lib	2015-10-31 22:59:19 +01:00
Juanjo Menent	c096114155	Merge pull request #3849 from grandoc/develop ... [Qual] Uniformize code	2015-10-31 22:58:16 +01:00
frederic34	22d1cf860c	Add translation	2015-10-31 22:09:50 +01:00
frederic34	df3af6979e	Translation in paypal lib	2015-10-31 21:43:59 +01:00
frederic34	0836a84c0e	Somme cleaning	2015-10-31 18:06:49 +01:00
philippe grand	ff5fcbbc10	[Qual] Uniformize code	2015-10-31 17:21:48 +01:00
Marcos García de La Fuente	592348850f	Added missing SQL statements + reordered them	2015-10-31 11:48:17 +01:00
Marcos García de La Fuente	e1f2efee4d	Merge branch 'develop' into multiprice-generator ... # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-31 11:46:14 +01:00
Frédéric FRANCE	0f6a401edd	Update list.php	2015-10-31 11:30:11 +01:00
Frédéric FRANCE	ee94aea1ef	Update list.php	2015-10-31 11:28:49 +01:00
Frédéric FRANCE	6e2d4aebb1	Update list.php	2015-10-31 11:27:50 +01:00
Frédéric FRANCE	8a07efb995	Update list.php	2015-10-31 11:25:59 +01:00
Frédéric FRANCE	08dccf341c	Update list.php	2015-10-31 11:24:49 +01:00
Frédéric FRANCE	d49d3808b9	Update list.php	2015-10-31 11:19:01 +01:00
Frédéric FRANCE	f3f83fa6c1	Remove incomplete llx_stock_lotserial migration ... There is two creation of this table in migration script, keeping the more complete	2015-10-31 10:32:41 +01:00
Frédéric FRANCE	4108f55c1e	Update 3.8.0-3.9.0.sql	2015-10-31 10:07:13 +01:00
Frédéric FRANCE	4160342656	Update llx_c_hrm_function.sql	2015-10-31 10:05:34 +01:00
Juanjo Menent	6f1acf8327	Merge pull request #3842 from grandoc/develop ... [Qual] Uniformize code	2015-10-30 22:25:37 +01:00
Juanjo Menent	2f8afda29d	Merge pull request #3833 from grandoc/3.8 ... [Qual] Prevent warning	2015-10-30 22:19:44 +01:00
Juanjo Menent	efb6e87f3f	Merge pull request #3839 from fmarcet/3.8 ... FIX Bad parameter on calling get_exdir function	2015-10-30 22:13:36 +01:00
philippe grand	975fe064ae	[Qual] Uniformize code	2015-10-30 21:59:22 +01:00
Laurent Destailleur	6482a4ee04	Minor css fix	2015-10-30 20:04:03 +01:00
Laurent Destailleur	a8d28b5e46	NEW Add a filter field to restrict list of member when doing a LDAP list ... request. Use also this filter into ldap command line script making sync from ldap to dolibarr.	2015-10-30 19:23:23 +01:00
frederic34	b6be372c4b	Merge remote branch 'upstream/develop' into printgcp	2015-10-30 18:12:34 +01:00
frederic34	e90f68906e	SQL tables for oauth	2015-10-30 17:59:45 +01:00
frederic34	1694c690ed	Printing with Google Cloud Print	2015-10-30 17:22:06 +01:00
Laurent Destailleur	e01bdebc49	Fix translation	2015-10-30 14:37:19 +01:00
Ferran Marcet	5862037d34	FIX Bad parameters	2015-10-30 13:03:34 +01:00
Maxime Kohlhaas	59714e4b32	Fix : migration wrong index	2015-10-30 12:41:36 +01:00
Maxime Kohlhaas	c46f9350a5	Fix : stats were wrong if same product on several lines with same quantity because of distinct	2015-10-30 09:50:04 +01:00
Laurent Destailleur	2c682022cf	NEW The search box and the bookmarks are now rendered by the menu ... manager.	2015-10-30 09:36:57 +01:00
philippe grand	c26c8c7fcc	[Qual] Prevent warning	2015-10-30 08:47:30 +01:00
Laurent Destailleur	6cc3df7e71	NEW Quick searh filter works on invoice, proposal, order, intervention, ... contract	2015-10-30 08:35:56 +01:00
Laurent Destailleur	3760f247a2	NEW Can now select fields to show in product list. Extrafields are also ... supported.	2015-10-30 00:05:00 +01:00
Laurent Destailleur	2b5746aec3	Add field position into some dictionaries tables	2015-10-29 21:25:18 +01:00
Laurent Destailleur	c481dc88ce	Clean dead code	2015-10-29 20:25:07 +01:00
Laurent Destailleur	8c8019ee99	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-29 19:18:59 +01:00
Laurent Destailleur	282972784e	Prepare table for budget lines	2015-10-29 19:18:41 +01:00
Frédéric FRANCE	ff9648eed9	Update card.php	2015-10-29 19:09:37 +01:00
Frédéric FRANCE	b1c4e032fc	Update html.formfile.class.php	2015-10-29 19:08:38 +01:00
Frédéric FRANCE	e5063010b2	Update actions_printing.inc.php	2015-10-29 19:07:00 +01:00
Juanjo Menent	c14349f1ea	Merge pull request #3829 from hregis/3.8_bug ... Fix: add missing hooks	2015-10-29 16:05:35 +01:00
philippe grand	aa6b5bc1ce	[Qual] Uniformize code	2015-10-29 13:58:16 +01:00
fmarcet	440df980ea	Fix SQL Query	2015-10-29 13:43:07 +01:00
Regis Houssin	6373c82559	Fix: broken features !!!	2015-10-29 13:14:38 +01:00
fmarcet	dba952e596	Fix: Products image on getNomUrl	2015-10-29 12:51:25 +01:00
fmarcet	310ecb1e09	FIX: Show product image on getNomUrl()	2015-10-29 12:28:28 +01:00
Regis Houssin	e5b1e214bc	Fix: add missing hooks	2015-10-29 11:50:16 +01:00
Juanjo Menent	4e937a0252	Merge pull request #3816 from defrance/patch-61 ... Missing argument 1 for CommonDocGenerator::__construct()	2015-10-29 10:55:20 +01:00
Juanjo Menent	de6bef82dd	Merge pull request #3820 from grandoc/develop ... [Qual] Uniformize code	2015-10-29 10:54:36 +01:00
Juanjo Menent	b6b8a9e0f0	Merge pull request #3824 from aspangaro/3.8-23 ... Review 3.8	2015-10-29 10:54:01 +01:00
fmarcet	6469a31a32	Style corrections	2015-10-29 10:38:21 +01:00
fmarcet	62dc6814a3	FIX #3726 Not showing images on product card	2015-10-29 10:14:54 +01:00
aspangaro	4e9d06785c	Fix #3818 & presentation	2015-10-29 06:47:42 +01:00
aspangaro	e2ba24826f	Review 3.8	2015-10-29 06:06:56 +01:00
Laurent Destailleur	4042c6d5cc	Minor fixes	2015-10-28 23:02:02 +01:00
Laurent Destailleur	f5eaeb2fb5	Some minor fixes	2015-10-28 22:51:06 +01:00
Laurent Destailleur	8e1fd5c3ed	Uniformize labels and css style	2015-10-28 22:25:15 +01:00
Laurent Destailleur	8f52d426d0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-28 22:08:28 +01:00
Laurent Destailleur	8c84ce1576	Create table llx_stock_serial. This table may be used to store eatby and ... sellby date for a couple product-batch number in one place only.	2015-10-28 22:05:37 +01:00
philippe grand	d517595f82	[Qual] Uniformize code	2015-10-28 19:28:18 +01:00
Juanjo Menent	0bcb9dde10	Merge pull request #3810 from grandoc/develop ... [Qual] Uniformize code	2015-10-28 16:11:40 +01:00
Juanjo Menent	a36559c55c	Merge pull request #3809 from aspangaro/develop-hrm ... HRM module : continue to work	2015-10-28 16:11:17 +01:00
phf	4180862fec	Merge branch '3.8' into fix_3.8_clone_order	2015-10-28 14:36:31 +01:00
phf	f385f8bcfa	FIX better fix to generate a PROV ref after clone	2015-10-28 14:34:34 +01:00
BENKE Charlie	8cf2aa456b	Missing argument 1 for CommonDocGenerator::__construct() ... add _construct on htdocs/core/class/commondocgenerator.class.php class need to send $db as parameters	2015-10-28 13:59:05 +01:00
Florian HENRY	9a95401473	FIX : add tag myuser_job into ODT replacement	2015-10-28 11:27:39 +01:00
Laurent Destailleur	1eca2d33c0	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-10-27 22:24:29 +01:00
Laurent Destailleur	87c240252c	FIX Can export a field into task time table with export project profile	2015-10-27 22:24:18 +01:00
Laurent Destailleur	f9c9c58cba	Label must be cheque or transfer	2015-10-27 20:36:27 +01:00
Laurent Destailleur	76ded0acea	Fix using DATE_FORMAT is forbidden	2015-10-27 19:26:33 +01:00
Laurent Destailleur	fb28586f32	Better visible of what is possible for stock management	2015-10-27 19:18:22 +01:00
fappels	8992cfaeb4	move require_once	2015-10-27 15:50:55 +01:00
philippe grand	12e7c7b9e4	[Qual] Uniformize code	2015-10-27 13:42:00 +01:00
Marcos García de La Fuente	eff1f73950	Merge branch 'develop' into multiprice-generator ... # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql # htdocs/product/price.php	2015-10-27 10:41:50 +01:00
Sergio Sanchis Climent	b1bc000bae	standardize	2015-10-27 09:19:39 +01:00
aspangaro	93d340e497	HRM module : continue to work	2015-10-27 07:26:57 +01:00
aspangaro	b90c56fbb5	HRM : move migration into 3.8 to 3.9	2015-10-27 06:29:18 +01:00
Laurent Destailleur	0a3ba3a0c6	Fix picto	2015-10-26 23:36:05 +01:00
Laurent Destailleur	f4184c9dfe	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-26 23:33:51 +01:00
Laurent Destailleur	7d8fab73e1	Merge pull request #3792 from grandoc/develop ... [Qual] Uniformize code	2015-10-26 23:03:30 +01:00
Laurent Destailleur	24c3491ff7	Code comment	2015-10-26 22:56:54 +01:00
Laurent Destailleur	4f04775b41	Merge pull request #3800 from olsesacl/develop ... error this.price > 0 always false	2015-10-26 22:40:26 +01:00
Laurent Destailleur	0c83d152fc	Merge pull request #3795 from grandoc/patch-1 ... Update index.php	2015-10-26 22:39:32 +01:00
Laurent Destailleur	eb42e0fc4f	Merge pull request #3799 from aspangaro/develop-69 ... Typo	2015-10-26 22:39:14 +01:00
fappels	4d839eea60	Fix #2591 Margin is incorrect used with POS ... if buy price not defined, define buyprice as configured in margin admin. If 'Force buying price if null' is off, marge will be equal to suggested default.(min supplier price or pmp) Updated all classes reading 'Force buying price if null' setting.	2015-10-26 20:33:42 +01:00
Alexis Algoud	fa3af485ef	FIX action not appear before an update ... because of a lack of line in action ressource	2015-10-26 18:33:22 +01:00
Laurent Destailleur	6f1d758eae	Fix print feature for md theme	2015-10-26 16:42:31 +01:00
Laurent Destailleur	6493438e87	NEW The clicktodial module is now able to provide link "tel:" on phone ... numbers. So it is also possible to use clicktodial with a client solution like the "xivo" local client.	2015-10-26 16:20:09 +01:00
Laurent Destailleur	07b277b23f	Prepare fields in dtabase to store if time spent was invoiced or not.	2015-10-26 15:22:33 +01:00
atm-robin	29b8919a40	FIX supplier rights for orderToInvoice	2015-10-26 14:34:46 +01:00
Sergio Sanchis Climent	990fbf3ef4	hooks correctly implemented , printObjectLine, printObjectSubLine ... In hook can change correctly label and ref (for my module need if is posible)	2015-10-26 14:00:43 +01:00
Laurent Destailleur	4b2db78c3a	Keep deprecated options to show or not forms for blind people.	2015-10-26 12:50:32 +01:00
Laurent Destailleur	d5e42478a9	Removed deprecated options to show or not forms. Such forms does not ... exists anymore.	2015-10-26 12:37:36 +01:00
Laurent Destailleur	5c4ac0bf62	NEW Merge all left menu search boxes into one.	2015-10-26 12:18:22 +01:00
Sergio Sanchis Climent	2696369470	Merge remote-tracking branch 'upstream/develop' into develop	2015-10-26 11:38:52 +01:00
Sergio Sanchis Climent	4fd0086862	Fix: error this.price > 0 ... if no parse this.price when compare this.price and 0 always false	2015-10-26 11:33:43 +01:00
Laurent Destailleur	71da059ef0	NEW Add a new widget $form->selectArrayAjax() to use combo list with ... content coming from an Ajax URL.	2015-10-26 11:23:31 +01:00
Maxime Kohlhaas	4b7c451f3d	Option of standalone creditnote is hidden	2015-10-26 09:43:58 +01:00
Maxime Kohlhaas	bd831b1f24	Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote	2015-10-26 09:40:50 +01:00
aspangaro	f15e672c56	Typo	2015-10-26 05:40:34 +01:00
Laurent Destailleur	132bc610b6	Icon for contact contains a part of thirdparty icon to make things ... easier to understand	2015-10-25 23:32:49 +01:00
Laurent Destailleur	080ba15e0d	FIX The price per level just never correctly manage the vat. Vat is not ... per level but depends on seller and supplyer. I kept a hidden option to keep old behaviour that was bugged.	2015-10-25 22:50:05 +01:00
philippe grand	83420880dd	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-10-25 21:07:36 +01:00
Laurent Destailleur	77a0359cfc	Fix bad test	2015-10-25 20:17:43 +01:00
Laurent Destailleur	295eb533f8	FIX Bad picto for expense report	2015-10-25 20:16:40 +01:00
Laurent Destailleur	9a4b62c279	NEW Introduce use of cache for thumbs images of users	2015-10-25 20:15:52 +01:00
Laurent Destailleur	54883f2d84	FIX Bad picto for expense report	2015-10-25 20:14:57 +01:00
Laurent Destailleur	24732cf454	Fix to avoid duplicate tooltip	2015-10-25 20:01:39 +01:00
Laurent Destailleur	1f1e72f2b6	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/main.inc.php	2015-10-25 19:54:41 +01:00
Laurent Destailleur	4e206fa80b	Fix doxygen	2015-10-25 19:53:59 +01:00
Laurent Destailleur	d7761ece58	FIX The thumb of user into top menu was using the image in full size. ... This make a large download at each page call. We must use the mini thumbs.	2015-10-25 19:42:54 +01:00
Laurent Destailleur	48ed8d4408	FIX The thumb of user into top menu was using the image in full size. ... This make a large download at each page call. We must use the mini thumbs.	2015-10-25 19:42:00 +01:00
Laurent Destailleur	b49d63c12f	NEW Show photo of user into user list. A new function ... getImageFileNameForSize was also introduced to choose image best size according to usage to save bandwith.	2015-10-25 19:31:42 +01:00
Laurent Destailleur	1261ad43a1	NEW Can select which field to show into list of users.	2015-10-25 18:15:37 +01:00
Laurent Destailleur	1b8234d9fe	Bette behaviour for blind people	2015-10-25 11:09:50 +01:00
Laurent Destailleur	461771d488	Currency is on title only.	2015-10-24 21:20:32 +02:00
Laurent Destailleur	b88a28b660	Restore compatibility with old version	2015-10-24 19:45:41 +02:00
Laurent Destailleur	5181afd49d	Disable dead code	2015-10-24 19:29:41 +02:00
Laurent Destailleur	086582a7a0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-24 16:09:36 +02:00
Laurent Destailleur	3015a0388a	NEW List of projects of a thirdparty are visible on a project tab	2015-10-24 16:09:26 +02:00
Laurent Destailleur	082e41b6c0	Bette translation	2015-10-24 13:58:28 +02:00
Laurent Destailleur	43c80bec7d	A better responsive menu for very small screen	2015-10-24 13:52:35 +02:00
Laurent Destailleur	c007ae9361	Fix php code not executed with some php version	2015-10-24 13:16:59 +02:00
Philippe Grand	8fffdae1fb	Update index.php	2015-10-23 19:01:50 +02:00
Laurent Destailleur	2cbfb69f9b	Update template	2015-10-23 15:28:14 +02:00
Laurent Destailleur	016dbd39ee	Fix sql phpunit regression	2015-10-23 15:24:47 +02:00
Laurent Destailleur	f3a5331095	Merge pull request #3793 from olsesacl/develop-employee ... Fix: Bug: if $this->employe no exist	2015-10-23 15:14:30 +02:00
Laurent Destailleur	a01a85c3f6	FIX tag object_total_vat_x need x to be a string with unknown decimal ... lenght. Now use for x the real vat real with no more decimal (x = 20 or x = 8.5 or x = 5.99, ...)	2015-10-23 15:13:02 +02:00
Laurent Destailleur	f6d30d8b9e	Fix: W3C no form into table	2015-10-23 14:40:45 +02:00
Laurent Destailleur	8d24adc97e	Remove 2 other duplicated pages. There is only one page now for all list ... of thirdarties (with a parameter type to have it specialized per customer, prospect or supplier profile).	2015-10-23 13:52:51 +02:00
Sergio Sanchis Climent	2a412af00b	Fix: Bug: if $this->employe no exist ... Fix: if this->employee no exist default 0	2015-10-23 13:04:33 +02:00
philippe grand	3767ab437e	[Qual] Uniformize code	2015-10-23 12:58:30 +02:00
Laurent Destailleur	90a221ef6d	Fix version of module	2015-10-22 19:46:30 +02:00
Laurent Destailleur	633055fe5b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 19:44:00 +02:00
Laurent Destailleur	1000fd1b21	Add field employee for hr module	2015-10-22 19:43:50 +02:00
Laurent Destailleur	8df59134a9	Merge pull request #3705 from aspangaro/develop-hrm ... New : Module HRM	2015-10-22 19:15:49 +02:00
Laurent Destailleur	531ef43a27	Some minor look fixes.	2015-10-22 19:13:16 +02:00
Laurent Destailleur	cac4a85ccd	Merge pull request #3788 from atm-maxime/new_customer_recap ... New customer recap	2015-10-22 18:02:38 +02:00
Laurent Destailleur	9f21ea58a3	A lot hooks used into PDF generation were not correctly implemented. We ... had to fix this. The result si that the following hook were set as hook of type "replace". This means if your module implement such hooks, it must return 0 to execute standard code or 1 to replace standard code (value to output should be set into resPrints instead).	2015-10-22 17:51:05 +02:00
Laurent Destailleur	56ef1c7338	Fix missing )	2015-10-22 17:05:28 +02:00
Maxime Kohlhaas	ef2337a338	Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 ... Conflicts: htdocs/compta/facture/list.php	2015-10-22 14:41:58 +02:00
All-3kcis	00c2b1a32a	move db->begin() before trigger	2015-10-22 14:30:11 +02:00
Laurent Destailleur	77c43ebb26	FIX #3558	2015-10-22 14:08:19 +02:00
Laurent Destailleur	2615e02e1e	Update doc	2015-10-22 13:18:51 +02:00
Laurent Destailleur	9cce56895c	Merge branch 'patch-77' of https://github.com/defrance/dolibarr into ... defrance-patch-77 Conflicts: htdocs/core/lib/admin.lib.php	2015-10-22 13:13:02 +02:00
Laurent Destailleur	3d7050e051	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 12:29:35 +02:00
Laurent Destailleur	9cbb9129c2	FIX #3772	2015-10-22 12:29:24 +02:00
Laurent Destailleur	ce681081c1	Merge pull request #3776 from frederic34/patch-15 ... Set warehouse for order	2015-10-22 12:16:40 +02:00
All-3kcis	ceae04b76e	move trigger before query	2015-10-22 12:03:01 +02:00
Laurent Destailleur	d55f138fb1	Merge pull request #3785 from frederic34/patch-19 ... FIX Error message not returne into update fournisseur.commande.class.php	2015-10-22 10:43:10 +02:00
Laurent Destailleur	b4c2fc7101	Merge pull request #3782 from frederic34/patch-17 ... Add draft suppliers orders in /comm/index	2015-10-22 10:42:07 +02:00
Laurent Destailleur	c682065ca4	Merge pull request #3780 from frederic34/patch-16 ... Fix some action has no effect in shipment	2015-10-22 10:40:28 +02:00
Laurent Destailleur	a5912d1909	Merge pull request #3778 from grandoc/develop ... [Qual] Uniformize code	2015-10-22 10:39:55 +02:00
Laurent Destailleur	f312ee58de	Merge pull request #3779 from All-3kcis/develop-patch-10 ... Correct return value	2015-10-22 10:35:55 +02:00
Laurent Destailleur	24919b1f3d	Merge pull request #3781 from jpfox/patch-1 ... fix test against empty amount on book update	2015-10-22 10:35:26 +02:00
Laurent Destailleur	40adaf716d	Uniformize index names	2015-10-22 10:33:42 +02:00
Laurent Destailleur	4453ba53fd	Fix migration error	2015-10-22 10:28:59 +02:00
frederic34	865e9d9738	Merge remote branch 'upstream/develop' into patch-15 ... Conflicts: htdocs/langs/en_US/admin.lang	2015-10-22 10:28:06 +02:00
Laurent Destailleur	8bdbed69c9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop	2015-10-22 10:22:54 +02:00
Laurent Destailleur	81d4148f4a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 09:50:26 +02:00
Laurent Destailleur	474692e71a	Remove duplicate page fourn/list.php	2015-10-22 09:48:16 +02:00
Laurent Destailleur	7daf9d10af	Work on the new selectArrayAjax widget	2015-10-21 20:50:27 +02:00
Laurent Destailleur	fd72b4a400	Work on the new selectArrayAjax widget	2015-10-21 20:43:11 +02:00
Frédéric FRANCE	4689b0cc11	Update fournisseur.commande.class.php	2015-10-21 17:31:51 +02:00
philippe grand	c9d1b72087	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-10-21 13:43:04 +02:00
All-3kcis	ca8c1adf55	Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price()	2015-10-21 10:07:53 +02:00
BENKE Charlie	ef79bb3b67	Update dict.php	2015-10-21 05:23:49 +02:00
BENKE Charlie	88ca8d2ace	Update dict.php	2015-10-21 05:22:33 +02:00
BENKE Charlie	ec9955986f	Update admin.lib.php	2015-10-21 05:07:13 +02:00
BENKE Charlie	4f519b5747	Update admin.lib.php	2015-10-21 05:06:19 +02:00
Laurent Destailleur	9a1ec900bd	NEW Add into about page, a sample text to use to promote new version ... release (visible only if version is last stable)	2015-10-21 00:31:32 +02:00
Frédéric FRANCE	73f13045c1	Update index.php	2015-10-20 18:24:14 +02:00
Frédéric FRANCE	15733f5ed0	Update propal.lang	2015-10-20 18:23:30 +02:00
Frédéric FRANCE	be85943d13	Update orders.lang	2015-10-20 18:21:28 +02:00
Frédéric FRANCE	2989a94458	Update index.php	2015-10-20 18:19:32 +02:00
Frédéric FRANCE	4062e7474d	Update index.php	2015-10-20 18:05:21 +02:00
Frédéric FRANCE	5237a2afc7	Fix lost searchstatus on next page list	2015-10-20 17:45:24 +02:00
Frédéric FRANCE	506b251f24	Update orders.lang	2015-10-20 17:02:04 +02:00
Frédéric FRANCE	d9a56ef418	Update index.php	2015-10-20 17:00:34 +02:00
Laurent Destailleur	8306d93286	NEW Add css on column of detail lines to allow module to easily ... manipulate fields.	2015-10-20 16:08:25 +02:00
Jean-Pierre Morfin	6f37fef05e	fix test against empty amount on book update ... - amount < 1 was considered as 0 - 0.00 was not considered as empty so $book->sens was always C	2015-10-20 14:44:20 +02:00
Laurent Destailleur	f123e11c8e	Doxygen	2015-10-20 12:53:32 +02:00
Laurent Destailleur	0c6441df74	FIX Using extrafield with type "Link to object" works correctly.	2015-10-20 12:40:37 +02:00
Marcos García de La Fuente	c6baeacd3d	Removed JS debugging	2015-10-20 11:42:56 +02:00
Marcos García de La Fuente	1b10612c4b	Fixed PHPCS check	2015-10-20 11:41:33 +02:00
Marcos García de La Fuente	6db09a0d64	Little correction	2015-10-20 11:35:49 +02:00
Frédéric FRANCE	2cb9dd8bf3	Update shipment.php	2015-10-20 10:33:46 +02:00
Frédéric FRANCE	f22b3cdfee	Fix some action has no effect in shipment	2015-10-20 10:31:45 +02:00
Frédéric FRANCE	a0fe65266a	Update shipment.php	2015-10-20 09:50:09 +02:00
All-3kcis	3cb2637f25	Correct return value	2015-10-20 09:42:02 +02:00
philippe grand	72491db6b4	[Qual] Uniformize code	2015-10-20 09:31:33 +02:00
Laurent Destailleur	0d9c0b1215	Disable of image done by css, not dol_optimize_smallscreen option	2015-10-20 02:49:34 +02:00
Laurent Destailleur	22979523db	Try a fix for #3742	2015-10-20 02:34:53 +02:00
Laurent Destailleur	fa138ca526	Fix color of text	2015-10-20 02:31:24 +02:00
Laurent Destailleur	b5e633ef42	Size too small	2015-10-20 00:52:53 +02:00
Laurent Destailleur	e70bb28be7	If firstname not define, use lastname	2015-10-20 00:47:35 +02:00
Laurent Destailleur	921faa0410	Work on theme md	2015-10-20 00:25:31 +02:00
Laurent Destailleur	23d7d60d73	Better compatibility with old versions	2015-10-20 00:22:28 +02:00
Frédéric FRANCE	50fe3f6ee9	Update html.formproduct.class.php	2015-10-19 22:06:46 +02:00
Frédéric FRANCE	3e730cc9e2	Update admin.lang	2015-10-19 22:01:30 +02:00
Frédéric FRANCE	229fa59f6c	Update commande.php	2015-10-19 21:57:26 +02:00
Frédéric FRANCE	fe1931bba8	Update commande.class.php	2015-10-19 21:21:27 +02:00
Frédéric FRANCE	affe067ff1	Update commonobject.class.php	2015-10-19 21:09:02 +02:00
Frédéric FRANCE	6a524eeabb	Update 3.8.0-3.9.0.sql	2015-10-19 21:04:05 +02:00
Frédéric FRANCE	1d9f9c7f5b	Update llx_commande.sql	2015-10-19 21:00:47 +02:00
Frédéric FRANCE	2264ecfb2c	Update llx_commande.sql	2015-10-19 20:58:36 +02:00
Maxime Kohlhaas	4de7874118	New : review customer account summary and balance	2015-10-19 20:36:25 +02:00
Maxime Kohlhaas	55657690bf	Remove unused var	2015-10-19 19:07:02 +02:00
Maxime Kohlhaas	a953a66616	New : allow to define list size for object list on customer card	2015-10-19 19:05:04 +02:00
Laurent Destailleur	ec04306348	Fix #3772 Test lower value to avoid mysql limit	2015-10-19 18:31:38 +02:00
Laurent Destailleur	7d382f7997	FIX Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES ... into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED for better compatibility with old versions	2015-10-19 18:17:19 +02:00
Maxime Kohlhaas	158281b14c	Fix : minor typo	2015-10-19 17:13:02 +02:00
Maxime Kohlhaas	d79fb71987	FIX : search_status not used in mergefusiontool	2015-10-19 16:17:47 +02:00
Maxime Kohlhaas	572be23fc1	FIX : filters on supplier invoices list are not used, search_status instead	2015-10-19 15:57:23 +02:00
Maxime Kohlhaas	5fb6705b5c	FIX : Search status not saved into list	2015-10-19 15:53:13 +02:00
Maxime Kohlhaas	9e9f32e3bf	FIX : project was not retrieved on invoice creation form	2015-10-19 15:38:28 +02:00
Marcos García de La Fuente	e7e152c122	NEW Level multiprice generator based on per cent variations over base price	2015-10-19 15:13:19 +02:00
Laurent Destailleur	bbbd5f5202	Fix removed var_dump	2015-10-19 14:55:01 +02:00
Laurent Destailleur	d71ccc4a02	NEW The free text in PDF footer can now be a HTML content. So the ... WYSIWYG editor is on by default to edit it into module setup.	2015-10-19 14:39:55 +02:00
Laurent Destailleur	6a90431cf1	Prepare 3.8.2	2015-10-19 14:04:47 +02:00
Laurent Destailleur	18725b554b	Option MAIN_REPLACE_TRANS_xx_XX is now completely implemented.	2015-10-19 13:23:45 +02:00
Laurent Destailleur	dcf7d344cd	Prepare database for future portal website	2015-10-19 12:54:22 +02:00
Laurent Destailleur	e43f1cee7b	Better error message	2015-10-19 10:52:46 +02:00
Laurent Destailleur	b9001d7ab8	NEW Prepare database to store information per files (for example to ... define if an image ca, be used as a cover or not)	2015-10-18 22:43:19 +02:00
Laurent Destailleur	9ad998d0be	Add comments	2015-10-18 21:51:09 +02:00
Laurent Destailleur	a90c5ce962	Revert "Add currently used sortfields and sortorder" ... This reverts commit 0663932589.	2015-10-18 21:48:17 +02:00
Laurent Destailleur	fd3ba13130	FIX #3541 Bypass authentication when user was created using LDAP	2015-10-18 21:33:47 +02:00
Laurent Destailleur	81580f75b9	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/compta/facture.php	2015-10-18 21:22:42 +02:00
Laurent Destailleur	bf6b48f5a0	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-10-18 21:17:29 +02:00
Laurent Destailleur	afe4057a97	FIX #3757 Can't set amount in a social contribution with some languages	2015-10-18 21:17:19 +02:00
Laurent Destailleur	ccce974476	Fix #3766	2015-10-18 21:00:19 +02:00
Laurent Destailleur	2ad805912d	Fix #3765	2015-10-18 20:58:39 +02:00
Laurent Destailleur	fc1718c0d2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-18 20:57:39 +02:00
Laurent Destailleur	a0e30aa218	Fix #3764	2015-10-18 20:57:28 +02:00
Laurent Destailleur	d0e590f8ea	Move variables	2015-10-18 20:56:10 +02:00
Laurent Destailleur	4dc88406ac	Merge pull request #3737 from frederic34/patch-15 ... Bad chmod for directory when changing product ref	2015-10-18 20:28:17 +02:00
Laurent Destailleur	be8e7515a1	Merge pull request #3762 from simnandez/3.8 ... Fix: Last page total is 0	2015-10-18 20:27:17 +02:00
Laurent Destailleur	c64c1a0201	FIX If no end date is set on survey, we should be able to vote.	2015-10-18 20:11:26 +02:00
Marcos García de La Fuente	12de2d5947	NEW [ task #3768 ] Improve product multiprices view ... Close #3768	2015-10-18 19:34:27 +02:00
Laurent Destailleur	420bfd8301	FIX Preview pages was not using correct style for ref	2015-10-18 19:09:35 +02:00
Laurent Destailleur	c51bc09e39	FIX The preview of PDF was never refreshed if PDF document was changed	2015-10-18 18:54:54 +02:00
Juanjo Menent	1f05cb844c	Merge pull request #3755 from grandoc/develop ... [Qual] Uniformize code	2015-10-18 12:35:17 +02:00
Juanjo Menent	02c1f37a95	Merge pull request #3747 from fappels/develop-best-pmp-pos-margin ... Qual getSupplierPrices	2015-10-18 12:10:29 +02:00
Juanjo Menent	16f473f6a4	Merge pull request #3758 from frederic34/patch-16 ... Create index.html	2015-10-18 12:06:12 +02:00
Juanjo Menent	334c14d088	Fix: Last page total is 0	2015-10-18 11:56:42 +02:00
Frédéric FRANCE	6f4cfc86e8	Update notify.class.php ... http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu Fatal error: Call to a member function getFullName() on a non-object in /home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374	2015-10-18 11:25:55 +02:00
Frédéric FRANCE	c80c0f2c2c	Create index.html	2015-10-18 10:07:08 +02:00
Frédéric FRANCE	8e5c7746dc	Create index.html	2015-10-18 10:06:35 +02:00
philippe grand	1762b3aaa7	[Qual] Uniformize code	2015-10-17 17:09:34 +02:00
philippe grand	f31ddc23aa	[Qual] Uniformize code	2015-10-17 16:18:33 +02:00
Laurent Destailleur	0211ad64ee	FIX Total in summary was not same than into detail on the referrer page. ... Conflicts: htdocs/product/stats/facture.php	2015-10-17 12:36:51 +02:00
Laurent Destailleur	2f46683526	FIX Total in summary was not same than into detail on the referrer page.	2015-10-17 12:28:47 +02:00
Laurent Destailleur	3d94e3d80e	FIX Editing a supplier price should keep the vat.	2015-10-17 12:01:17 +02:00
Laurent Destailleur	4eb7e023ed	Merge pull request #3752 from All-3kcis/develop-patch-9 ... Correct hook param name	2015-10-17 11:18:47 +02:00
Laurent Destailleur	5c1daa6135	Merge pull request #3746 from atm-gauthier/3.8_fix_function_update_extra ... FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABL…	2015-10-17 10:39:37 +02:00
Laurent Destailleur	fc8f4b4d6e	Merge pull request #3745 from atm-arnaud/3.8_fix_propale_facturee ... FIX bug invoice classified in propale next update commonobject class …	2015-10-17 10:38:35 +02:00
Laurent Destailleur	bba8db2b60	Merge pull request #3744 from atm-gauthier/3.8_fix_thirdparty_parent ... FIX : Societe::set_parent() function needs societe object to be fetch…	2015-10-17 10:37:36 +02:00
Laurent Destailleur	5db82b8869	Merge pull request #3743 from hregis/develop_origin ... Fix: Parse error: syntax error, unexpected '}'	2015-10-17 10:37:03 +02:00
Frédéric FRANCE	d68db2a844	Update fournisseur.commande.class.php	2015-10-17 08:48:53 +02:00
aspangaro	aac88519de	Merge remote-tracking branch 'Upstream/develop' into develop-hrm ... Conflicts: htdocs/user/card.php	2015-10-17 07:19:46 +02:00
Laurent Destailleur	91a2341e88	Add missing column	2015-10-17 03:32:19 +02:00
Laurent Destailleur	3ce147ccc1	Use new architecture for quick search for the account area.	2015-10-17 02:41:09 +02:00
Laurent Destailleur	b748c4e328	Uniformize code	2015-10-17 02:03:59 +02:00
Laurent Destailleur	8c66a7d099	Revert a bad PR. if form_confirm is replaced with formconfirm, we must ... include a print before. It is no more included into function.	2015-10-17 02:01:13 +02:00
Laurent Destailleur	7fd6d8839a	Uniformize code and use a new generic search architecture	2015-10-17 01:40:46 +02:00
Laurent Destailleur	a2382bdde3	FIX Type of leave request is required	2015-10-17 01:32:05 +02:00
Laurent Destailleur	2122d4d43a	NEW Contract module can be used to follow both sold and bought ... contracts/recurring subscriptions.	2015-10-17 00:52:35 +02:00
Laurent Destailleur	537a13e2f4	NEW Show which fields are used for search when doing a generic search ... from the quick search form.	2015-10-17 00:14:36 +02:00
Laurent Destailleur	45a2156d71	Uniformize code and add more fields selectable for list of thirdparties	2015-10-16 23:03:20 +02:00
Laurent Destailleur	d1d6c72d7d	NEW Uniformize way of working for search filters. One filter per object.	2015-10-16 22:21:26 +02:00
Laurent Destailleur	87c12717a7	NEW The thirdparties tabs, the contacts tabs and the members tabs are ... now presented using a new top banner, saving space and using a same way to show address, status and navigation arrows.	2015-10-16 20:16:28 +02:00
All-3kcis	ccf144dbae	Correct hook param name ... $object => $product	2015-10-16 16:15:51 +02:00
Laurent Destailleur	df0c6aa5cf	Use the new card banner for members	2015-10-16 16:14:33 +02:00
Laurent Destailleur	ebdc402832	No value set when using the generic new thirdparty feature	2015-10-16 15:05:05 +02:00
fappels	0663932589	Add currently used sortfields and sortorder	2015-10-16 12:51:49 +02:00
Laurent Destailleur	dc5cc52395	NEW Merge all search fields of an area page into one search box	2015-10-16 10:52:49 +02:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00
Laurent Destailleur	8a02c8288b	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/product/index.php	2015-10-16 09:56:55 +02:00
Laurent Destailleur	9b85a70013	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: ChangeLog htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php	2015-10-16 09:52:38 +02:00
fappels	74c373a3af	Qual getSupplierPrices ... use productfourn method list_product_fournisseur_price because query has same purpose.	2015-10-15 22:54:42 +02:00
Gauthier	b3e3cc14a7	FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABLE_CONTACTS_TAB)" test. ... 2/ Reindented code	2015-10-15 17:26:16 +02:00
arnaud	6bd13b8071	FIX bug invoice classified in propale next update commonobject class in 3.8	2015-10-15 17:02:33 +02:00
Gauthier	2c6aeac64f	FIX : Societe::set_parent() function needs societe object to be fetched to update parent	2015-10-15 16:48:52 +02:00
Regis Houssin	d44e961014	Fix: Parse error: syntax error, unexpected '}' ... Fix: bad indentation !!! use tabulation instead spaces please !!!	2015-10-15 16:35:05 +02:00
Regis Houssin	39d89ef9aa	Fix: Parse error: syntax error, unexpected '}'	2015-10-15 16:11:03 +02:00
Laurent Destailleur	b43047bc2f	Use the new banner on all tabs of contacts	2015-10-15 14:13:31 +02:00
Laurent Destailleur	8a32041f16	Clean CSS when option MAIN_MAXTABS_IN_CARD is set	2015-10-15 13:31:44 +02:00
Laurent Destailleur	577776b950	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-15 12:19:01 +02:00
Laurent Destailleur	e2478eea07	NEW Increase length of bank code to 128 char #3704	2015-10-15 12:18:17 +02:00
fmarcet	4cdf17d8b5	FIX #3689 Bug on workflow module	2015-10-15 12:17:57 +02:00
Laurent Destailleur	7fe92bdf0a	Merge pull request #3722 from GPCsolutions/zenfusion-23 ... [Qual] Use default data root path if no conf	2015-10-15 12:06:04 +02:00
Laurent Destailleur	cee0364a1a	Merge pull request #3714 from marcosgdf/doactions-usercard ... NEW Add doActions hooks to user card	2015-10-15 12:05:26 +02:00
Raphaël Doursenaud	6c2b46f939	Fix #3728 Properly remove last category	2015-10-15 10:15:37 +02:00
Laurent Destailleur	d27330e012	Removed useless info	2015-10-15 03:38:21 +02:00
Laurent Destailleur	e413eb29c4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-15 03:29:47 +02:00
Laurent Destailleur	7f75a3da9d	NEW On list of thirdparties, user can select fields to show. ... Make phpunit test working again localy. Add missing columns into llx_expedition.	2015-10-15 03:29:35 +02:00
Frédéric FRANCE	3638f17d75	Update product.class.php	2015-10-14 22:28:03 +02:00
Laurent Destailleur	00c8b27baf	Add code comment	2015-10-14 22:04:54 +02:00
Laurent Destailleur	ed4013bb31	Merge pull request #3735 from All-3kcis/develop-patch-8 ... Update function, move commit after trigger in categorie.class.php	2015-10-14 21:42:09 +02:00
Laurent Destailleur	05686b532c	Merge pull request #3733 from fappels/3.8-shipment-lot-delete ... FIX: #3605 deleting a shipping	2015-10-14 21:41:20 +02:00
Laurent Destailleur	a5b9a210ce	Merge pull request #3725 from FHenry/3.8 ... FIX : #3724 Bug: Blank page after cloning proposal with changed client	2015-10-14 21:27:58 +02:00
Frédéric FRANCE	f4cbc81c97	Bad chmod for directory when changing ref ... When changing product ref, the old document directory is renamed and chmod 0664 in place of 0775	2015-10-14 20:13:14 +02:00
Laurent Destailleur	e9aed15bed	Work on the feature to select which field to show	2015-10-14 18:48:03 +02:00
Laurent Destailleur	225313d8ac	NEW Introduce hidden option MAIN_LANDING_PAGE to decide the home page ... visible just after login.	2015-10-14 17:18:26 +02:00
Laurent Destailleur	ca991da312	Introduce usebold variable to allow more option on style in future.	2015-10-14 16:51:20 +02:00
All-3kcis	545f043353	Move db->commit after trigger	2015-10-14 16:24:09 +02:00
fappels	68aac4476c	FIX: #3605 deleting a shipping ... Get lots to move back to stock. Move lots back to stock. Do not log object because it will be deleted Improve error reporting	2015-10-14 12:16:54 +02:00
Laurent Destailleur	e9facbf108	FIX bad property so after creating an event from calendar, filter were ... lost.	2015-10-14 10:53:38 +02:00
Florian HENRY	727db56576	FIX : #3724 Bug: Blank page after cloning proposal with changed client	2015-10-14 08:27:56 +02:00
Florian HENRY	00b610d87f	FIX : fix HTML into formconfirm box	2015-10-14 08:23:52 +02:00
Laurent Destailleur	57ea4fc23d	FIX sql syntax error when sort order not defined.	2015-10-13 14:40:02 +02:00
Laurent Destailleur	70f3da80df	FIX Option SOCIETE_DISABLE_PROSPECTS not supported into title of box	2015-10-13 14:21:00 +02:00
Laurent Destailleur	6520ed7a08	Use css not bold title. ... Add missing badge (count of draft records) on draft list.	2015-10-13 14:09:14 +02:00
Laurent Destailleur	9f0c0bfc92	NEW Introduce hidden option MAIN_REPLACE_TRANS_xx_XX to allow simple ... replacement of translated string on the fly.	2015-10-13 13:27:44 +02:00
Laurent Destailleur	a84ec64ece	The new banner tab is available on all tabs of thirdparty.	2015-10-13 13:06:32 +02:00
Laurent Destailleur	918d9b7c18	Fix filter was lost if nothing found	2015-10-13 12:05:24 +02:00
Marcos García de La Fuente	87ad6e7941	Merge branch 'develop' into doactions-usercard ... # Conflicts: # htdocs/user/agenda_extsites.php	2015-10-13 09:49:19 +02:00
Florian HENRY	8aaa1993c6	FIX : #3724 Bug: Blank page after cloning proposal with changed client	2015-10-13 09:37:33 +02:00
Alexis Algoud	0251728e28	FIX double db escape add too quote	2015-10-12 17:36:24 +02:00
Raphaël Doursenaud	ddb23eaf3b	[Qual] Use default data root path if no conf ... Installation can be protected by an install.lock file in the data root path. This protection was ineffective if no configuration file was available. Whith this change, it still searches the default path.	2015-10-12 15:25:36 +02:00
aspangaro	0b54cc4509	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-10-11 21:05:15 +02:00
aspangaro	2857d7cfda	Correct	2015-10-11 21:00:41 +02:00
Laurent Destailleur	618e5f0419	FIX no need to remove file into mail form #3573	2015-10-11 20:47:31 +02:00
Laurent Destailleur	87fad70f4a	Revert "FIX no need to remove file into mail form"	2015-10-11 20:42:49 +02:00
Laurent Destailleur	62dd936b08	Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file ... FIX no need to remove file into mail form	2015-10-11 20:42:42 +02:00
Laurent Destailleur	80bd563fde	Use GETPOST	2015-10-11 20:41:06 +02:00
Laurent Destailleur	5b715c29e2	Merge pull request #3717 from marcosgdf/bug-3197 ... FIX [ bug #3197 ] Trigger LINECONTRACT_CREATE does not follow common denomination	2015-10-11 20:30:33 +02:00
Laurent Destailleur	9fa2afb44b	Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 ... Conflicts: ChangeLog	2015-10-11 19:55:50 +02:00
Laurent Destailleur	1acaf44acf	Merge pull request #3718 from hregis/3.8_bug ... Fix: wrong files name	2015-10-11 19:48:25 +02:00
Laurent Destailleur	a9a3c3b97f	Exclude file from sources. It is generated when building package.	2015-10-11 19:47:47 +02:00
Laurent Destailleur	a8e52f9c54	Update filelist	2015-10-11 19:45:53 +02:00
Regis Houssin	f8f600828d	Fix: wrong files name	2015-10-11 19:18:03 +02:00
Laurent Destailleur	9a6ac4f457	CSS enhancement	2015-10-11 16:32:46 +02:00
Laurent Destailleur	3bb8eac92b	New banner tab is available on all tab of user object	2015-10-11 16:25:31 +02:00
Laurent Destailleur	b24d609ecc	New banner tab is available on all tab of user object	2015-10-11 16:12:12 +02:00
Laurent Destailleur	7fae9450a3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-11 15:21:45 +02:00
Laurent Destailleur	bd48ad265d	The new banner tab is also on user card now	2015-10-11 15:21:21 +02:00
Laurent Destailleur	0ba6bdb7c2	CSS enhancement	2015-10-11 13:26:22 +02:00
Marcos García de La Fuente	8cd17c0165	FIX [ bug #3197 ] Trigger LINECONTRACT_CREATE does not follow common denomination ... Close #3197	2015-10-11 13:01:28 +02:00
Marcos García de La Fuente	4e9a378f0d	Merge branch '3.6' into bug-1776	2015-10-11 12:37:41 +02:00
Marcos García de La Fuente	252f00dfe7	Merge branch '3.6' into clone-proposals	2015-10-11 12:29:45 +02:00
Laurent Destailleur	db9d09c7a3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-11 12:28:03 +02:00
Laurent Destailleur	6ec77e2ca0	New banner card on contact card.	2015-10-11 12:27:04 +02:00
Marcos García de La Fuente	1cd0f7263f	Merge remote-tracking branch 'upstream/develop' into doactions-usercard ... # Conflicts: # htdocs/user/card.php # htdocs/user/param_ihm.php	2015-10-10 22:38:02 +02:00
Marcos García de La Fuente	3fd626705f	NEW Added doActions hooks to user cards ... Close #3394	2015-10-10 22:31:01 +02:00
Laurent Destailleur	3f8e9bd181	Remove warning	2015-10-10 19:24:31 +02:00
Laurent Destailleur	7b7d27920d	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/adherents/type.php htdocs/categories/class/categorie.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/tax.lib.php htdocs/product/composition/card.php	2015-10-10 18:56:28 +02:00
Laurent Destailleur	525f9841fa	Fix doxygen	2015-10-10 18:38:22 +02:00
Laurent Destailleur	8d9f52ee4b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-10 18:31:51 +02:00
Laurent Destailleur	fb50daaa40	Fix bad parameter	2015-10-10 16:09:01 +02:00
Laurent Destailleur	e58de1fd34	Merge pull request #3672 from ndrosis/patch-20 ... For devices not supporting unicode characters	2015-10-10 15:20:16 +02:00
Laurent Destailleur	cea6968478	Merge pull request #3713 from frederic34/patch-10 ... Update account.php	2015-10-10 15:18:49 +02:00
Drosis Nikos	b6b410a99c	Update cidlookup.php	2015-10-10 16:01:39 +03:00
Laurent Destailleur	0032ad695c	New look for thirdparty tab using the new common banner. End. Let's do ... the same for other tabs and elements now...	2015-10-10 13:12:14 +02:00
Frédéric FRANCE	7065b2aa7d	Update account.php	2015-10-10 12:59:58 +02:00
Laurent Destailleur	0222867a94	The new banner for tab is moved into a shared functions	2015-10-10 12:01:09 +02:00
aspangaro	8b97196c2f	Correct term status & sql error	2015-10-10 08:50:55 +02:00
aspangaro	8e37da55c3	Add searchform, language key and correct code	2015-10-10 08:34:15 +02:00
aspangaro	4008a076ab	Correct old code	2015-10-10 06:58:18 +02:00
aspangaro	8f8de587b8	Add admin & first version to manage establishment	2015-10-10 06:39:59 +02:00
aspangaro	cd7c5645c7	Add library	2015-10-10 06:38:42 +02:00
aspangaro	11387a5d38	Add language file	2015-10-10 06:37:43 +02:00
aspangaro	5d7e05e313	Correct review	2015-10-10 06:00:55 +02:00
aspangaro	f6947afc2f	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-10-10 05:42:06 +02:00
Laurent Destailleur	d7dbc8adb1	Sync theme md	2015-10-10 02:16:49 +02:00
Laurent Destailleur	f4f7629037	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/html.form.class.php	2015-10-10 02:10:14 +02:00
Laurent Destailleur	effba68511	Start to work on a common banner for tabs (goal is to have a nicer and ... generic part for all element)	2015-10-10 01:51:12 +02:00
Laurent Destailleur	384c89dcef	Merge pull request #3701 from altatof/fix_orderdateonclone ... FIX: change order date on clone (as everywhere else)	2015-10-09 20:44:03 +02:00
Laurent Destailleur	856bfaaa3a	Merge pull request #3691 from FHenry/3.8 ... FIX : Always use type send in parameters in showCategories method	2015-10-09 20:39:28 +02:00
Laurent Destailleur	4fab809604	Merge pull request #3684 from aspangaro/3.8-21 ... Fix : Lines from ER show date in english format	2015-10-09 20:38:29 +02:00
Laurent Destailleur	279e7028fb	Merge pull request #3686 from grandoc/3.7 ... 3.7	2015-10-09 20:38:16 +02:00
Laurent Destailleur	0899519dd6	Merge pull request #3671 from ndrosis/patch-19 ... Display names and numbers calls on	2015-10-09 20:36:00 +02:00
Laurent Destailleur	f9485bd25b	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/core/class/extrafields.class.php	2015-10-09 20:35:17 +02:00
Laurent Destailleur	b27989d5d4	Merge pull request #3665 from altatof/fix_extrafields ... reenable search criteria in sql clause	2015-10-09 20:32:42 +02:00
Laurent Destailleur	c675f88dda	Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning ... [Qual] Prevent warning	2015-10-09 20:29:24 +02:00
Laurent Destailleur	eeac01b794	Merge pull request #3683 from aspangaro/develop-68 ... New : Add payment donation in accountancy expert & presentation	2015-10-09 20:25:50 +02:00
Laurent Destailleur	2937ad219a	Merge pull request #3682 from tysauron/develop ... For not error Undefined property: stdClass::$id	2015-10-09 20:25:39 +02:00
Laurent Destailleur	dea095dbf7	Merge pull request #3710 from GPCsolutions/3.8-rmdebug ... Fix: remove debugging leftover	2015-10-09 20:19:41 +02:00
Laurent Destailleur	ab4b423567	Merge pull request #3712 from GPCsolutions/fixunittests ... Fix unittests regression	2015-10-09 20:19:21 +02:00
Laurent Destailleur	796a87e254	Merge pull request #3673 from apachler/develop ... Changes to ODT creation of proposal and invoice	2015-10-09 20:18:55 +02:00
Laurent Destailleur	e886c89e06	Merge pull request #3668 from altatof/fix_stock_entity ... fix entities warehouse share	2015-10-09 20:16:32 +02:00
Laurent Destailleur	53c9cb38ef	Merge pull request #3664 from FHenry/3.7 ... FIX : New adherent from, always redirect on entity	2015-10-09 20:15:23 +02:00
Laurent Destailleur	be9027df1a	Merge pull request #3687 from grandoc/3.8 ... syntax error	2015-10-09 20:14:08 +02:00
Laurent Destailleur	a1d37f92cb	Several fix in CSS	2015-10-09 20:00:43 +02:00
Raphaël Doursenaud	b785db86a8	Fix unittests regression ... Introduced by incomplete renaming of modSyncSupplierWebServices to modWebServicesClient in 4b103ba8ce	2015-10-09 19:02:44 +02:00
Laurent Destailleur	53e4cb3af9	Several fix in CSS	2015-10-09 17:21:38 +02:00
Laurent Destailleur	f29c03c922	Start to work on a multiselect component to select which fields to show ... into dolibarr lists.	2015-10-09 16:35:14 +02:00
Raphaël Doursenaud	497c751fb9	Fix: remove debugging leftover	2015-10-09 16:24:42 +02:00
Laurent Destailleur	82428fea68	NEW: Only arrow of current sorted field is visible into table views. ... This save a lot of spaces. You can click on the column title to sort. This make clickable area larger and click to sort is easier.	2015-10-09 13:01:50 +02:00
aspangaro	bde7279aa1	Review by Rdoursenaud. Tkanks	2015-10-09 13:00:51 +02:00
Laurent Destailleur	61d739635e	Uniformize code and css for tables. Filters must be implemented ... following example in test_arrays.php.	2015-10-09 12:30:16 +02:00
aspangaro	b571cc86ff	Add a yn form in user card to know if the user is also an employee	2015-10-09 07:30:48 +02:00
aspangaro	6a7892ca52	Add the first tables	2015-10-09 06:41:36 +02:00
aspangaro	d9693ba2f2	New : Module HRM	2015-10-09 06:16:43 +02:00
Laurent Destailleur	2fc11a289e	When there is no contact, no need to show filters	2015-10-09 00:30:02 +02:00
Laurent Destailleur	cfc70c7f92	Smaller image	2015-10-08 23:55:15 +02:00
Laurent Destailleur	2b17cd3353	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-08 23:50:24 +02:00
Laurent Destailleur	0d799402d0	Work on image for "no photo" with better resolution	2015-10-08 23:50:17 +02:00
Christophe Battarel	00f0aff6f0	FIX: change order date on clone (as everywhere else)	2015-10-08 15:58:19 +02:00
Florian HENRY	1f2a86078a	FIX : Always use type send in parameters in showCategories method	2015-10-08 11:03:08 +02:00
philippe grand	0841feda47	syntax error	2015-10-08 09:40:00 +02:00
philippe grand	0e343ae3b2	syntax error	2015-10-08 09:34:02 +02:00
philippe grand	6cce2860c2	Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7	2015-10-08 09:12:36 +02:00
aspangaro	425e7ce808	Fix : ER Show date in english format	2015-10-07 22:31:23 +02:00
aspangaro	deaf23870e	Cancel work on responsive design	2015-10-07 21:52:30 +02:00
aspangaro	f8ade01f0e	New : Add payment donation in accountancy expert	2015-10-07 21:48:46 +02:00
aspangaro	e0f2c41a37	Merge remote-tracking branch 'Upstream/develop' into develop-68	2015-10-07 21:08:00 +02:00
aspangaro	e1f946578b	Fix presentation	2015-10-07 21:06:55 +02:00
tysauron	ea949437ab	For not error Undefined property: stdClass::$id	2015-10-07 17:17:32 +02:00
Laurent Destailleur	8db83a51b2	Missing translation	2015-10-07 14:30:54 +02:00
Laurent Destailleur	9e12de7d83	FIX Missing exclude to avoid duplicate menu css declaration	2015-10-07 08:34:57 +02:00
Laurent Destailleur	4b103ba8ce	Work on a better way to manage modules. All one page. Introduce a way to ... choose order of modules family. We should also be able to introduce filters.	2015-10-07 08:13:23 +02:00
aspangaro	01a6a0ffba	Merge commit 'c74bf517e2895b09738996fb55f2f509bf46e7f1' into develop-68	2015-10-07 06:29:48 +02:00
Laurent Destailleur	8d47a307bb	Better use of space	2015-10-06 21:52:42 +02:00
Laurent Destailleur	72cabe2fc3	More complete description of margin rules calculation	2015-10-06 19:27:48 +02:00
Laurent Destailleur	8426e2e506	FIX Can't reopen a canceled invoice.	2015-10-06 18:38:43 +02:00
Laurent Destailleur	c460873c85	FIX The filter on thirdparty prices should be visible if there is at ... least one thirdparty price.	2015-10-06 17:13:35 +02:00
Laurent Destailleur	1f742c7464	FIX Add a test to save life when ref of object (invoice ref, order ref, ... ...) was empty. The was no way to go back to a clean situation, even after vaidating again the object.	2015-10-06 16:38:27 +02:00
Laurent Destailleur	d4a85d9fba	Fix missing css	2015-10-06 16:12:09 +02:00
Laurent Destailleur	e776f685ba	FIX when editing time spent, date of line suggested was a rubbish value	2015-10-06 16:09:24 +02:00
Laurent Destailleur	6ea05aa311	FIX Bad translation key for project "Overview"	2015-10-06 16:03:47 +02:00
Raphaël Doursenaud	c208fccf35	[Qual] Prevent warning ... calcul_price_total() prefers to have the seller and localtaxes specified	2015-10-06 15:03:59 +02:00
Laurent Destailleur	f54a1ca367	CSS enhancement	2015-10-06 01:03:31 +02:00
Laurent Destailleur	d92604f646	FIX Link of project must be cickable if user has permission to read all ... projects FIX Missing information into the alt of project picto	2015-10-06 00:46:26 +02:00
Laurent Destailleur	53d86e1661	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-10-05 23:54:13 +02:00
Laurent Destailleur	9f2bcf0e4f	FIX The admin flag is mising.	2015-10-05 23:53:49 +02:00
Laurent Destailleur	f1cf629b80	FIX List of project for user that are restrited as sale repreentative to ... some thirdparties.	2015-10-05 23:52:54 +02:00
Raphaël Doursenaud	afbee44993	Fix #3667 checkbox extrafields on edit ... For actions and members.	2015-10-05 20:51:43 +02:00
Raphaël Doursenaud	3fdd59bf0a	Fix #3666 checkbox extrafields on edit	2015-10-05 20:39:14 +02:00
Raphaël Doursenaud	41354ca00d	Added type hinting to extrafields object	2015-10-05 20:30:55 +02:00
Raphaël Doursenaud	d24f5538f9	Fix: wrong parameters order	2015-10-05 20:25:55 +02:00
Laurent Destailleur	e3f225e038	FIX bad link into project box	2015-10-05 19:41:41 +02:00
Andreas, OE8APR	3aeeab9654	Get proposal customer contact ... Added functionality to get proposal customer contact as contact_xx tags	2015-10-05 17:51:26 +02:00
Andreas, OE8APR	e3bdc8aaaa	Get invoice customer contact ... Added functionality to get invoice customer contact as contact_xx tags	2015-10-05 17:50:56 +02:00
Drosis Nikos	a1ae920b4a	For devices not supporting unicode characters	2015-10-05 17:46:02 +03:00
Drosis Nikos	cb54533273	Display names and numbers calls on	2015-10-05 17:38:26 +03:00
Christophe Battarel	f3ef9b868f	fix entities warehouse share	2015-10-05 16:19:54 +02:00
Christophe Battarel	bf262c2cae	reenable search criteria in sql clause	2015-10-05 15:41:28 +02:00
Florian HENRY	9dd4a23365	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-10-05 15:22:38 +02:00
Florian HENRY	c9d8e041d5	FIX : New adherent from, always redirect on entity	2015-10-05 15:20:55 +02:00
philippe grand	78cb31e55f	Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7	2015-10-05 14:50:30 +02:00
Laurent Destailleur	143c1e03f8	FIX Missing menu entry for list of thirdparties when using auguria menu ... manager	2015-10-05 10:30:49 +02:00
Laurent Destailleur	7b2fbdd638	FIX Can't change the admin with default setup	2015-10-05 10:04:34 +02:00
Laurent Destailleur	b45f5039ed	Fix syntax error	2015-10-05 09:02:03 +02:00
Laurent Destailleur	68d4a9fc63	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/societe/list.php	2015-10-04 20:57:00 +02:00
Laurent Destailleur	c20296f963	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-10-04 20:46:17 +02:00
Laurent Destailleur	b5ec3b7085	Merge pull request #3546 from GPCsolutions/badincludepath ... Fix Do not always append htdocs to include path	2015-10-04 20:14:13 +02:00
Laurent Destailleur	c74bf517e2	Merge pull request #3656 from frederic34/patch-15 ... Update index.php	2015-10-04 20:11:55 +02:00
Laurent Destailleur	e4014bf01d	Merge pull request #3655 from frederic34/patch-14 ... Update index.php	2015-10-04 20:11:09 +02:00
Laurent Destailleur	a65d10de90	Merge pull request #3654 from frederic34/patch-12 ... Update index.php	2015-10-04 20:10:54 +02:00
Laurent Destailleur	39671d5c53	Merge pull request #3653 from frederic34/patch-11 ... Autocomplete with last conciliate number	2015-10-04 20:09:25 +02:00
Laurent Destailleur	17416dba89	Merge pull request #3651 from frederic34/patch-20 ... Add badge for number of files in bank's tab	2015-10-04 20:03:41 +02:00
Laurent Destailleur	839d4c2a9a	Merge pull request #3650 from frederic34/patch-19 ... Update printing.php	2015-10-04 20:03:21 +02:00
Laurent Destailleur	f4b26285a2	Merge pull request #3649 from frederic34/patch-18 ... Lost search_status on next page button	2015-10-04 20:02:37 +02:00
Laurent Destailleur	229f689a08	Merge pull request #3648 from frederic34/patch-17 ... Update style.css.php	2015-10-04 20:02:20 +02:00
Laurent Destailleur	c2cc9711f7	FIX Thirdparty is missing on card	2015-10-04 20:01:08 +02:00
Frédéric FRANCE	780a5a1996	Update files.lib.php	2015-10-04 19:59:26 +02:00
Laurent Destailleur	406b271275	Merge pull request #3635 from FHenry/3.7 ... FIX : Mass Mailing activity don't display all status	2015-10-04 19:57:29 +02:00
Laurent Destailleur	85a5b0fc69	Merge pull request #3652 from grandoc/develop ... FIX : typo	2015-10-04 19:57:12 +02:00
Laurent Destailleur	2236d47da2	Merge pull request #3658 from frederic34/optioncss ... Optioncss not kept in list	2015-10-04 19:56:59 +02:00
Laurent Destailleur	77218194c6	Merge pull request #3657 from frederic34/patch-16 ... Fix: #3552	2015-10-04 19:56:22 +02:00
Laurent Destailleur	0df42bc5ea	FIX Filter on status of thirdparty list and bad encoding of url	2015-10-04 19:37:49 +02:00
frederic34	7f86797f73	Add contact photo	2015-10-04 17:25:46 +02:00
Laurent Destailleur	75e337e8d9	FIX select of project using ajax autocomplete option	2015-10-04 16:02:50 +02:00
frederic34	1e8ff69267	Optioncss	2015-10-04 13:34:55 +02:00
frederic34	f2d7523091	Optioncss	2015-10-04 12:31:32 +02:00
frederic34	1108458de8	Optioncss	2015-10-04 11:45:02 +02:00
frederic34	ed917ab447	Optioncss	2015-10-04 11:30:28 +02:00
frederic34	835633f92a	Optioncss cotisations adhérent	2015-10-04 11:17:19 +02:00
frederic34	9a021e6de4	Optioncss not kept in list	2015-10-04 10:45:57 +02:00
Juanjo Menent	5deedcdb6f	Merge pull request #3577 from simnandez/dolibarr-3509 ... Issue #3509: Ready for customers	2015-10-03 23:58:12 +02:00
Juanjo Menent	31230d296d	Merge remote-tracking branch 'upstream/3.8' into develop	2015-10-03 23:51:38 +02:00
Frédéric FRANCE	6f513fabef	Update DolibarrModules.class.php	2015-10-03 23:45:25 +02:00
Frédéric FRANCE	b3fb320796	Update errors.lang	2015-10-03 23:44:17 +02:00
Juanjo Menent	8f28e7cf1c	Merge remote-tracking branch 'upstream/3.8' into 3.8	2015-10-03 23:34:37 +02:00
Juanjo Menent	8febf25c23	Fix: #3566	2015-10-03 23:34:10 +02:00
Juanjo Menent	7bc6f14736	Merge pull request #3608 from All-3kcis/develop-patch-7 ... fix dangerous sql injection	2015-10-03 23:16:04 +02:00
Frédéric FRANCE	85186ee1a3	Update index.php	2015-10-03 23:06:05 +02:00
Juanjo Menent	bc01d28061	Fix: formconfirm printing	2015-10-03 22:59:22 +02:00
Frédéric FRANCE	0cfa112cf2	Update index.php	2015-10-03 22:35:26 +02:00
Frédéric FRANCE	ebe937f8b7	Update index.php	2015-10-03 21:32:43 +02:00
Frédéric FRANCE	c077e69047	Autocomplete with last conciliate number	2015-10-03 20:54:27 +02:00
Laurent Destailleur	d737fd1fd2	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-10-03 19:06:44 +02:00
Laurent Destailleur	c4c8ffd675	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-03 19:05:25 +02:00
Laurent Destailleur	00911d1afe	Fix bad param	2015-10-03 19:05:13 +02:00
Laurent Destailleur	31acab92a6	Doc comments	2015-10-03 18:48:51 +02:00
Laurent Destailleur	474bf611ad	FIX product type must be defined before used for vat calculation.	2015-10-03 18:33:46 +02:00
Juanjo Menent	9d60dee781	Issue #3509: Ready for customers	2015-10-03 17:15:25 +02:00
Juanjo Menent	03a2fd740d	Issue #3509: Ready for customers	2015-10-03 16:58:46 +02:00
philippe grand	322928fbae	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-10-03 16:33:16 +02:00
Juanjo Menent	92f4c0d015	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509	2015-10-03 16:01:24 +02:00
Juanjo Menent	2d94e3635e	Merge pull request #3646 from frederic34/patch-16 ... Typo	2015-10-03 15:59:35 +02:00
Juanjo Menent	ad0d6f2c75	Merge pull request #3645 from frederic34/patch-15 ... Typo	2015-10-03 15:59:15 +02:00
Juanjo Menent	5d10fc2c77	Merge pull request #3644 from frederic34/patch-14 ... can't access documents for bank	2015-10-03 15:57:58 +02:00
Juanjo Menent	553c8c0bd0	Merge pull request #3643 from frederic34/patch-12 ... Typo (broken facture.php)	2015-10-03 15:57:04 +02:00
Juanjo Menent	d1a52119e4	Merge pull request #3642 from frederic34/patch-11 ... Update suppliers.lang	2015-10-03 15:56:35 +02:00
Juanjo Menent	fbc3efb5a9	Merge pull request #3641 from grandoc/3.8 ... fix : Typo	2015-10-03 15:55:56 +02:00
Juanjo Menent	8da8b66693	Issue #3509: Init works	2015-10-03 15:53:36 +02:00
philippe grand	298fafd7d2	fix : internationalization	2015-10-03 15:10:53 +02:00
philippe grand	b6de2a954c	fix : internationalization	2015-10-03 15:04:03 +02:00
Juanjo Menent	67d28d6991	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-03 14:59:56 +02:00
philippe grand	82c7022e20	Fix : internationalization	2015-10-03 14:47:11 +02:00
philippe grand	47fd949068	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-10-03 14:35:35 +02:00
Laurent Destailleur	c0c0cc2415	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/compta/facture/list.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/interventions.lang htdocs/theme/md_exp/style.css.php	2015-10-03 14:28:31 +02:00
Laurent Destailleur	a9e55fd08f	FIX Missing contracts into list in page of Refering objects of a ... thirdparty.	2015-10-03 12:57:58 +02:00
philippe grand	19df00579d	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-10-03 12:44:00 +02:00
philippe grand	d19a9f66b3	Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8	2015-10-03 12:43:38 +02:00
Laurent Destailleur	996c9ca2ba	FIX Can't change state on a contact	2015-10-03 12:21:27 +02:00
Laurent Destailleur	b6a83ed5a6	FIX Can't delete thirdparty if there is some discounts	2015-10-03 12:20:50 +02:00
Frédéric FRANCE	7da49a3592	Add badge for number of files in bank's tab	2015-10-03 12:09:42 +02:00
Frédéric FRANCE	322a2a54b8	Update printing.php	2015-10-03 11:34:14 +02:00
Laurent Destailleur	10b481f47f	Fix colspan	2015-10-03 11:15:12 +02:00
Frédéric FRANCE	471e75f029	Lost search_status on next page button	2015-10-03 10:15:07 +02:00
Frédéric FRANCE	418bcf8d36	Update style.css.php	2015-10-03 10:00:06 +02:00
aspangaro	9191b77ecd	Merge remote-tracking branch 'Upstream/develop' into develop-68	2015-10-03 08:21:35 +02:00
aspangaro	6969339159	Try for responsive design	2015-10-03 08:18:03 +02:00
Laurent Destailleur	e444cb57d4	Fix bad print	2015-10-03 00:35:26 +02:00
Laurent Destailleur	5acf961f23	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-10-03 00:10:19 +02:00
Frédéric FRANCE	f643613d69	Typo	2015-10-02 17:07:22 +02:00
Frédéric FRANCE	f295b38ccb	Typo	2015-10-02 17:05:58 +02:00
Laurent Destailleur	920803518f	Removed not used table	2015-10-02 16:31:34 +02:00
Frédéric FRANCE	d451051d97	can't access documents for bank	2015-10-02 16:29:54 +02:00
Laurent Destailleur	43f09dfccf	Work on theme	2015-10-02 16:26:08 +02:00
Frédéric FRANCE	8a984980ca	Type (broken facture.php)	2015-10-02 16:16:05 +02:00
Frédéric FRANCE	17f6e5e48c	Update suppliers.lang	2015-10-02 16:07:56 +02:00
Laurent Destailleur	1ffe8f55ca	Clean skin code. Prepare to allow more option to choose colors.	2015-10-02 15:37:32 +02:00
philippe grand	ac7ee86da3	fix : Typo	2015-10-02 13:41:07 +02:00
philippe grand	e22fb3c538	fix : Typo	2015-10-02 12:39:09 +02:00
philippe grand	8a9c9f49d5	fix : Typo	2015-10-02 12:37:13 +02:00
Laurent Destailleur	5a7adf9b47	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-02 11:58:41 +02:00
Laurent Destailleur	17a5b0a0f4	Fix css	2015-10-02 11:58:19 +02:00
Regis Houssin	8912e111a3	Fix: wrong date format	2015-10-02 11:21:23 +02:00
Juanjo Menent	cfa6938e5e	Merge pull request #3637 from hregis/develop_origin ... Fix: sql error, status is an integer	2015-10-02 11:11:39 +02:00
Juanjo Menent	4c1e018ded	Merge pull request #3621 from fmarcet/3.8 ... FIX Only are showing one object linked	2015-10-02 11:03:19 +02:00
Regis Houssin	65935c6603	Fix: copy/paste error	2015-10-02 10:46:32 +02:00
Regis Houssin	6f9b0e1053	Fix: sql error, status is an integer	2015-10-02 10:37:08 +02:00
Frédéric FRANCE	6e947add92	Update index.php	2015-10-02 08:58:09 +02:00
Laurent Destailleur	53269a2703	Removed old theme with no maintener.	2015-10-01 23:27:41 +02:00
Laurent Destailleur	fcf3a0966c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-01 23:19:58 +02:00
Laurent Destailleur	3f8b95de77	Work on default theme	2015-10-01 23:19:50 +02:00
Laurent Destailleur	f11fd22809	More accurate message	2015-10-01 22:27:02 +02:00
Laurent Destailleur	5ad665d00c	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-10-01 16:50:52 +02:00
Laurent Destailleur	60c0338d64	FIX #3628	2015-10-01 16:50:18 +02:00
Laurent Destailleur	e76124add5	FIX #3606	2015-10-01 16:09:51 +02:00
Florian HENRY	fd29bb34be	FIX : Mass Mailing activity don't display all status	2015-10-01 16:09:04 +02:00
Laurent Destailleur	4201e8b032	FIX #3630 - Wrong balance report when module salaries and donation ... disabled	2015-10-01 14:38:31 +02:00
Laurent Destailleur	e2a88cd010	Merge pull request #3626 from GPCsolutions/3.8-3607 ... FIX #3607 Better categories setting and unsetting	2015-10-01 13:59:05 +02:00
Laurent Destailleur	09e5d71796	Merge pull request #3631 from hregis/develop_origin ... Fix: missing llx_const encryption	2015-10-01 13:57:47 +02:00
Laurent Destailleur	4057d682f1	Merge pull request #3633 from hregis/develop_bug ... Fix: avoid error during update if db port not defined	2015-10-01 13:56:48 +02:00
Regis Houssin	45a70d7dc3	Fix: wrong test	2015-10-01 12:41:29 +02:00
Regis Houssin	1c023e291c	Fix: avoid error during update if db port not defined	2015-10-01 12:35:38 +02:00
Regis Houssin	259f7af3e6	Fix: missing llx_const encryption	2015-10-01 12:06:45 +02:00
Laurent Destailleur	b57c156b60	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/modules/modContrat.class.php htdocs/fichinter/card.php htdocs/install/upgrade2.php	2015-10-01 11:16:35 +02:00
Laurent Destailleur	076f2ed9d1	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/core/lib/security.lib.php	2015-10-01 11:10:47 +02:00
Laurent Destailleur	72c31c0fa9	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-10-01 10:48:28 +02:00
Laurent Destailleur	4da8fb901b	Add comment	2015-10-01 10:48:09 +02:00
Laurent Destailleur	1907e5da54	Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat ... FIX facturestat bad sql when customer view is limited	2015-10-01 10:48:05 +02:00
Laurent Destailleur	34adc60d26	Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company ... FIX error in SQL due to a previous fix	2015-10-01 10:35:07 +02:00
Laurent Destailleur	9c28894ec3	Merge pull request #3615 from FHenry/3.7 ... FIX : When delete actioncomm also delete actioncomm_resources	2015-10-01 10:34:54 +02:00
Laurent Destailleur	0c64fa04bc	Merge pull request #3614 from marcosgdf/bug-3572 ... FIX #3572 Impossible to attach project in order. The option to use autocompletion for project failed.	2015-10-01 10:32:32 +02:00
Laurent Destailleur	9c4a12b9d4	Merge pull request #3613 from aspangaro/develop-68 ... Fix : remove viewport for mobile device already declared	2015-10-01 10:29:39 +02:00
Laurent Destailleur	d4b5256f18	Merge pull request #3611 from atm-alexis/develop ... FIX there is no way to hide or change qty by hook	2015-10-01 10:27:26 +02:00
Laurent Destailleur	9901406634	A paswword can be set on member card but member can't login. Too much ... work to fix this into a stable version, so I just introduce a warning to explain why and how to solve this.	2015-10-01 10:15:07 +02:00
Laurent Destailleur	71ccdb5cfb	FIX Payment form for paypal and paybox was not centered.	2015-09-30 19:37:41 +02:00
Laurent Destailleur	c7e05d2473	Add field pass_crypted to uniformize fields between members and users.	2015-09-30 19:27:36 +02:00
Laurent Destailleur	747c49862c	Try to solve a flush pb	2015-09-30 19:15:45 +02:00
Laurent Destailleur	7037679718	FIX When update a member login for a member linked to a user, the login ... of user was not sync (not updated).	2015-09-30 19:15:09 +02:00
Raphaël Doursenaud	f0466ba313	FIX #3607 Better categories setting and unsetting ... This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.	2015-09-30 18:47:02 +02:00
Florian HENRY	a96b92a618	FIX : Email selector contact must not include inactive contact	2015-09-30 14:06:45 +02:00
Laurent Destailleur	d59f62cd75	Sync transifex	2015-09-30 01:25:35 +02:00
Laurent Destailleur	673ce059e6	Fix locale for nl_BE must match netherland language	2015-09-29 23:55:38 +02:00
Florian HENRY	e209fb23a2	FIX : Admin fiche inter page do not take good action	2015-09-29 18:27:39 +02:00
Florian HENRY	fecd213bb8	FIX: display error on extrafields on ficheinter	2015-09-29 16:57:05 +02:00
Laurent Destailleur	1108656d19	NEW Can set color of the highlight hover line	2015-09-29 15:58:24 +02:00
Florian HENRY	bb0de1dcad	FIX : update2.php test res befre assign it	2015-09-29 15:00:11 +02:00
Laurent Destailleur	1851310bbe	NEW Add cancel button on thirdparty create page	2015-09-29 14:31:55 +02:00
Laurent Destailleur	60c6510fc1	NEW Can set default value of event type when creating an event (if type ... of event option is used).	2015-09-29 14:17:03 +02:00
Florian HENRY	766b8535ae	spacing	2015-09-29 09:47:23 +02:00
Florian HENRY	4f5e207f08	review	2015-09-29 09:45:04 +02:00
Laurent Destailleur	c05df2ab7e	FIX Wizard for restore does not show import command	2015-09-29 09:11:13 +02:00
fmarcet	a585698b69	FIX: Only are showing one object linked	2015-09-29 08:49:11 +02:00
arnaud	0b7305d21a	FIX facturestat bad sql when customer view is limited	2015-09-28 16:55:34 +02:00
Alexis ALGOUD	453ed8a05e	FIX error in SQL due to a previous fix	2015-09-28 15:36:27 +02:00
Florian HENRY	0f27edad5d	FIX : When delete actioncomm also delete actioncomm_resources	2015-09-28 10:14:19 +02:00
Marcos García de La Fuente	188489c8ef	FIX #3572 Impossible to attach project in order ... Added missing file of commit 65d3f79 Close #3572	2015-09-27 21:52:44 +02:00
Laurent Destailleur	3f506552e3	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/theme/md_exp/style.css.php	2015-09-27 21:29:16 +02:00
Laurent Destailleur	fa9103fc97	FIX Bad title line in project view when using jmobile	2015-09-27 16:50:47 +02:00
Laurent Destailleur	1e2d06bcd1	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-27 16:02:44 +02:00
Laurent Destailleur	ff5f823bef	FIX not responsive part for project page	2015-09-27 16:01:57 +02:00
aspangaro	0b266a8ee5	Fix : remove viewport for mobile device already declared	2015-09-27 14:15:09 +02:00
Grand Philippe	6f128907fe	fix : Missing argument 1 for CommonDocGenerator::__construct()	2015-09-27 11:30:23 +02:00
philippe	1454d942ef	missing translation	2015-09-27 11:06:45 +02:00
Laurent Destailleur	3381d8efdd	Work on css	2015-09-27 01:59:48 +02:00
Laurent Destailleur	e1b969cb90	FIX Init into bad var	2015-09-26 16:52:58 +02:00
Laurent Destailleur	a097938ce5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-26 16:52:09 +02:00
Laurent Destailleur	f0d39a6a92	FIX Init into bad var	2015-09-26 16:51:51 +02:00
Laurent Destailleur	6aa13d4189	Fix the $colorbackvmenu2 was removed with 3.8	2015-09-26 16:34:43 +02:00
All-3kcis	e17b3529ab	Correct error	2015-09-26 15:12:32 +02:00
Alexis Algoud	688d6e37e2	FIX there is no way to hide or change qty to useful information by module	2015-09-26 14:42:26 +02:00
Laurent Destailleur	d119e04963	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-26 14:17:02 +02:00
Laurent Destailleur	9ecc8e5e6b	FIX Regression on bad use of fk_account showing the bad bank account on ... PDF.	2015-09-26 14:11:39 +02:00
Laurent Destailleur	dd88a799fb	FIX Event from ical stream should not be movable into calendar view	2015-09-26 13:54:50 +02:00
Laurent Destailleur	c707c899c1	Fix remove warning	2015-09-26 13:22:05 +02:00
Laurent Destailleur	fef8203e65	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-26 12:01:58 +02:00
Laurent Destailleur	a3647bea4e	Fix bad information in report	2015-09-26 11:53:36 +02:00
Laurent Destailleur	62792c08eb	Merge pull request #3591 from GPCsolutions/inherited ... [Qual] Cleanup of inherited class properties	2015-09-26 11:23:59 +02:00
Laurent Destailleur	5a2dc88d42	Merge pull request #3610 from defrance/patch-80 ... 3.8 bad filtering caused by statut filter #3580	2015-09-26 11:20:54 +02:00
Laurent Destailleur	b99ef6b27c	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-26 11:05:12 +02:00
Laurent Destailleur	4e77a651d4	Merge pull request #3600 from fmarcet/3.8 ... FIX #3599 Not saving legal form	2015-09-26 11:05:02 +02:00
Laurent Destailleur	9644e242ae	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-26 11:04:32 +02:00
Laurent Destailleur	5f765419ea	Fix because project module introduced opportunity, user may create ... project (opportunity) even when thirdparty does not exists yet, so we must provide a solution for this.	2015-09-26 11:04:17 +02:00
Laurent Destailleur	f3ba115ef0	Fix missing default value	2015-09-26 10:53:59 +02:00
Juanjo Menent	4fa1be0e35	Issue #3509: Init works	2015-09-26 10:37:36 +02:00
Laurent Destailleur	7424b521ed	Merge pull request #3609 from aspangaro/3.8-20 ... Fix centering on login page	2015-09-26 10:30:24 +02:00
BENKE Charlie	8dcd6158e3	3.8 bad filtering caused by statut filter #3580 ... correction ported on 3.8 too, sorry for the bad step process	2015-09-26 10:15:42 +02:00
Juanjo Menent	f14c806439	Merge branch 'develop' into dolibarr-3509 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-26 09:03:50 +02:00
Juanjo Menent	b8bf21b905	Merge pull request #3582 from grandoc/3.8 ... FIX: order ref must not be translated	2015-09-26 08:54:25 +02:00
Juanjo Menent	ad1a4c7e15	Merge pull request #3598 from GPCsolutions/formconfirm ... [Qual] Replaced deprecated form_confirm()	2015-09-26 08:48:16 +02:00
Juanjo Menent	d503dd928b	Merge pull request #3597 from GPCsolutions/displaymargin ... [Qual] Replaced deprecated displayMarginInfos()	2015-09-26 08:47:55 +02:00
Juanjo Menent	a046bcfc9b	Merge pull request #3596 from GPCsolutions/linkedobject ... [Qual] Fixed typo and added hinting	2015-09-26 08:47:19 +02:00
Juanjo Menent	2fc0852492	Merge pull request #3594 from GPCsolutions/select_color ... [Qual] Replaced deprecated select_color()	2015-09-26 08:45:24 +02:00
Juanjo Menent	40425d427d	Merge pull request #3593 from GPCsolutions/deprecatedclasses ... [Qual] Constructors of deprecated classes are deprecated	2015-09-26 08:45:03 +02:00
Juanjo Menent	c726afe3bc	Merge pull request #3592 from GPCsolutions/select_users ... [Qual] Replaced deprecated select_users()	2015-09-26 08:44:34 +02:00
Juanjo Menent	ef161e356e	Merge pull request #3590 from GPCsolutions/json ... [Qual] Replaced deprecated dol_json_*()	2015-09-26 08:42:13 +02:00
Juanjo Menent	dd19029279	Merge pull request #3589 from GPCsolutions/moduletabs ... [Qual] Warning on deprecated number of values	2015-09-26 08:41:33 +02:00
Juanjo Menent	4f187d3413	Merge pull request #3588 from GPCsolutions/microtime ... [Qual] Replaced deprecated dol_microtime_float()	2015-09-26 08:40:52 +02:00
Juanjo Menent	6999ad0a4f	Merge pull request #3587 from GPCsolutions/fiche_titre ... [Qual] Replaced deprecated function calls.	2015-09-26 08:39:22 +02:00
Juanjo Menent	005ead8db4	Merge pull request #3586 from GPCsolutions/deprecatedcss ... [Qual] Removed unused deprecated fields	2015-09-26 08:34:10 +02:00
Juanjo Menent	93c0adf725	Merge pull request #3583 from GPCsolutions/clone ... [Qual] Replaced deprecated dol_clone by native clone	2015-09-26 08:33:48 +02:00
Juanjo Menent	7bdb5ec86e	Merge pull request #3580 from defrance/patch-80 ... fix issue #3579 : bad filtering caused by statut filter	2015-09-26 08:31:24 +02:00
Juanjo Menent	99a945882d	Merge pull request #3576 from aspangaro/develop-67 ... New : Salaries - Add info card / add field datec / rename field user_creat to user_author	2015-09-26 08:29:13 +02:00
aspangaro	df0e64eb7c	Fix centering on login page	2015-09-26 07:59:06 +02:00
All-3kcis	2a84afeee4	fix dangerous sql injection #3327	2015-09-25 16:31:55 +02:00
Laurent Destailleur	9d0cd148a8	Fix duplicate log	2015-09-25 11:47:24 +02:00
Laurent Destailleur	dcf3c00023	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-25 11:28:59 +02:00
Laurent Destailleur	c0433928c6	FIX sortder field was missing so manually added values were moved to ... begin.	2015-09-25 11:28:49 +02:00
fmarcet	b5b90d1639	FIX #3599 Not saving legal form	2015-09-25 08:50:00 +02:00
Raphaël Doursenaud	485c369d55	[Qual] Replaced deprecated form_confirm()	2015-09-24 21:10:35 +02:00
Raphaël Doursenaud	50edf63448	[Qual] Replaced deprecated displayMarginInfos()	2015-09-24 21:05:58 +02:00
Raphaël Doursenaud	57f05e850a	[Qual] Fixed typo and added hinting	2015-09-24 20:56:50 +02:00
Raphaël Doursenaud	c0570a7f84	[Qual] Replaced deprecated select_color()	2015-09-24 20:40:40 +02:00
Raphaël Doursenaud	5f5ef43e04	[Qual] Constructors of deprecated classes are deprecated ... This gives better deprecation hinting.	2015-09-24 20:35:59 +02:00
Raphaël Doursenaud	b0b552c378	[Qual] Replaced deprecated select_users()	2015-09-24 20:32:35 +02:00
Raphaël Doursenaud	67ddb6c94e	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
Raphaël Doursenaud	85c34af019	[Qual] Replaced deprecated dol_json_*()	2015-09-24 18:57:05 +02:00
Raphaël Doursenaud	bbaa76fab1	[Qual] Warning on deprecated number of values ... Module tabs declarations now uses 6 values including permissions.	2015-09-24 18:47:43 +02:00
Raphaël Doursenaud	65340667b6	[Qual] Replaced deprecated dol_microtime_float()	2015-09-24 18:42:35 +02:00
Laurent Destailleur	3ee5920947	Merge pull request #3571 from fmarcet/3.8 ... FIX: When filter with empty status, by default get canceled status (-1)	2015-09-24 18:40:06 +02:00
Raphaël Doursenaud	631ee83745	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00
Raphaël Doursenaud	dabfad1529	[Qual] Replaced deprecated print_titre()	2015-09-24 18:27:13 +02:00
Raphaël Doursenaud	3feffdb84f	[Qual] Removed unused deprecated fields	2015-09-24 17:50:39 +02:00
Raphaël Doursenaud	9f2545b95d	[Qual] Replaced deprecated dol_clone by native clone	2015-09-24 17:24:40 +02:00
BENKE Charlie	b821878293	change > 0 by >= 0 as mentionned by raphael	2015-09-24 16:53:44 +02:00
philippe	9e185eec75	FIX: order ref must not be translated	2015-09-24 15:29:17 +02:00
BENKE Charlie	d30d91b165	fix issue #3579 : bad filtering caused by statut filter	2015-09-24 08:42:39 +02:00
Juanjo Menent	5dc78a337d	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509	2015-09-23 22:49:23 +02:00
Juanjo Menent	342e3413db	Issue 3509: Init works	2015-09-23 22:48:48 +02:00
aspangaro	9b97e31a09	Merge remote-tracking branch 'Upstream/develop' into develop-67	2015-09-23 21:09:28 +02:00
Laurent Destailleur	95daf14725	Merge branch 'patch-73' of https://github.com/defrance/dolibarr into ... defrance-patch-73 Conflicts: htdocs/core/lib/functions.lib.php	2015-09-23 19:21:59 +02:00
Laurent Destailleur	94c485ef85	Merge pull request #3547 from GPCsolutions/mysqlerrhandling ... Used OOP for mysqli connector	2015-09-23 18:32:35 +02:00
Laurent Destailleur	f8f1f4fd2b	Merge branch 'patch-2' of https://github.com/AlainRnet/dolibarr into ... AlainRnet-patch-2 Conflicts: htdocs/categories/categorie.php	2015-09-23 18:29:56 +02:00
tysauron	f3a28682ea	For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE	2015-09-23 18:26:50 +02:00
phf	b222800012	FIX clone customer order create new order with validate ref and not with PROV	2015-09-23 15:14:08 +02:00
Florian HENRY	206d6d0f7e	FIX : avoid SQL error in getValueFrom common object when all params are ... not send	2015-09-23 13:17:58 +02:00
Florian HENRY	84fa92045c	FIX : avoid SQL error when no sortfield send to method	2015-09-23 12:10:38 +02:00
Alexis Algoud	2d35124c71	FIX no need to remove file into mail form, the temp dir will be deleted after any sending	2015-09-23 11:11:19 +02:00
Laurent Destailleur	12a08ae4e1	Prepare 3.8.1	2015-09-23 10:25:06 +02:00
fmarcet	3ff8b3e437	FIX: Error retrieving customer prices	2015-09-23 10:23:29 +02:00
fmarcet	8309ed5c12	FIX: When filter with empty status, by default get canceled status (-1)	2015-09-23 09:24:49 +02:00
aspangaro	918c323f8f	Salaries : Add info card / add field datec / rename field user_creat to user_author	2015-09-23 06:37:14 +02:00
aspangaro	74e46b2de3	Salaries : Add label for accessibility	2015-09-23 05:47:49 +02:00
tysauron	f8f50b3071	For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE	2015-09-23 01:24:30 +02:00
Laurent Destailleur	a70e73a963	FIX Missing validate button if permission are not valid.	2015-09-23 01:08:23 +02:00
Laurent Destailleur	f81df66564	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/.gitignore htdocs/categories/edit.php	2015-09-23 00:34:57 +02:00
tysauron	f1ab0d36c5	Chmod new file not old file	2015-09-23 00:32:30 +02:00
Laurent Destailleur	33f1dfd6f0	Merge pull request #3568 from tysauron/patch-4 ... Chmod new file not old file	2015-09-23 00:31:52 +02:00
Laurent Destailleur	e62bb4da13	Make parameter required	2015-09-23 00:09:32 +02:00
Laurent Destailleur	00b858e644	Merge pull request #3564 from FHenry/3.8 ... FIX : remove twice same test	2015-09-23 00:07:28 +02:00
Laurent Destailleur	dc89e6c516	Merge pull request #3557 from hregis/3.8 ... Fix: use get instead getJSON for avoid freezing	2015-09-22 23:56:36 +02:00
tysauron	2d237cadc9	Chmod new file not old file	2015-09-22 22:37:31 +02:00
Laurent Destailleur	077c696c09	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/.gitignore htdocs/theme/.gitignore	2015-09-22 16:28:34 +02:00
Laurent Destailleur	90b78702e5	Update ignore to secure packaging	2015-09-22 16:23:51 +02:00
Laurent Destailleur	72d7671a1e	Enhance CSS	2015-09-22 16:21:46 +02:00
Laurent Destailleur	c125ba0d66	Update ignore to secure ... Conflicts: htdocs/.gitignore	2015-09-22 15:42:59 +02:00
Laurent Destailleur	75daddbbe2	Update ignore to secure	2015-09-22 15:40:49 +02:00
Laurent Destailleur	2ce43dc0d8	Update ignore to secure	2015-09-22 15:40:17 +02:00
Laurent Destailleur	9acc75ac12	Test if Zend OPCache is installed	2015-09-22 14:23:24 +02:00
Laurent Destailleur	da6a1d6629	NEW Introduce a method getDefaultCreateValueForField for developers to ... get a default value to use for a form in create mode. Implement it for public and private notes.	2015-09-22 13:55:31 +02:00
Florian HENRY	178208918f	FIX : remove twice same test	2015-09-22 12:03:11 +02:00
Laurent Destailleur	c2bdd9b465	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-22 11:29:49 +02:00
Laurent Destailleur	fe6af7d8eb	FIX Description of tags was mandatory in edit mode but not in create ... mode. Should not be mandatory.	2015-09-22 11:29:26 +02:00
Laurent Destailleur	ee683049a6	Enhance CSS capabilities	2015-09-22 11:24:31 +02:00
AlainRnet	30bfb0eee3	Update categorie.php ... voir https://github.com/Dolibarr/dolibarr/pull/3562	2015-09-22 09:40:13 +02:00
Laurent Destailleur	23f6464999	Work on CSS	2015-09-22 01:25:06 +02:00
Laurent Destailleur	30703e184c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-21 17:28:32 +02:00
Laurent Destailleur	58a734cb17	Firstname only on login	2015-09-21 17:28:11 +02:00
Laurent Destailleur	d8c01a63f2	Merge pull request #3540 from AlainRnet/patch-1 ... Update categorie.php	2015-09-21 15:46:43 +02:00
Laurent Destailleur	fd90ac517f	Add ignore file	2015-09-21 15:43:37 +02:00
Laurent Destailleur	c0ef8baa9d	A better error message	2015-09-21 15:38:17 +02:00
Laurent Destailleur	2df47ff99c	Better responsive top menu	2015-09-21 15:18:29 +02:00
Laurent Destailleur	f2e2edbc64	FIX not closing CSS.	2015-09-21 15:10:52 +02:00
Laurent Destailleur	7d4a9b17b6	FIX Creation of tables or keys must not be done with a random order.	2015-09-21 14:00:02 +02:00
Raphaël Doursenaud	d9acf32861	Fix Do not always append htdocs to include path ... Serving the htdocs directly is a best practice. The old code generates a bogus include path in that case. This code mitigates the issue by setting an include path only when needed.	2015-09-21 09:47:25 +02:00
Regis Houssin	de04f3022c	Fix: use get instead getJSON for avoid freezing	2015-09-20 09:05:52 +02:00
aspangaro	49f671eb1d	Correct name	2015-09-19 07:24:32 +02:00
aspangaro	1901b2fb3b	Missing translations in checks deposits exports	2015-09-19 07:15:13 +02:00
Laurent Destailleur	bf85caade6	Move a file that is not an external lib	2015-09-18 21:53:35 +02:00
Laurent Destailleur	0821f18712	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-18 21:50:10 +02:00
Laurent Destailleur	397e409b9a	Merge pull request #3543 from GPCsolutions/firephp ... Installed FirePHP with composer	2015-09-18 20:53:27 +02:00
Laurent Destailleur	8332609d06	Merge pull request #3539 from All-3kcis/develop-patch-6 ... FIX #3524	2015-09-18 20:49:27 +02:00
Laurent Destailleur	e85ddbb470	Merge pull request #3537 from GPCsolutions/3.8-3533 ... FIX #3533 Load categories language	2015-09-18 20:48:58 +02:00
Laurent Destailleur	9658da5b7c	Merge pull request #3549 from aternatik/api_rest_fix_composer ... FIX #3548 : API not working after removing Composer	2015-09-18 20:46:16 +02:00
Laurent Destailleur	378da082bd	Fix selector or margin with jmobile	2015-09-18 20:43:10 +02:00
Laurent Destailleur	5f507cbbd8	Fix missing closing div making jmobile crazy	2015-09-18 20:23:06 +02:00
Laurent Destailleur	8699776930	Better usability with dolidroid	2015-09-18 16:17:52 +02:00
Laurent Destailleur	e974b07b09	Fix javascript error	2015-09-18 16:05:38 +02:00
Laurent Destailleur	f72f652d98	FIX Pb into pagination scroll widget ... FIX Style of previous-next card when using dolidroid	2015-09-18 15:51:27 +02:00
Laurent Destailleur	14b6a74b2d	Fix javascript error on POS	2015-09-18 14:13:15 +02:00
Laurent Destailleur	3eb8d3105a	NEW Better look for POS. More responsive design.	2015-09-18 14:11:50 +02:00
Laurent Destailleur	fd8afdf098	Fix javascript error on POS	2015-09-18 14:11:06 +02:00
Laurent Destailleur	872b59f568	NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to ... enter pdf footer text with wysiwyg editor.	2015-09-18 12:34:36 +02:00
Laurent Destailleur	a4ab5f5552	Restore manual install of ckeditor. It seems upgrade with phpcomposer ... make some plugins not working.	2015-09-18 12:10:47 +02:00
Laurent Destailleur	9d7a77f2e5	Doc comment	2015-09-18 12:03:35 +02:00
Laurent Destailleur	f01b9c09a3	Removed duplicate code. Use inheritance instead.	2015-09-18 10:36:23 +02:00
AlainRnet	8dd843ab8f	Update categorie.php ... voir https://github.com/Dolibarr/dolibarr/pull/3540/files (je n'avais pas vu dans quelle branche j'étais)	2015-09-17 23:23:18 +02:00
jfefe	bf4fe91197	FIX #3548 : API not working after removing Composer	2015-09-17 20:48:57 +02:00
Raphaël Doursenaud	148e8a2c23	Used OOP for mysqli connector ... Better error handling Slightly more readable codebase	2015-09-17 20:39:48 +02:00
Laurent Destailleur	4195eb3366	NEW Color category is visible onto the thumb of tags on thirdparty, or ... products cards.	2015-09-17 20:20:03 +02:00
Laurent Destailleur	c8e0839296	NEW Add color on categories	2015-09-17 20:00:54 +02:00
Laurent Destailleur	27b1f2ecc6	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-17 19:52:13 +02:00
Laurent Destailleur	81b447dd0f	NEW Add color on categories	2015-09-17 19:51:56 +02:00
Laurent Destailleur	57521f628c	Fix bad path	2015-09-17 19:35:03 +02:00
Laurent Destailleur	b1168d223a	NEW Introduce table llx_overwrite_trans to be able to overwrite ... translations by simple database edition.	2015-09-17 18:44:42 +02:00
Raphaël Doursenaud	2cf0f240b9	Installed FirePHP with composer	2015-09-17 16:08:00 +02:00
Laurent Destailleur	8ff41a8ded	Enhance performance of option MAIN_OVERWRITE_TRANS_	2015-09-17 15:35:51 +02:00
AlainRnet	f8f24f7b29	Update categorie.php ... la navigation entre membre depuis sa catégorie ne fonctionne pas sans ajouter "&type=3" à l'URL	2015-09-17 10:35:18 +02:00
All-3kcis	31266b3c11	FIX #3524 ... (Fatal error: Call to undefined function getRandomPassword() in /htdocs/user/card.php on line 846)	2015-09-17 10:00:32 +02:00
Laurent Destailleur	099e3f0376	FIX Removed warnings	2015-09-17 00:47:56 +02:00
Laurent Destailleur	9cbd236c8c	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/filefunc.inc.php	2015-09-16 22:09:21 +02:00
Laurent Destailleur	313d9ddacd	FIX #3534	2015-09-16 22:04:03 +02:00
Raphaël Doursenaud	6ffdbf91ec	FIX #3533 Load categories language	2015-09-16 21:35:20 +02:00
Laurent Destailleur	7d8013b371	FIX #3533	2015-09-16 21:34:01 +02:00
Laurent Destailleur	38bae655ea	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 ... Conflicts: htdocs/core/class/html.form.class.php	2015-09-16 21:24:51 +02:00
Laurent Destailleur	e36928fd65	FIX #3529	2015-09-16 21:23:52 +02:00
Laurent Destailleur	7f60abdf7b	FIX #3524	2015-09-16 21:05:02 +02:00
Marcos García de La Fuente	3818bff86a	Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address	2015-09-16 12:49:05 +02:00
Marcos García de La Fuente	e80f29c271	Fix: [ bug 1794 ] - Error when cloning Proposal gives error in a malformed page	2015-09-16 12:47:13 +02:00
Florian HENRY	8fd9d2a7ce	FIX : #3530	2015-09-16 10:21:32 +02:00
Laurent Destailleur	813667e564	Debug swith of ckeditor theme	2015-09-15 17:45:40 +02:00
Laurent Destailleur	1b836dc31e	Merge pull request #3408 from aspangaro/develop-60 ... New: CkEditor add possibility to choose skin	2015-09-15 17:09:11 +02:00
Juanjo Menent	7b8096d367	Merge pull request #3523 from defrance/patch-78 ... fix error on tabcollectors and enhance	2015-09-15 15:16:14 +02:00
Florian HENRY	a0fb27bd80	FIX : Can create Proposal on close thridparty #3526	2015-09-15 14:34:49 +02:00
aspangaro	5b57231c52	Fix : error skin name by default	2015-09-15 06:14:33 +02:00
BENKE Charlie	95cfce925f	fix error on tabcollectors and enhance ... fix error on tabcollectors feature add number of tabs present in tab collectors	2015-09-15 03:33:27 +02:00
aspangaro	2d2f59fe3f	Fix : Class 'Categorie' not found in core\class\html.form.class.php	2015-09-14 22:33:48 +02:00
Laurent Destailleur	d985c77eca	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-09-14 18:36:08 +02:00
Laurent Destailleur	e0a88fabd9	FIX #3521	2015-09-14 17:54:53 +02:00
Laurent Destailleur	36beb289f3	Merge pull request #3520 from aspangaro/3.8-18 ... Fix #3225 Missing translations in interventions	2015-09-14 17:24:42 +02:00
Laurent Destailleur	ca2b66ffb3	Merge pull request #3519 from aspangaro/3.8-17 ... Fix #3227 #3226 Missing translations in supplier exports	2015-09-14 17:24:22 +02:00
Laurent Destailleur	c75f62ddb7	FIX icon into export profile may be not correctly output	2015-09-14 12:12:14 +02:00
Laurent Destailleur	b4c964760d	Sync transifex	2015-09-13 23:25:55 +02:00
Laurent Destailleur	3b01b8cb47	Fix security hole	2015-09-13 22:50:08 +02:00
aspangaro	334766d194	Fix #3225 Missing translations in interventions	2015-09-13 22:03:54 +02:00
aspangaro	27a85c074e	Merge remote-tracking branch 'origin/3.8-18' into 3.8-17	2015-09-13 21:45:32 +02:00
aspangaro	1d4c747aa2	Fix #3227 #3226 Missing translations in supplier exports	2015-09-13 21:44:59 +02:00
Laurent Destailleur	4eedec0274	Fix tool to generate filecheck	2015-09-13 20:25:33 +02:00
Laurent Destailleur	7c030a114d	Release 3.8.0	2015-09-13 19:26:20 +02:00
Laurent Destailleur	0ef297582b	Merge pull request #3511 from marcosgdf/bug-3423 ... FIX #3423 Not possible update values of extrafields in Facture	2015-09-13 19:07:15 +02:00
aspangaro	a805cb9374	Fix: ER payments are on the bank credit	2015-09-13 16:33:02 +02:00
Juanjo Menent	339b558b6b	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-13 00:31:21 +02:00
Juanjo Menent	ba3d8f445c	Fix #3514 More elegant	2015-09-13 00:25:32 +02:00
Juanjo Menent	744e5375d2	Fix #3514 Bug: Error when trying to add a product to a non-existing object	2015-09-13 00:09:32 +02:00
Juanjo Menent	3db03ed558	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-12 23:45:16 +02:00
Juanjo Menent	1deb77896f	Fix #3515 Bug: Creating an invoice from a shipment links to wrong customer order	2015-09-12 23:42:48 +02:00
Laurent Destailleur	b94fb9e1f3	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-12 18:22:10 +02:00
Laurent Destailleur	9aec4d554b	Fix #3215 [User card] [Contact card] [Member card] Error in LDAP tab	2015-09-12 18:21:37 +02:00
Laurent Destailleur	db3c544e21	Fix #3240 [Supplier orders] Dashboard links to unuseful page	2015-09-12 18:14:08 +02:00
Laurent Destailleur	aa1661d64c	Fix #3413 Translation of ExpireDate	2015-09-12 18:09:47 +02:00
Laurent Destailleur	67b7345e83	Fix the feature to log a cheque as returned. ... Fix duplicate parameter mainmenu and leftmenu into url	2015-09-12 18:00:19 +02:00
Marcos García de La Fuente	637855485e	FIX #3423 Not possible update values of extrafields in Facture ... Close #3423	2015-09-12 17:28:32 +02:00
Laurent Destailleur	94723a9b83	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/langs/en_US/accountancy.lang	2015-09-12 15:23:02 +02:00
Laurent Destailleur	97096536b1	Fix #2526 The filter on type numeric is ok now. Sometimes we used ... "Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve bug and added a warning in log if an unknow value is still used in code.	2015-09-12 15:20:55 +02:00
Laurent Destailleur	a5c6582bc1	Fix duplicate translation/encoding on setEventMessage ... Conflicts: htdocs/ftp/index.php	2015-09-12 12:55:20 +02:00
Laurent Destailleur	c785f8cfb1	Fix duplicate translation/encoding on setEventMessage	2015-09-12 12:52:07 +02:00
Laurent Destailleur	1966d75ced	FIX #3490	2015-09-12 12:50:55 +02:00
Laurent Destailleur	db1d9d6d8e	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/fourn/commande/dispatch.php	2015-09-12 11:50:46 +02:00
Laurent Destailleur	0c3ebe63c2	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/fourn/commande/dispatch.php htdocs/product/class/html.formproduct.class.php htdocs/product/stock/index.php htdocs/product/stock/liste.php htdocs/product/stock/mouvement.php htdocs/product/stock/product.php htdocs/product/stock/valo.php	2015-09-12 11:44:07 +02:00
Laurent Destailleur	86b1a9cbce	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-09-12 11:38:25 +02:00
Laurent Destailleur	36632593c0	Fix SQL injections #3300	2015-09-12 11:36:19 +02:00
Laurent Destailleur	0bfccc7255	Fix print into form to attach file must be into return.	2015-09-12 11:35:56 +02:00
Laurent Destailleur	309e1604e1	Fix migration missing for leave request module ... Fix permission label for expense report and leave request	2015-09-12 11:35:49 +02:00
Laurent Destailleur	24a216b154	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-12 11:33:49 +02:00
Laurent Destailleur	06d19a5a40	Work on a new widget	2015-09-12 11:33:22 +02:00
Laurent Destailleur	5bc74ad6ea	Fix SQL injections #3300	2015-09-12 11:23:44 +02:00
Laurent Destailleur	a83b3ae7e8	Merge pull request #3503 from fappels/3.7-dispatch-rounding ... Fix #3471 3.7 Rounding issue when dispatching non-integer	2015-09-12 11:07:16 +02:00
Laurent Destailleur	5e81eb7586	Merge pull request #3505 from GPCsolutions/firephp ... Setup FirePHP like ChromePHP	2015-09-12 11:02:31 +02:00
Laurent Destailleur	ff1b18ff46	Merge pull request #3501 from FHenry/develop ... NEW : Import link between thirdparties and sales representatives	2015-09-12 11:01:04 +02:00
Maxime Kohlhaas	c6081f0fa2	Fix multientity stock management (F.Henry followup)	2015-09-11 20:38:32 +02:00
Raphaël Doursenaud	fc91e553ad	Setup FirePHP like ChromePHP	2015-09-11 17:45:30 +02:00
Laurent Destailleur	1401debace	Fix print into form to attach file must be into return.	2015-09-11 08:32:40 +02:00
Laurent Destailleur	4b97fae28f	Fix migration missing for leave request module ... Fix permission label for expense report and leave request	2015-09-11 07:52:06 +02:00
fappels	c290840513	Revert "Fix delete not used empty stock record" ... This reverts commit 1d85529eda.	2015-09-10 23:31:23 +02:00
fappels	75a14e02d8	Fix #3471 3.7 Rounding issue when dispatching non-integer	2015-09-10 23:29:13 +02:00
fappels	8bdfdc0127	Fix #3471 3.5 Rounding issue when dispatching non-integer	2015-09-10 23:12:27 +02:00
fappels	a294700cef	fix dispatch rounding version 1	2015-09-10 22:16:03 +02:00
Laurent Destailleur	7951483c5f	Fix: examples ko for import ... Fix bad picto for export	2015-09-10 12:47:25 +02:00
Laurent Destailleur	1396ed8f03	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-10 12:12:55 +02:00
Florian HENRY	a49f88c259	reveiw thirdparty list and add column and filter on country and typeent	2015-09-10 11:55:05 +02:00
Florian HENRY	6cb993c0b4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-10 11:20:03 +02:00
aspangaro	0055606256	Invert	2015-09-10 07:36:17 +02:00
aspangaro	3a90bfa6d3	Merge remote-tracking branch 'Upstream/develop' into develop-60	2015-09-10 06:59:23 +02:00
aspangaro	b1b7966c88	ckeditor: define the default skin when constant don't exist.	2015-09-10 06:58:20 +02:00
Laurent Destailleur	1ad2aeaf2a	Removed baf cut and paste	2015-09-10 01:28:39 +02:00
Laurent Destailleur	a4d0e50175	Merge pull request #3489 from AlainRnet/patch-1 ... Update lines.php	2015-09-10 01:23:13 +02:00
Laurent Destailleur	5c0d90ae97	Merge pull request #3497 from aspangaro/develop-RefundVAT ... New: refund VAT - Thanks to icfr for jquery part !	2015-09-10 01:17:06 +02:00
Guido Schratzer	702edac00a	FIX: issue #3425 missing Profid keys in companies.lang ... for Austria issue #3425	2015-09-09 22:16:03 +02:00
aspangaro	15e50ecdb3	Update work	2015-09-09 21:35:41 +02:00
aspangaro	ae6f547ba5	Merge remote-tracking branch 'Upstream/develop' into develop-62	2015-09-09 20:57:28 +02:00
Laurent Destailleur	41803cd868	Merge pull request #3470 from GPCsolutions/develop-3440 ... Fix #3440 Only search for core modules in main path	2015-09-09 20:53:25 +02:00
Laurent Destailleur	2234d95a7b	Merge pull request #3481 from grandoc/develop ... translations missing	2015-09-09 20:52:36 +02:00
Laurent Destailleur	615734012e	Merge pull request #3476 from marcosgdf/refactor ... Refactor: Created hasDelay functions	2015-09-09 20:50:58 +02:00
Laurent Destailleur	a726cd210b	Merge pull request #3483 from GPCsolutions/sentry ... Fix regression introduced by f3c71a9a5a	2015-09-09 20:10:01 +02:00
Laurent Destailleur	870267316b	Merge pull request #3484 from GPCsolutions/https ... Qual: Don't attempt HTTPS redirect if already using HTTPS	2015-09-09 20:09:38 +02:00
Juanjo Menent	70df553814	Merge pull request #3494 from FHenry/3.6 ... 3.6	2015-09-09 17:43:07 +02:00
Juanjo Menent	42ac326f07	Merge pull request #3477 from aspangaro/develop-64 ... New Accountancy Uniformize code & rename a constant	2015-09-09 17:38:12 +02:00
Laurent Destailleur	8c1760fbcf	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-09-09 13:26:35 +02:00
Laurent Destailleur	d3f1a7d5b8	FIX Bad condition into invoice export request making reporting too many ... rows.	2015-09-09 13:26:10 +02:00
Laurent Destailleur	7fd01d4aa3	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/paiement/cheque/class/remisecheque.class.php htdocs/product/class/html.formproduct.class.php htdocs/product/stock/index.php htdocs/product/stock/list.php htdocs/product/stock/mouvement.php htdocs/product/stock/product.php htdocs/product/stock/valo.php	2015-09-09 12:45:22 +02:00
Laurent Destailleur	3c91b8c890	Force to select "use personalized value" to select a personalized screen ... option.	2015-09-09 12:39:06 +02:00
Juanjo Menent	d0c2131b09	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-08 21:32:37 +02:00
Juanjo Menent	7d88405058	Fix #3475 RemiseCheque: Undefined variable $date	2015-09-08 21:31:04 +02:00
aspangaro	393d528be7	Merge remote-tracking branch 'Upstream/develop' into develop-64 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-08 21:17:54 +02:00
Juanjo Menent	c13d2d202b	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: ChangeLog htdocs/filefunc.inc.php	2015-09-08 21:08:59 +02:00
Juanjo Menent	355fcc78cf	Fix #3475 RemiseCheque: Undefined variable $date	2015-09-08 20:48:31 +02:00
Juanjo Menent	4b031e9e6a	Merge pull request #3473 from aspangaro/develop-63 ... New: Accountancy rename llx_accountingaccount in llx_accounting_account	2015-09-08 20:06:00 +02:00
Juanjo Menent	45a94b055a	Merge pull request #3488 from GPCsolutions/transifex ... Qual: Fixed translation strings	2015-09-08 19:55:56 +02:00
Juanjo Menent	0c447d7497	Merge pull request #3487 from GPCsolutions/unused ... Qual: removed unused translation token	2015-09-08 19:55:08 +02:00
Juanjo Menent	5d401f275c	Merge pull request #3486 from GPCsolutions/debug ... Qual: remove debug output	2015-09-08 19:54:42 +02:00
Florian HENRY	89b723b2a7	FIX : multientity warehouse management	2015-09-08 16:23:00 +02:00
Florian HENRY	63a817c3a4	Fix wahrehouse multientty management	2015-09-08 16:13:15 +02:00
Florian HENRY	52cb9581ff	Fix multientity stock management	2015-09-08 16:00:13 +02:00
BENKE Charlie	e2a738bf54	New fonction complete_elementList_with_modules ... if contactelement is defined on module definition, add module on definition type of contact	2015-09-08 13:11:26 +02:00
BENKE Charlie	b4a9a0cafb	Allow contact definition on additionnal modules ... If additionnal module use contactelement feature, the module is referenced on element list on contact type	2015-09-08 13:07:13 +02:00
Laurent Destailleur	24f7100562	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/lib/memory.lib.php	2015-09-08 10:33:33 +02:00
aspangaro	16585553c1	Merge remote-tracking branch 'Upstream/develop' into develop-64	2015-09-07 21:52:08 +02:00
aspangaro	46b0e259b1	Add constant in modAccounting.class.php	2015-09-07 21:51:48 +02:00
aspangaro	cf869f22b5	Merge remote-tracking branch 'Upstream/develop' into develop-63 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-07 21:45:13 +02:00
aspangaro	710e9327bf	Update works	2015-09-07 21:42:12 +02:00
Laurent Destailleur	82ad81fc03	Fix picto	2015-09-07 20:56:28 +02:00
Laurent Destailleur	9667b6a7c6	Solve conflict of var name	2015-09-07 20:22:44 +02:00
Laurent Destailleur	c9264fa1bc	Fix memcached effect was lost because init was done each time.	2015-09-07 20:19:37 +02:00
Laurent Destailleur	0a6451d72c	Fix memcached effect was lost because init was done each time.	2015-09-07 20:17:05 +02:00
Raphaël Doursenaud	e85c510b87	Qual: Fixed translation strings	2015-09-07 19:44:10 +02:00
Raphaël Doursenaud	3624ae0ec7	Qual: removed unused translation token	2015-09-07 19:16:44 +02:00
Raphaël Doursenaud	71b98ffc0e	Qual: remove debug output	2015-09-07 17:15:41 +02:00
philippe grand	706f62d8f2	better display for code	2015-09-07 17:02:53 +02:00
Raphaël Doursenaud	92c08c77fd	Qual: Don't attempt HTTPS redirect if already using HTTPS	2015-09-07 16:43:17 +02:00
Raphaël Doursenaud	1168f0b6ae	Fix regression introduced by f3c71a9a5a	2015-09-07 16:20:17 +02:00
philippe grand	ec21916d3b	translations missing	2015-09-07 15:55:26 +02:00
philippe grand	9532baf0e5	translations missing	2015-09-07 15:46:57 +02:00
philippe grand	887a4107a1	translations missing	2015-09-07 15:40:55 +02:00
philippe grand	3a6271e714	translations missing	2015-09-07 15:29:51 +02:00
Laurent Destailleur	53a9c93b90	Fix PHPCS	2015-09-07 15:16:43 +02:00
Laurent Destailleur	3ae19375cd	Merge pull request #3474 from aspangaro/3.8-16 ... Fix Problem with checked input when you edit a survey	2015-09-07 15:11:18 +02:00
Laurent Destailleur	5d285bf56d	Merge pull request #3478 from grandoc/develop ... translations missing	2015-09-07 15:09:31 +02:00
Laurent Destailleur	9cd5e7cafa	Fix some errors into code generator.	2015-09-07 15:03:38 +02:00
Laurent Destailleur	fe60927503	Fix button must appears if box selected	2015-09-07 13:30:02 +02:00
Laurent Destailleur	7f05e19e0d	Prepare 3.9	2015-09-07 13:24:52 +02:00
Laurent Destailleur	3333970eb4	Prepare 3.9	2015-09-07 13:23:51 +02:00
Laurent Destailleur	1b3db2ca41	NEW Add none/all selection into list of files for FTP browser module	2015-09-07 13:20:44 +02:00
philippe grand	ff3968b07f	translations missing	2015-09-07 12:46:49 +02:00
Laurent Destailleur	a44ab5168c	Save memory.	2015-09-07 12:43:25 +02:00
Laurent Destailleur	5ffab9720f	More complete connexion profile	2015-09-07 12:38:39 +02:00
Laurent Destailleur	28c62fb214	Introduce a function to return a warning by loggers.	2015-09-07 12:21:26 +02:00
Laurent Destailleur	f3c71a9a5a	Dolibarr must not contains autoload feature. ... The developer and user must decide which lib is used and it must not be a random feature that take a library "randomly" (first one found is same a randomly found). By default, library embedded of dolibarr must be used. If we want to use another one, an option to set the path of external libray must be available.	2015-09-07 12:09:42 +02:00
Laurent Destailleur	e85921c82f	Start to introduce sftp	2015-09-07 11:45:33 +02:00
aspangaro	5780d33f9b	Merge remote-tracking branch 'Upstream/develop' into develop-64 ... Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-09-06 22:00:52 +02:00
aspangaro	168b5a1125	Update language	2015-09-06 21:56:23 +02:00
aspangaro	671018c5cc	New Accountancy Uniformize code & rename a constant	2015-09-06 21:53:28 +02:00
Marcos García de La Fuente	3c8d02b865	Removed unused variable	2015-09-06 20:49:11 +02:00
Marcos García de La Fuente	2f85d02911	Added missing RemiseCheque properties	2015-09-06 19:24:17 +02:00
Marcos García de La Fuente	c58b5a5117	Created CommandeFournisseur::hasDelay function	2015-09-06 19:23:46 +02:00
Marcos García de La Fuente	9ce8024f1e	Merge remote-tracking branch 'upstream/develop' into refactor	2015-09-06 18:57:38 +02:00
Marcos García de La Fuente	47e62f2270	Created FactureFournisseur::hasDelay function	2015-09-06 18:47:26 +02:00
Marcos García de La Fuente	f1ea19e09b	Created ActionComm:hasDelay function	2015-09-06 18:26:48 +02:00
Laurent Destailleur	91ddca6ab0	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/tpl/objectline_edit.tpl.php	2015-09-06 16:34:40 +02:00
Laurent Destailleur	822d4d1b39	Fix remove log	2015-09-06 15:06:13 +02:00
Laurent Destailleur	aaa639a3ab	Fix error when mark rate is 100% and buying price is 0, no way to ... recalculate the unit price. Fix cancel button was disabled if mark rate was not valid Fix if mark rate is a number with space, does not hang.	2015-09-06 15:00:17 +02:00
Laurent Destailleur	7c2b6e7780	Fix error when mark rate is 100% and buying price is 0, no way to ... recalculate the unit price. Fix cancel button was disabled if mark rate was not valid Fix if mark rate is a number with space, does not hang.	2015-09-06 14:55:29 +02:00
Laurent Destailleur	0d811dce6a	Start to mutualize the builddoc and remove_file action.	2015-09-06 14:21:42 +02:00
Laurent Destailleur	77ef046af4	Start to mutualize the builddoc and remove_file action.	2015-09-06 14:02:21 +02:00
Laurent Destailleur	6c78b930d1	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-09-06 11:26:20 +02:00
aspangaro	e88d7076a6	Fix Problem with checked input when you edit a survey	2015-09-06 07:58:49 +02:00
aspangaro	1756862a65	Typo	2015-09-06 07:56:43 +02:00
aspangaro	a4a72d64c0	New: Accountancy Add message when general ledger is witten	2015-09-06 06:43:40 +02:00
aspangaro	b268ccf064	Fix #3455 In advanced accounting module, button transfer to general ledger don't work	2015-09-06 04:52:03 +02:00
Laurent Destailleur	8076ea85ea	3.6.4 was packaged	2015-09-05 20:07:17 +02:00
Laurent Destailleur	a21b015cbb	Fix XSS	2015-09-05 20:03:02 +02:00
Laurent Destailleur	389cb00164	Prepare code to mutualise buildodc and remove_file	2015-09-05 20:02:38 +02:00
Raphaël Doursenaud	0a9f4a41f3	Qual: Removed dead code	2015-09-05 12:37:43 +02:00
Raphaël Doursenaud	97f91d0ef9	Fix #3440 Only search core modules in main path ... Removed duplicated code and used common dolGetModulesDirs() function	2015-09-05 12:37:43 +02:00
Laurent Destailleur	873f33b8ab	Missing translation	2015-09-05 11:22:14 +02:00
Laurent Destailleur	1b9b0082ba	Merge pull request #3387 from defrance/patch-75 ... NEW: add intervention Aera	2015-09-05 11:19:37 +02:00
Marcos García de La Fuente	865489db75	Created Adherent::hasDelay function	2015-09-05 11:03:37 +02:00
Laurent Destailleur	d108881690	Merge pull request #3370 from atm-gauthier/new_add_next_ref_on_product_service_clone ... NEW : conf to use next product/service ref when we clone a product/se…	2015-09-05 10:57:11 +02:00
Marcos García de La Fuente	3c5159f497	Created Facture::hasDelay function	2015-09-05 10:56:13 +02:00
Laurent Destailleur	9cf6b824d0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-05 10:50:42 +02:00
Laurent Destailleur	6a9933d9af	Update doc	2015-09-05 10:49:55 +02:00
Marcos García de La Fuente	3fbab48d81	Created Commande::hasDelay function	2015-09-05 10:42:54 +02:00
Laurent Destailleur	c03d508bd3	Merge pull request #3467 from guerrierk/develop ... NEW Adding Document tab into Bank Account	2015-09-05 10:26:51 +02:00
Laurent Destailleur	087938e340	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/compta/bank/class/account.class.php	2015-09-05 10:25:01 +02:00
Laurent Destailleur	6ac4b8d0d4	Merge branch 'patch-2' of https://github.com/open-minds/dolibarr into open-minds-patch-2	2015-09-05 10:22:43 +02:00
Laurent Destailleur	4c0f117e55	Merge pull request #3465 from open-minds/patch-1 ... Fix detailed information of BBAN for Germany	2015-09-05 10:22:12 +02:00
Frédéric FRANCE	132a464df6	Update product.php	2015-09-05 08:57:01 +02:00
aspangaro	ef7df3f261	New: Accountancy rename llx_accountingaccount in llx_accounting_account ... Fix: language key	2015-09-05 08:03:06 +02:00
aspangaro	967a5b2a76	Merge remote-tracking branch 'Upstream/develop' into develop-62	2015-09-05 06:18:47 +02:00
aspangaro	f33cd85c04	New: refund VAT	2015-09-05 06:15:27 +02:00
Laurent Destailleur	304a71710e	Fix not complete info	2015-09-05 00:57:11 +02:00
Laurent Destailleur	51c5e01290	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-05 00:48:56 +02:00
Laurent Destailleur	7926fd8083	NEW ODT generators can set meta properties of ODT file	2015-09-05 00:47:06 +02:00
Laurent Destailleur	2a8ebcefcc	Merge pull request #3412 from gschratzer/develop ... NEW update actions_sendmails.inc.php files.inc.php	2015-09-04 23:38:01 +02:00
Laurent Destailleur	8bea703363	Fix deadlock feature. Can't reconciliate cash bank account. Sometimes ... users need. I introduce a hidden option to fix this quickly.	2015-09-04 23:23:39 +02:00
Laurent Destailleur	398e9bad94	Add ignore ... Conflicts: htdocs/.gitignore	2015-09-04 23:22:38 +02:00
GUERRIER Kevin	2395c1ca11	fix comment in file description	2015-09-04 21:58:09 +02:00
GUERRIER Kevin	a80b4703a9	Bugfix w/ Travis CI	2015-09-04 21:42:14 +02:00
GUERRIER Kevin	692fdbaec4	Adding Document tab into Bank Account	2015-09-04 21:29:16 +02:00
Juanjo Menent	ba0bf57707	Merge pull request #3353 from GPCsolutions/sentry ... NEW Sentry logging support	2015-09-04 20:10:27 +02:00
Juanjo Menent	7924a8704d	Merge pull request #3352 from GPCsolutions/dolibarr-3351 ... NEW Composer installed dependencies	2015-09-04 20:09:38 +02:00
Laurent Destailleur	a66bcf1965	Fix deadlock feature. Can't reconciliate cash bank account. Sometimes ... users need. I introduce a hidden option to fix this quickly.	2015-09-04 19:42:07 +02:00
Raphaël Doursenaud	a6ef289470	New Added client-side Sentry logging ... Using Raven.js allows logging client-side javascript errors to the configured Sentry server.	2015-09-04 19:10:46 +02:00
Raphaël Doursenaud	7ef5cbfb96	Updated raven-php to v0.12.1	2015-09-04 19:10:38 +02:00
Raphaël Doursenaud	7bb917e637	NEW Support logging to a Sentry server ... Sentry is an Open Source error logging and aggregation platform. It can be used on-premise or hosted at https://getsentry.com	2015-09-04 19:10:13 +02:00
Raphaël Doursenaud	3b5473abe4	NEW Syslog displays configuration errors	2015-09-04 19:10:04 +02:00
Raphaël Doursenaud	e5eefa685f	Add Raven client for Sentry	2015-09-04 19:09:55 +02:00
Raphaël Doursenaud	1ffb28a460	Fixed mobile detect classname without autoloader	2015-09-04 19:06:04 +02:00
Raphaël Doursenaud	e0312d048b	Install TCPDF from composer	2015-09-04 19:06:04 +02:00
Raphaël Doursenaud	321094ab42	Install Restler framework from composer	2015-09-04 19:06:02 +02:00
Raphaël Doursenaud	1b7ed43c60	Install PHPExcel from composer	2015-09-04 19:06:02 +02:00
Raphaël Doursenaud	0eb0f52b6d	Install mobiledetect from composer	2015-09-04 19:06:01 +02:00
Raphaël Doursenaud	7d934db183	Install CKEditor from composer	2015-09-04 19:06:01 +02:00
Raphaël Doursenaud	11402debbd	Install ChromePHP from composer	2015-09-04 19:06:00 +02:00
Laurent Destailleur	62a1d1c4a2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-04 18:35:32 +02:00
Laurent Destailleur	f992c2091f	Add ignore	2015-09-04 18:35:18 +02:00
Juanjo Menent	a720f30335	Merge pull request #3194 from defrance/patch-71 ... NEW add hook addMoreActionsButtons on adherent Card	2015-09-04 18:33:19 +02:00
Laurent Destailleur	3d6488d91e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-09-04 18:32:14 +02:00
Laurent Léonard	11241c51f5	Fix detailed information of BBAN for Belgium	2015-09-04 18:30:54 +02:00
Laurent Destailleur	55752610dc	Exclude dir	2015-09-04 18:27:25 +02:00
Juanjo Menent	81caf74360	Merge pull request #3464 from grandoc/develop ... NEW: : add doActions hook method call in contract card	2015-09-04 18:25:33 +02:00
Juanjo Menent	b3f3e57852	Merge remote-tracking branch 'origin/3.8' into develop	2015-09-04 18:24:18 +02:00
Juanjo Menent	de3f1b5559	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-09-04 18:23:33 +02:00
Juanjo Menent	ecf80249d1	Merge pull request #3454 from hregis/3.7_bug3 ... Fix: problem with pagination	2015-09-04 18:22:23 +02:00
Laurent Léonard	04b3c23692	Fix detailed information of BBAN for Germany	2015-09-04 18:16:43 +02:00
Juanjo Menent	0016f48fac	Merge pull request #3424 from atm-aurelien/3.7 ... FIX ref_supplier to object property on supplier ref change	2015-09-04 18:00:05 +02:00
Laurent Destailleur	dcaef54f9b	Fix can't disable a module that were removed.	2015-09-04 16:47:43 +02:00
Laurent Destailleur	9422b22edb	Fix translation	2015-09-04 00:12:45 +02:00
Laurent Destailleur	d19ec89bf1	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/modules/modHoliday.class.php htdocs/holiday/card.php	2015-09-03 23:27:47 +02:00
Laurent Destailleur	2e3d25c055	Merge pull request #3462 from grandoc/3.7 ... fix : Typo	2015-09-03 19:15:31 +02:00
Laurent Destailleur	c7b7dff0ed	Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-bug-3460 Conflicts: ChangeLog	2015-09-03 19:14:37 +02:00
Laurent Destailleur	54214cfddf	Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-bug-3383 Conflicts: ChangeLog	2015-09-03 19:12:01 +02:00
Laurent Destailleur	be9d5b030d	Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-bug-3358 Conflicts: ChangeLog	2015-09-03 19:08:08 +02:00
Laurent Destailleur	b0f604da14	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 ... Conflicts: ChangeLog	2015-09-03 17:05:02 +02:00
AlainRnet	587a193a4d	Update lines.php ... - pagination - prise en compte des filtres lors d'un changement de page	2015-09-03 16:03:04 +02:00
philippe grand	e9bb296a4f	NEW: : add doActions hook method call in contract card	2015-09-03 13:57:38 +02:00
philippe grand	fed70b1376	translation missing	2015-09-03 12:57:57 +02:00
Marcos García de La Fuente	ded6e7d6d9	Merge branch '3.7' into bug-3358 ... # Conflicts: # ChangeLog	2015-09-03 12:32:03 +02:00
Marcos García de La Fuente	2d5331b8f8	FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice ... Close #3460	2015-09-03 12:13:03 +02:00
philippe grand	8bf093a7ce	fix : Typo	2015-09-03 12:12:10 +02:00