dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	f9860e1425	Work on email collector	2019-04-09 13:23:30 +02:00
Laurent Destailleur	1b415a6aed	Fix translation of help tooltip on fields for modulebuilder.	2019-04-08 14:42:46 +02:00
Laurent Destailleur	2b5e25188c	Merge pull request #10977 from IonAgorria/resources-product NEW: Resources tab possible in products/services	2019-04-08 13:57:30 +02:00
Ion	b64cb4129f	Add resources tab for products/services	2019-04-07 23:52:49 +02:00
atm-ph	285e60e9f1	Fix default filter	2019-04-05 10:57:50 +02:00
Laurent Destailleur	8fe1be1a67	Removed deprecated use of string in dol_print_date(). Only date allowed.	2019-04-01 19:27:34 +02:00
Laurent Destailleur	d572a9258c	Merge branch 'develop' into new_evol_time_spent_views	2019-03-31 19:12:27 +02:00
Laurent Destailleur	26e3f41f73	Translation	2019-03-29 16:18:47 +01:00
atm-ph	fa41eeec7f	New evol "Input per week" display	2019-03-21 14:21:29 +01:00
Laurent Destailleur	d44be341a5	NEW Add property 'noteditable' in modulebuilder	2019-03-17 01:45:46 +01:00
Laurent Destailleur	a2d6723ff3	WIP Link files to expense report lines	2019-03-15 15:07:52 +01:00
Laurent Destailleur	8f65ee2296	Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode	2019-03-14 17:48:44 +01:00
Laurent Destailleur	fe6b682ec0	NEW Add visibility with value 4 in framework to define fields to show on forms and list but not on creation forms.	2019-03-12 17:45:19 +01:00
Laurent Destailleur	ddc52b7199	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/exports/export.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2019-03-07 14:13:38 +01:00
Laurent Destailleur	02b8bc94e7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-07 14:06:31 +01:00
Laurent Destailleur	0349f9bfaa	Update objectline_create.tpl.php	2019-03-07 13:26:25 +01:00
Christophe Battarel	96b8da0d62	fix supllier discount	2019-03-06 22:04:01 +01:00
Laurent Destailleur	1ab3949e9c	Optimize js code	2019-03-06 13:01:01 +01:00
Laurent Destailleur	7d37b4c46d	CSS	2019-03-05 13:04:54 +01:00
Frédéric FRANCE	b5def5fd59	Update admin_extrafields_view.tpl.php	2019-03-02 18:11:47 +01:00
atm-quentin	e39f85ac4d	FIX js focusing	2019-02-27 09:23:39 +01:00
atm-quentin	72dc25552a	FIX better placement	2019-02-27 09:23:31 +01:00
Laurent Destailleur	014c199173	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/tpl/extrafields_list_print_fields.tpl.php	2019-02-27 01:28:12 +01:00
atm-quentin	35762c0d4e	add data elem on task list	2019-02-26 11:25:40 +01:00
Frédéric FRANCE	51b29f2ed5	replace html code by html5 in tpl	2019-02-23 22:43:53 +01:00
Frédéric FRANCE	0255336549	fix html5 user	2019-02-16 10:29:15 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	38d4284638	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/db/pgsql.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/filefunc.inc.php htdocs/imports/import.php htdocs/supplier_proposal/card.php	2019-02-08 11:26:08 +01:00
Laurent Destailleur	fe1188c4ea	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/filefunc.inc.php	2019-02-08 10:44:45 +01:00
Laurent Destailleur	679a13e48c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/expedition/class/expedition.class.php	2019-02-08 10:22:36 +01:00
Marc de Lima Lucio	428efa9227	FIX: line edit template: keep fk_parent_line	2019-02-05 12:02:49 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	9f7dfe2921	Merge pull request #10481 from frederic34/psr2forloop psr2 Squiz.ControlStructures.ForEachLoopDeclaration	2019-02-03 19:11:07 +01:00
Frédéric FRANCE	273d68381c	psr2 end file new line none found	2019-02-03 15:21:21 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
Frédéric FRANCE	03701fa091	psr2	2019-02-02 18:25:01 +01:00
Frédéric FRANCE	f5b2cf75f2	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
Laurent Destailleur	a0c0b377b2	css	2019-01-31 20:53:47 +01:00
Frédéric FRANCE	b766204690	wip	2019-01-30 22:53:47 +01:00
Laurent Destailleur	e18bd6f986	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
Laurent Destailleur	408609e0ec	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php htdocs/core/tpl/objectline_edit.tpl.php	2019-01-30 16:54:38 +01:00
Laurent Destailleur	9fdba921b4	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php	2019-01-30 16:48:33 +01:00
Laurent Destailleur	81ae4c52c5	Merge pull request #10446 from mapiolca/8.0 Fix #10317 et #10318	2019-01-30 16:43:14 +01:00
Laurent Destailleur	e72d6c50e6	Merge pull request #10428 from frederic34/toomanylines PSR2.Files.EndFileNewline.TooMany	2019-01-30 16:17:09 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Laurent Destailleur	6d3529b606	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-30 14:47:28 +01:00
Laurent Destailleur	340412ed00	FIX generation of document for supplie rinvoice	2019-01-30 14:07:50 +01:00
Laurent Destailleur	f955f3f4ee	Fix report error only if return code < 0	2019-01-30 12:23:34 +01:00
Laurent Destailleur	cedf1bb269	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_massactions.inc.php	2019-01-29 19:13:57 +01:00
Laurent Destailleur	205b7f2e95	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-29 19:04:40 +01:00
Laurent Destailleur	c6755b3cf1	Fix formatting of number in quantity field	2019-01-29 15:59:41 +01:00
Pierre Ardoin	80cfe86508	Update objectline_view.tpl.php	2019-01-29 14:26:14 +01:00
Pierre Ardoin	5ea1cf0775	Update objectline_edit.tpl.php	2019-01-29 14:25:34 +01:00
Pierre Ardoin	dd0f6b3829	Edition Ligne Travaux Supplémentaires Correction pour permettre l'édition si la ligne n'existe pas dans une précédente situation. Permet l'édition d'une ligne si elle a été ajouté dans la situation actuelle.	2019-01-29 11:30:14 +01:00
Pierre Ardoin	508fb5c9cb	Prise en charge des Travaux supplémentaires Corrige la filtration lors des situations client afin de prendre en compte la possibilité d'ajouter des travaux en cours de chantier.	2019-01-29 11:13:11 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	ecc30b8ffe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2019-01-27 18:27:58 +01:00
Laurent Destailleur	f30a3d59ba	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +01:00
Frédéric FRANCE	496fa9b0fb	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
florian HENRY	822706000f	fix broken link into contact tpl	2019-01-24 18:01:40 +01:00
Laurent Destailleur	8284bd0577	Remove useless class	2019-01-21 18:12:25 +01:00
Laurent Destailleur	42743027d4	Merge branch 'develop' into objectline_etc	2019-01-21 18:04:48 +01:00
torvista	62abf82297	remove dev comment	2019-01-21 16:32:02 +01:00
torvista	827c836e6e	Whne multicurrency in use, the Add button colspan is incorrect (6 instead of 5) since it is incrementing colspan in addition to a previous incrment in the title bar. This corrects the table.	2019-01-21 16:18:39 +01:00
torvista	3cca072e26	correction of missing "	2019-01-21 16:16:21 +01:00
torvista	07b2bb6715	Swap of align/valign/border/width for css Removal of type="text/javascript"	2019-01-20 23:36:39 +01:00
torvista	e122fa2308	Change of aligns to CSS for HTML5. But a bug exists that I cannot fix: https://github.com/Dolibarr/dolibarr/issues/9577	2019-01-20 17:52:21 +01:00
Philippe GRAND	29fdad144d	update with html5 compliant code	2019-01-19 12:40:17 +01:00
ldestailleur	451b3e30cc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/langs/en_US/cashdesk.lang	2019-01-04 19:36:20 +01:00
ldestailleur	1ae11c554b	Fix regression if style	2019-01-03 21:35:25 +01:00
Laurent Destailleur	422e18ee8e	Merge pull request #10268 from hregis/develop_upgrade FIX remove old unused and deprecated function "getStaticMember"	2019-01-02 19:37:49 +01:00
Laurent Destailleur	294107bba0	FIX vars for substitution must be null if not applicable (and not '')	2018-12-27 05:07:11 +01:00
Laurent Destailleur	6a708666b2	FIX vars for substitution must be null if not applicable (and not '')	2018-12-27 05:06:37 +01:00
Regis Houssin	1a15698f96	FIX replace deprecated "print_titre" with "load_fiche_titre" Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2018-12-25 08:36:42 +01:00
Regis Houssin	8f4c452075	FIX replace deprecated "print_fiche_titre" with "load_fiche_titre" Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2018-12-25 08:34:26 +01:00
Laurent Destailleur	33564ddafc	Fix css	2018-12-22 16:45:57 +01:00
Laurent Destailleur	7d1b48815d	Fix css	2018-12-22 11:57:23 +01:00
Laurent Destailleur	27f8096afa	Merge branch 'develop' into PR_NEW_reception	2018-12-15 12:50:31 +01:00
Laurent Destailleur	31c5ac470b	More powerfull easter egg	2018-12-14 17:57:19 +01:00
Laurent Destailleur	d93a6aa120	Fix regression	2018-12-14 17:54:23 +01:00
Laurent Destailleur	4f07ab841b	Merge pull request #10063 from aljawaid/patch-4 NEW: Add hidden config 'ADD_UNSPLASH_LOGIN_BACKGROUND'	2018-12-14 17:51:41 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	233e160489	Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2 NEW Extend import option to Order's card and Propal's card	2018-12-14 15:29:27 +01:00
Laurent Destailleur	0c3165a79a	Merge branch 'develop' into email-contact-card	2018-12-14 15:26:15 +01:00
Ferran Marcet	555698a3af	Qual: Better management of select type of lines	2018-12-13 10:36:30 +01:00
florian HENRY	c422904b99	fix #9964	2018-12-01 16:51:40 +01:00
Laurent Destailleur	7c22504252	Fix position of field must be ssame between create/edit/view	2018-11-27 09:22:59 +01:00
Laurent Destailleur	12b9ac2c3b	Fix lang	2018-11-26 14:48:27 +01:00
IJ	693a8d6e4a	NEW: Add hidden config 'ADD_UNSPLASH_LOGIN_BACKGROUND' - The background image will be refreshed on every login page refresh - Background image is pulled from the popular open source image website Unsplash - If an already saved static background image exists, then this code will override it (but not delete the saved image).	2018-11-21 21:53:29 +00:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Laurent Destailleur	6d640ab83c	Fix feature to drag and drop rows of table (not generic)	2018-11-15 19:58:06 +01:00
Philippe GRAND	2ed060a070	fix: Invalid argument supplied for foreach()	2018-11-13 10:07:04 +01:00
Laurent Destailleur	84983140b6	Merge pull request #9896 from hregis/develop_email FIX change my deprecated email	2018-11-11 17:35:35 +01:00
Laurent Destailleur	ca3510e889	Merge pull request #9994 from ptibogxiv/patch-91 Fix Invalid argument supplied for foreach()	2018-11-11 17:30:06 +01:00
ptibogxiv	80782a366e	Fix Invalid argument supplied for foreach()	2018-11-10 15:04:38 +01:00
ptibogxiv	5c96689c87	Fix Invalid argument supplied for foreach()	2018-11-10 15:02:50 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Laurent Destailleur	9a0b5fb599	Fix extrafields	2018-11-07 12:25:22 +01:00
Laurent Destailleur	1e801c7c8a	Fix css	2018-11-06 16:50:31 +01:00
François J	29c71b31fe	[New] Add Presend form & Actions to send emails to Contact card Add ability to send email to contact from the Contact card. Functionality was copied and adapted from the Third Party card.	2018-11-06 16:40:39 +01:00
Laurent Destailleur	763f3cd518	Debug modulebuilder	2018-11-05 18:10:38 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	7c3cb7d73c	Update commonfields_add.tpl.php	2018-11-05 09:54:11 +01:00
Abbes Bahfir	5f4d644cab	New : help picto for fields in creation	2018-11-03 11:12:50 +01:00
Frédéric FRANCE	da3ee9ad9a	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-10-30 19:04:35 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
atm-greg	3bd1563052	fix travis white_space error	2018-10-29 16:46:06 +01:00
atm-greg	9f890c28dd	add ability to edit price ht before adding a line	2018-10-29 15:37:17 +01:00
Laurent Destailleur	b4600fdc06	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formmail.class.php htdocs/core/js/timesheet.js	2018-10-29 02:31:05 +01:00
Laurent Destailleur	553e984465	FIX Selection of addmaindocfile is lost on error	2018-10-29 02:14:41 +01:00
Laurent Destailleur	770f8c3f3b	FIX Selection of addmaindocfile is lost on error	2018-10-29 02:11:33 +01:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	f29ee25ea7	remove fieldlabel and add fieldeditkey	2018-10-27 11:06:45 +02:00
atm-john	8a9b9f1736	Fix title	2018-10-25 21:53:48 +02:00
atm-john	759b2b6ccf	Extend import option to Order's card and Propal's card	2018-10-25 21:39:22 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
atm-quentin	8442b405b2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception	2018-10-23 10:27:46 +02:00
Frédéric FRANCE	e49f2bc562	Update document_actions_post_headers.tpl.php	2018-10-22 22:20:26 +02:00
Laurent Destailleur	d38c68e54f	Remove unexpected char	2018-10-21 11:10:04 +02:00
Laurent Destailleur	c4e67de5c9	Merge pull request #9814 from Mavyre/patch-2 Fixed all resources displaying on add in projects, events...	2018-10-19 12:57:07 +02:00
Laurent Destailleur	696023c1aa	NEW Enhancement in the generic file manager	2018-10-19 12:47:59 +02:00
Mavyre	32a3779d23	Fixed all ressources displaying	2018-10-18 22:08:23 +02:00
Laurent Destailleur	d4bc53660b	Code comment and debug filemanager	2018-10-18 21:22:30 +02:00
Laurent Destailleur	2c1e8d6535	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php	2018-10-16 18:47:11 +02:00
Laurent Destailleur	970c581bc9	css	2018-10-15 16:40:07 +02:00
Laurent Destailleur	532e05c42e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: ChangeLog htdocs/filefunc.inc.php	2018-10-13 14:29:51 +02:00
Laurent Destailleur	1e58b837f0	css	2018-10-13 14:11:44 +02:00
atm-ph	e2748953c3	Fix print extrafield date in list	2018-10-12 22:31:47 +02:00
atm-ph	4b32c8e100	Fix extrafield contact typed as date isn't show in the list from 'contact/address' tab of company	2018-10-11 14:24:55 +02:00
atm-quentin	c6ab79bad3	NEW note, contact and lines on card	2018-10-08 16:54:33 +02:00
Laurent Destailleur	e2f450aa8c	Fix regession losing description. Rename updateligne into updateline.	2018-09-28 16:15:17 +02:00
Laurent Destailleur	e252a5f046	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-27 12:55:45 +02:00
Laurent Destailleur	62b31df069	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/rssparser.class.php htdocs/langs/en_US/boxes.lang	2018-09-27 12:55:25 +02:00
Laurent Destailleur	575c63f87d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/CMailFile.class.php	2018-09-27 12:52:10 +02:00
Laurent Destailleur	60c74a6255	Merge pull request #9582 from grandoc/new_branch_21_09_2018 Standardize and update code from New branch 21 09 2018	2018-09-27 10:07:15 +02:00
Laurent Destailleur	9630c7b5c7	Merge pull request #9614 from grandoc/new_branch_25_09_2018 Add some code comment	2018-09-27 09:31:19 +02:00
Philippe Grand	b7304e3d82	Merge branch 'develop' into new_branch_21_09_2018	2018-09-27 09:29:26 +02:00
Laurent Destailleur	29893daf6f	Merge pull request #9599 from zeenlym/forgotten_passlink NEW Change forgotten password link in general parameters	2018-09-27 09:17:28 +02:00
Philippe GRAND	746d73b8e6	Add some code comment	2018-09-25 17:26:57 +02:00
Frédéric FRANCE	a9f7bdead6	fix Option MAIN_DISABLE_NOTES_TAB #9611	2018-09-25 15:22:08 +02:00
Laurent Destailleur	ea517da85c	Work on filemanager for websites	2018-09-24 15:14:32 +02:00
Yanis LISIMA	753089a99d	NEW Change forgotten password link in general parameters In some cases, user password are managed by external systems (ex: LDAP). The new parameter MAIN_PASSWORD_FORGOTLINK will send users to true forgotten password link.	2018-09-23 21:26:07 +02:00
Philippe GRAND	3464afe391	Update comment	2018-09-21 15:12:17 +02:00
Laurent Destailleur	5a0ffb68d7	Merge pull request #9576 from atm-john/FIX_attribute_closing FIX attribute closing	2018-09-20 20:34:57 +02:00
Laurent Destailleur	b05954fb1e	Merge pull request #9061 from delcroip/comptafiles NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements	2018-09-20 19:45:46 +02:00
John BOTELLA	b59b0b0cc3	FIX attribute closing	2018-09-20 16:13:22 +02:00
Laurent Destailleur	d4ffc5e088	css	2018-09-20 00:48:00 +02:00
Laurent Destailleur	1d47569651	Brighter gradient	2018-09-19 15:06:14 +02:00
Laurent Destailleur	78e983a1f5	CSS v9	2018-09-13 16:39:50 +02:00
Laurent Destailleur	ca85356b45	Merge pull request #9427 from frederic34/patch-6 deprecate Form::select_date	2018-09-12 22:07:23 +02:00
Laurent Destailleur	b4264ee0a0	Use font awesome for sort image	2018-09-12 21:57:32 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Laurent Destailleur	f5074f4962	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 18:12:17 +02:00
Laurent Destailleur	b341cb9245	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/compta/facture/list.php htdocs/core/tpl/objectline_view.tpl.php	2018-09-12 18:11:51 +02:00
Laurent Destailleur	10becd2046	Merge pull request #9483 from ptibogxiv/patch-54 New donation module	2018-09-12 17:34:21 +02:00
atm-ph	40c79cb7cd	Fix classname liencolht to linecolht	2018-09-11 17:56:11 +02:00
Laurent Destailleur	47cfda6734	Webiste	2018-09-10 09:09:51 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Laurent Destailleur	700e3b9748	Standardize code for modulepart=mycompany like others modulepart.	2018-09-09 12:53:30 +02:00
Frédéric FRANCE	a558c3bdac	replace select_date	2018-09-09 11:25:59 +02:00
Laurent Destailleur	33f71be6ef	Fix gradient ok for webview	2018-09-07 19:03:53 +02:00
Laurent Destailleur	e5058a251d	Use colored gradient background on login page	2018-09-07 12:27:08 +02:00
ptibogxiv	b630a97215	add payment link on admin gateway	2018-09-05 17:41:37 +02:00
Laurent Destailleur	887a40cf1d	Remove TODO	2018-09-02 16:46:01 +02:00
Laurent Destailleur	fde9c94b1c	Fix regression in media editor in websites	2018-08-28 14:21:58 +02:00
Frédéric FRANCE	6113b536a0	remove superfluous spaces	2018-08-12 19:59:39 +02:00
Philippe GRAND	42fe2b78de	clean and update code	2018-08-07 10:44:26 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include Include and co are statements	2018-08-02 11:03:44 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Frédéric FRANCE	2dd907a8e1	extrafield totalizable	2018-07-26 09:41:44 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	77c121b15c	Merge pull request #9099 from ATM-Nicolas/7.0 NEW Set contactCivName substitution key	2018-07-24 18:02:21 +02:00
Laurent Destailleur	174394c476	Work on website module	2018-07-23 14:08:20 +02:00
Laurent Destailleur	7dc552a54e	Fix alignement	2018-07-17 18:10:42 +02:00
Laurent Destailleur	41605ed4a7	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2018-07-16 11:29:47 +02:00
ATM-Nicolas	3c5998e697	FIX : Refactoring	2018-07-16 11:16:55 +02:00
Laurent Destailleur	89cc048fff	FIX Init of contact in combo list when thirdparty not yet known	2018-07-16 10:46:10 +02:00
ATM-Nicolas	9d60b0a8c6	Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0	2018-07-16 09:47:16 +02:00
ATM-Nicolas	de8fd3d12c	NEW : Contact substitutions keys	2018-07-16 09:33:14 +02:00
Laurent Destailleur	e92052353d	Merge pull request #9026 from inoveaconseil/FixExtrafieldResource Fix extrafields resource	2018-07-15 20:13:24 +02:00
ATM-Nicolas	170a668b2b	FIX : Set contactCivName substitution key	2018-07-13 11:09:56 +02:00
Laurent Destailleur	291f149a9b	NEW Can set a tooltip help text on extrafields	2018-07-08 20:26:48 +02:00
Laurent Destailleur	41f21f3867	Translation	2018-07-08 20:06:24 +02:00
delcroix Patrick	5f7a308552	Merge branch 'develop' into comptafiles	2018-07-05 22:35:40 +02:00
delcroix Patrick	e88dd77ea5	no change	2018-07-05 21:42:34 +02:00
patrick Delcroix	0e7ba92784	New: Accounting dossier file checks page Page to check to attachement of those operation invoice, invoicesupplier, salary, donation, Expense, tax	2018-07-05 21:34:36 +02:00
Inovea Conseil	d53f03b596	Update after comment	2018-07-05 09:14:36 +02:00
Laurent Destailleur	12c43d7722	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 12:33:17 +02:00
Laurent Destailleur	7ef6b16d31	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/install/step1.php	2018-07-03 10:04:25 +02:00
Laurent Destailleur	0138b0e0b7	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/core/class/html.form.class.php	2018-07-03 10:01:30 +02:00
Laurent Destailleur	f6774de773	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-30 02:00:46 +02:00
Regis Houssin	2d13b5b59d	Fix: broken feature with edit in place	2018-06-29 15:57:34 +02:00
Laurent Destailleur	60c62895bf	WIP Can add tooltips on extrafields	2018-06-28 19:13:23 +02:00
Inovea Conseil	c4513a755d	Fix extrafields resource	2018-06-28 16:39:37 +02:00
atm-quentin	9125586692	FIX need element type on select filter	2018-06-28 15:52:40 +02:00
Laurent Destailleur	25b1d063ae	Fix length of hidden password	2018-06-24 11:45:10 +02:00
Laurent Destailleur	5829014218	Merge branch 'develop' into NEW_advance_targer_filter_everywhere	2018-06-24 10:24:26 +02:00
Laurent Destailleur	6dba88ab6e	Several fixes in look and feel	2018-06-23 14:23:07 +02:00
atm-quentin	d53aa71673	NEW advance target filtering can be used everywhere with tpl and fk_element	2018-06-22 10:54:00 +02:00
Philippe GRAND	62586c7c5d	clean and upsdate code	2018-06-18 12:47:17 +02:00
Laurent Destailleur	50aa674ebc	Fix support of 'help' field property. Fix bad td closing.	2018-06-13 13:36:40 +02:00
Laurent Destailleur	f4bef82bfa	Fix td not closed and js code duplicated (at wrong place)	2018-06-13 13:00:08 +02:00
Laurent Destailleur	5ea1890f0c	Fix payments on contract line	2018-06-06 10:28:53 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
bgenere	89d9fe3919	FIX Issue for extra fields date display in template. Template is now consistent with the extrafiels_view template	2018-05-30 17:08:01 +02:00
Laurent Destailleur	a2d485c14f	Fix management of enabled property extrafields	2018-05-13 14:27:40 +02:00
Laurent Destailleur	c76e866f41	CSS	2018-05-13 14:06:57 +02:00
ATM-Nicolas	5bc9799bf1	FIX : Drag and drop lines with extrafields	2018-05-07 16:30:22 +02:00
Abbes Bahfir	17b8de2cdd	New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED	2018-05-05 12:57:29 +01:00
TuxGasy	12440e6a7e	Do not display multicurrency cols if currency of object is same as main currency	2018-05-02 11:30:35 +02:00
Laurent Destailleur	5eb7c7ffff	FIX Edit of ref_supplier in supplier invoice	2018-04-24 13:22:34 +02:00
Laurent Destailleur	c5e0838946	Set position by default to 100	2018-04-20 01:56:35 +02:00
Laurent Destailleur	99feaf5275	Fix reposition class	2018-04-19 21:33:26 +02:00
Laurent Destailleur	4dadfac74b	Debug usage of the new extrafield architecture	2018-04-17 14:34:17 +02:00
Laurent Destailleur	c3970f1a52	Code comment	2018-04-17 09:44:57 +02:00
Laurent Destailleur	106fb87d0a	NEW Can sort order of files in attach tab for leave and expensereport	2018-04-16 19:25:27 +02:00
Laurent Destailleur	c702c88fde	CSS	2018-04-16 13:11:48 +02:00
Laurent Destailleur	db385d64b6	Fix br	2018-04-14 23:24:01 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	fbae4429b7	Clean code for better extrafields management	2018-04-13 12:52:23 +02:00
Laurent Destailleur	78fcbe9633	FIX the extrafields separator was not translated	2018-04-13 10:48:29 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Laurent Destailleur	3cecfd02c7	NEW Mutualize code for action="update_extras" NEW Can use setValueFrom without user modification field FIX Exclude separators from mandatory extrafields test More code to use the new framework array for extrafields Can use text condition in extrafield visibility	2018-04-12 23:16:23 +02:00
All-3kcis	21df700325	Add option to save file with product batch ref + use batch number like ref instead of id + debug access to shared link	2018-04-12 15:55:08 +02:00
All-3kcis	a8fbf4a370	Add option to save file with product ref	2018-04-12 15:40:09 +02:00
Laurent Destailleur	698f5c165a	Merge pull request #8430 from atm-florian/dev_mailtouser NEW : Can select from the user list into send form email (For field to and CC)	2018-04-11 17:55:40 +02:00
Laurent Destailleur	e543a6bf85	Merge pull request #8549 from atm-greg/fix_multiselect_filter FIX #8480	2018-04-11 17:38:30 +02:00
Laurent Destailleur	590bc2948a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/bank/card.php htdocs/core/tpl/admin_extrafields_view.tpl.php	2018-04-11 17:20:49 +02:00
Laurent Destailleur	0518218aed	Fix regression	2018-04-11 17:17:03 +02:00
Laurent Destailleur	75bc3d17e6	Update admin_extrafields_view.tpl.php	2018-04-11 14:55:29 +02:00
atm-greg	8a0baaad17	fix #8480	2018-04-10 16:25:06 +02:00
Laurent Destailleur	0bf4381226	NEW The field "visible" on extrafield can accept expression as condition	2018-04-10 15:39:11 +02:00
gauthier	5621d1f8ea	FIX #8478 !empty instead of count to avoid warning	2018-04-10 15:03:15 +02:00
Laurent Destailleur	0abcf5694c	Fix message of discount	2018-04-06 20:18:36 +02:00
Laurent Destailleur	85d4f7115b	Better position of the substitution tooltip for emails	2018-04-06 16:16:08 +02:00
florian HENRY	cc0fb830b8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-04-05 10:53:17 +02:00
John	d689e88b92	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-04-03 11:38:12 +02:00
Laurent Destailleur	927d86f27f	Revert "NEW: formconfirm in javascript" This reverts commit `50790d5527`.	2018-03-31 23:10:12 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Laurent Destailleur	7c394733e4	Merge pull request #8445 from ATM-Consulting/develop_atm NEW: bank reconcile: checkbox to select all bank operations	2018-03-29 14:49:41 +02:00
Laurent Destailleur	6f6395e309	Code comment	2018-03-27 23:01:54 +02:00
florian HENRY	ffbeb17ec2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-03-25 17:19:27 +02:00
Laurent Destailleur	53dde8dc0c	Fix confirmation email for membership payment	2018-03-25 15:00:43 +02:00
Laurent Destailleur	53edb86ffb	Make sending of email for member module ok with new email template archi	2018-03-23 19:35:25 +01:00
Marc de Lima Lucio	50790d5527	NEW: formconfirm in javascript	2018-03-23 16:54:33 +01:00
Laurent Destailleur	700c69e127	NEW Can set position of images in module tickets Mutualize code of method show_photo	2018-03-22 11:46:35 +01:00
florian HENRY	dc6f4c1f4d	NEW : option to send email to salaries	2018-03-21 11:48:30 +01:00
Laurent Destailleur	d7ad899839	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/card.php htdocs/core/class/conf.class.php htdocs/core/tpl/objectline_view.tpl.php htdocs/holiday/list.php	2018-03-20 14:52:27 +01:00
Laurent Destailleur	8cf2d4eb45	Fix filter on holiday statut Fix tr/td balance for extrafields on lines	2018-03-20 10:10:21 +01:00
Laurent Destailleur	1837d6a5f3	Better look of lines	2018-03-19 12:30:48 +01:00
Laurent Destailleur	12068f9cf3	Merge branch 'develop' into 8.0-a7	2018-03-19 12:18:18 +01:00
Laurent Destailleur	c3cd2ff3db	Update objectline_view.tpl.php	2018-03-19 12:13:18 +01:00
Laurent Destailleur	6f7098d22e	Update objectline_view.tpl.php	2018-03-19 12:09:38 +01:00
Laurent Destailleur	ce3975377d	Link to unlink is unlink and not remove	2018-03-19 12:02:49 +01:00
Laurent Destailleur	57e2240354	NEW Edit of extrafields position page on the edit form	2018-03-17 11:21:50 +01:00
Laurent Destailleur	ba47b6d051	NEW Add tab contact on supplier proposals	2018-03-16 10:21:53 +01:00
Laurent Destailleur	98b7d4c2e2	NEW Can set the start/end date of service line in invoice templates	2018-03-12 12:27:40 +01:00
Laurent Destailleur	cc7ac2a0da	Merge pull request #8313 from atm-florian/7.0_fix8241 7.0 fix8241	2018-03-09 22:47:43 +01:00
florian HENRY	42fed5981d	bettre syntax	2018-03-09 19:16:06 +01:00
florian HENRY	02beed265e	better space	2018-03-09 19:14:43 +01:00
florian HENRY	5a56e802d9	FIX #8232	2018-03-09 19:10:52 +01:00
Laurent Destailleur	1c9e7145e7	Merge pull request #8276 from ATM-Consulting/develop_atm NEW: supplier credit notes & discounts (absolute and relative)	2018-03-08 20:06:37 +01:00
Alexandre SPANGARO	0182b724aa	Merge remote-tracking branch 'uptream/develop' into 8.0-a7	2018-03-08 06:53:54 +01:00
Alexandre SPANGARO	3f2aa6a4fb	New : On invoice card, show accounting account linked	2018-03-08 06:52:31 +01:00
Laurent Destailleur	7e6ba51780	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/projet/tasks/comment.php	2018-03-07 13:06:29 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
florian HENRY	6cb77577a6	can use image	2018-03-07 09:03:13 +01:00
Laurent Destailleur	1e6a55745c	CSS	2018-03-06 11:54:05 +01:00
Marc de Lima Lucio	1765b09fda	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-05 11:05:38 +01:00
Laurent Destailleur	0a5edb871b	Merge pull request #8253 from ruistrecht-alt/Fix_supress_count_warning_in_extrafields_view_tpl FIX Suppress count warning in admin_extrafields_view.tpl	2018-03-02 18:00:52 +01:00
Marc de Lima Lucio	451d943927	NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)	2018-03-02 16:48:25 +01:00
Laurent Destailleur	a3350d12d8	css	2018-03-01 23:51:06 +01:00
Marc de Lima Lucio	e07177fec2	FIX: supplier relativ discounts: pre-fill newlines with qty/discount	2018-03-01 12:31:33 +01:00
Laurent Destailleur	2368cb615f	Look and feel v8	2018-03-01 11:51:25 +01:00
Marc de Lima Lucio	059801fe03	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-03-01 10:22:21 +01:00
Laurent Destailleur	6f29a574cf	CSS	2018-03-01 02:37:18 +01:00
Laurent Destailleur	03858d73b1	NEW Add extrafield type "html"	2018-02-27 17:30:13 +01:00
Marc de Lima Lucio	7cd1b2caa9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm	2018-02-27 16:45:01 +01:00
Marc de Lima Lucio	9cf45266f5	NEW: supplier relative discounts	2018-02-27 16:30:39 +01:00
Rui Strecht	24ae7b4780	Suppress count warning in admin_extrafields_view.tpl	2018-02-27 14:45:17 +00:00
Laurent Destailleur	2294a50c89	Fix tooltip	2018-02-27 13:05:59 +01:00
Laurent Destailleur	863cab362f	NEW Cat set the encryption algorithm for extrafields of type password	2018-02-23 14:38:41 +01:00
Laurent Destailleur	8b479a05ad	Can add property in password extrafield (prepare to choose encrypt algo)	2018-02-23 12:34:25 +01:00
John	768c09bc74	Fix import order	2018-02-23 09:23:50 +01:00
John	b88e7fdcf9	move button to dialog footer	2018-02-22 17:21:12 +01:00
John	c5b96e43c7	add new action to import order in invoice	2018-02-22 16:55:41 +01:00
John	a7a6630fad	Add popin dialog	2018-02-22 15:19:20 +01:00
Laurent Destailleur	b87feab1e3	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2018-02-22 12:19:20 +01:00
John	f313fb925b	Add new checkbox for lines	2018-02-21 17:06:40 +01:00
John	bd0e8506f5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element	2018-02-21 11:53:16 +01:00
Laurent Destailleur	34135e0a13	Fix extrafield date or datetime with bad timezone	2018-02-20 19:20:47 +01:00
Laurent Destailleur	e465b0c40e	Fix extrafield date or datetime with bad timezone	2018-02-20 19:19:27 +01:00
John	09c5dc506a	Add html dom element and fix class	2018-02-20 17:46:32 +01:00
Laurent Destailleur	f207e91643	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/holiday/define_holiday.php htdocs/main.inc.php htdocs/societe/class/societe.class.php	2018-02-20 15:06:41 +01:00
Marc de Lima Lucio	f5ad93b272	NEW: supplier credit notes: handle Excess Paid + translation	2018-02-19 15:52:07 +01:00
Maxime Kohlhaas	bfd46f62ea	Fix : contact and user getnomurl needs all info to display tooltip correctly	2018-02-15 15:18:25 +01:00
Marc de Lima Lucio	4f9bb33600	NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid	2018-02-14 10:47:10 +01:00
Laurent Destailleur	7ed128ff2b	Fix bad escaping	2018-02-13 14:30:14 +01:00
Laurent Destailleur	7743f88e98	Fix bad escaping	2018-02-13 14:03:11 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Laurent Destailleur	ab21769aa2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/card.php	2018-02-08 12:58:47 +01:00
Laurent Destailleur	879308e0ef	Fix responsive	2018-02-08 10:15:53 +01:00
jh z	131eed97a1	New: Add a tab of Docments to expedition module	2018-02-07 22:56:14 +08:00
Laurent Destailleur	565372eaab	Fix param showsize. Fix extrafields field too long	2018-02-06 10:34:29 +01:00
Laurent Destailleur	1a1e6adcb9	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-04 13:57:07 +01:00
Laurent Destailleur	7ed66457b4	Fix ref already output	2018-02-04 13:55:18 +01:00
Laurent Destailleur	e982e1d28c	Merge pull request #8062 from atm-maxime/new_disable_freelines NEW hidden option MAIN_DISABLE_FREE_LINES	2018-02-03 17:02:05 +01:00
Laurent Destailleur	a308e45c6b	Update objectline_create.tpl.php	2018-02-03 17:00:47 +01:00
Laurent Destailleur	0412d3d11d	Fix extrafield mandatory check.Fix empty extrafields with type link.	2018-02-01 19:05:24 +01:00
Laurent Destailleur	0385dfe859	Fix td balance	2018-02-01 00:49:12 +01:00
Laurent Destailleur	de0a8ba71f	Fix extrafields	2018-01-31 14:01:58 +01:00
Laurent Destailleur	64f6e9e5c0	CSS	2018-01-24 12:23:52 +01:00
Laurent Destailleur	561f273900	Minor fix for smartphone	2018-01-24 11:43:34 +01:00
Laurent Destailleur	f1b63d7cbf	Fix css	2018-01-23 09:00:03 +01:00
Laurent Destailleur	2ed34d813d	Css	2018-01-22 16:04:58 +01:00
Laurent Destailleur	25d59cf107	Fix sort on common fields	2018-01-15 18:05:15 +01:00
Laurent Destailleur	90fc086814	Fix minor	2018-01-14 20:11:38 +01:00
Maxime Kohlhaas	c45e5c91b1	New hidden option MAIN_DISABLE_FREE_LINES	2018-01-14 17:13:42 +01:00
Laurent Destailleur	7c480f76e3	Fix thumbs of pdf at wrong place Fix param not provided Fix css	2018-01-13 16:09:05 +01:00
Laurent Destailleur	d0680b429f	Fix name of file saved from tax document tab	2018-01-12 17:39:20 +01:00
Laurent Destailleur	4f8a447d30	Fix alignement	2018-01-12 14:09:51 +01:00
Laurent Destailleur	6c9d5984a2	Fix trans key	2018-01-12 14:03:03 +01:00
Laurent Destailleur	167ab17927	Fix substitution of user_signature	2018-01-10 10:31:27 +01:00
Laurent Destailleur	a92f60416a	Fix permissions	2018-01-07 18:52:35 +01:00
Laurent Destailleur	4f409b802e	Fix switch extrafield password/text	2018-01-05 18:16:40 +01:00
Laurent Destailleur	8388858715	Fix filemanager	2017-12-27 20:17:08 +01:00
Laurent Destailleur	768cc19bbc	Fix protection on tpl to avoid direct url call	2017-12-24 15:07:06 +01:00
Laurent Destailleur	07f1dd7dae	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-24 15:03:09 +01:00
Laurent Destailleur	b70dd36ffa	Better js comment	2017-12-24 12:16:48 +01:00
Laurent Destailleur	2b056b0177	BUG Fix of old hidden feature price per quantity	2017-12-22 12:53:46 +01:00
Laurent Destailleur	eab44f62b1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_builddoc.inc.php htdocs/core/class/html.form.class.php htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/core/tpl/admin_extrafields_edit.tpl.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/notes.tpl.php htdocs/main.inc.php htdocs/product/inventory/tpl/inventory.tpl.php htdocs/societe/tpl/linesalesrepresentative.tpl.php	2017-12-21 14:35:33 +01:00
Laurent Destailleur	6a62e13960	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 13:32:16 +01:00
Laurent Destailleur	b03d0134a7	Filter on date extrafield timestamp and datetime disabled (not possible yet)	2017-12-20 18:30:41 +01:00
Laurent Destailleur	d4afb8300d	Fix several pb of duplicate functions in some cases	2017-12-19 00:15:22 +01:00
Laurent Destailleur	57c7fa6ae9	Sync transifex	2017-12-10 01:17:32 +01:00
Laurent Destailleur	8d20473ffd	Fix date of extrafields	2017-12-09 23:19:29 +01:00
Laurent Destailleur	e270295f5c	Fix modulebuilder	2017-12-09 20:40:11 +01:00
Laurent Destailleur	cc813df2a5	Fix modulebuilder	2017-12-09 20:17:47 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	e1484caa59	Fix responsive	2017-11-25 17:21:53 +01:00
Laurent Destailleur	62da0160e1	Merge pull request #7780 from fappels/develop_update_tablednd FIX #3551 and #6823 table drag and drop not working.	2017-11-22 11:22:14 +01:00
Laurent Destailleur	4b4412d5da	Standardize file names for ECM	2017-11-20 19:40:34 +01:00
Laurent Destailleur	e19ca7b6d4	Work on generic filemanager	2017-11-20 18:19:41 +01:00
Laurent Destailleur	47afe470eb	Merge small js into lib_header.js.php Move filemanager.tpl.php CSS enhancement	2017-11-19 12:22:01 +01:00
Laurent Destailleur	776f999b71	Merge branch 'develop' into develop_update_tablednd	2017-11-17 15:10:09 +01:00
Laurent Destailleur	bf121f9b3c	Work on saving supplier_ref into database lines	2017-11-12 19:29:03 +01:00
Laurent Destailleur	955ed7dbbf	NEW Show the supplier ref into supplier cards	2017-11-12 15:30:21 +01:00
Laurent Destailleur	0cd8aa8a49	Merge pull request #7798 from hregis/develop_extrafields Fix: missing status 3 (only on form)	2017-11-11 17:59:33 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Laurent Destailleur	cb03b2f307	NEW Can sort joined files on thirdparty and user card.	2017-11-10 18:14:29 +01:00
Regis Houssin	3ffe1b6725	Fix: missing status 3 (only on form)	2017-11-10 16:51:37 +01:00
fappels	14bc066454	Update for new tablednd compatibility	2017-11-07 16:25:57 +01:00
Laurent Destailleur	cd70e1506b	Work on common core code	2017-11-03 17:20:08 +01:00
Laurent Destailleur	c479efa480	Fix encoding with select2	2017-11-03 16:29:23 +01:00
Laurent Destailleur	a346a1a5e9	Work on website module	2017-11-03 15:56:16 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Laurent Destailleur	00db7e16ec	Clean code	2017-10-28 16:00:07 +02:00
Laurent Destailleur	1a49a2bb94	Clean css/code	2017-10-28 11:00:02 +02:00
Laurent Destailleur	e865f41b86	NEW Extrafields "link to object" now use a combo selection and getNomUrl	2017-10-26 02:55:43 +02:00
Laurent Destailleur	66d2c29fe1	Work on modulebuilder and website module	2017-10-26 01:02:13 +02:00
Laurent Destailleur	bb996019c2	NEW Support visibility on extrafields	2017-10-25 11:42:14 +02:00
Laurent Destailleur	f381361c8b	Work on modulebuilder	2017-10-24 19:57:36 +02:00
Laurent Destailleur	f24204c79a	Error management after extrafield update	2017-10-24 19:04:40 +02:00
Laurent Destailleur	8b140ab069	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-17 10:44:29 +02:00
Laurent Destailleur	eb1fdca157	NEW Can create intervention from a proposal	2017-10-17 10:44:18 +02:00
Regis Houssin	46d9ef01c6	Fix: use new usage	2017-10-16 11:18:52 +02:00
Regis Houssin	c9066afa36	NEW add translation column for extrafields list	2017-10-11 14:22:59 +02:00
Laurent Destailleur	118b3cdf79	Update admin_extrafields_view.tpl.php	2017-10-11 11:56:22 +02:00
Regis Houssin	7e79c3a795	Fix: label not translated if special lang file used	2017-10-11 10:10:27 +02:00
Laurent Destailleur	33624e1001	NEW Attaching doc automatically in email is now a parameter of template.	2017-10-08 16:34:42 +02:00
Laurent Destailleur	9b3826a54c	Invert left and right (my own comment on left)	2017-10-04 13:17:16 +02:00
Laurent Destailleur	75a7e086b3	Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element New comment generic element	2017-10-04 11:13:39 +02:00
Laurent Destailleur	02f069713e	Standardize code	2017-09-29 17:43:32 +02:00
Laurent Destailleur	d2d77d4625	Module builder	2017-09-29 15:19:49 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +02:00
Laurent Destailleur	fdc1aa2a03	NEW Move contacts of a thirdparty on tab Contacts/Addresses	2017-09-27 19:56:03 +02:00
arnaud	f29ea35dc8	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element	2017-09-27 14:56:52 +02:00
Laurent Destailleur	5482f80c0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-26 10:30:47 +02:00
Laurent Destailleur	59571b1ce1	FIX #7473 Mass update of vat rates and other bugs on localtax	2017-09-26 10:29:44 +02:00
Laurent Destailleur	91d303465d	NEW Can add html content on right of tabs	2017-09-24 01:39:06 +02:00
Laurent Destailleur	63ec14e47d	Convert sode to send member info email into new generic email template system.	2017-09-22 20:18:11 +02:00
Laurent Destailleur	f990667b1a	NEW Can send email from the member card using email templates.	2017-09-22 17:48:38 +02:00
Laurent Destailleur	8578a1b825	NEW Option "one email per recipient" when using bulk actions emails.	2017-09-22 17:04:26 +02:00
Laurent Destailleur	6d7db96359	NEW Option "one email per recipient" when using bulk actions emails.	2017-09-22 16:31:05 +02:00
Laurent Destailleur	d4bde2a4ea	Fix date substitution for contracts	2017-09-22 15:12:36 +02:00
Laurent Destailleur	252f038468	Mutualize code of substitutions for emails	2017-09-22 14:34:31 +02:00
arnaud	9795f48046	NEW comment system working with all objects	2017-09-18 17:27:29 +02:00
Laurent Destailleur	ab5724e7ff	Mutualize code for forms to send emails. Remove thousand line of code.	2017-09-17 17:12:14 +02:00
Laurent Destailleur	e014ac6ea9	NEW Send by email available in bulk for expense report	2017-09-16 22:03:25 +02:00
Laurent Destailleur	b4eab24490	Add project into list of customer orders	2017-09-16 20:32:28 +02:00
Laurent Destailleur	0fec777d0e	NEW On bulk email from a list, can uncheck "Join main document". NEW Show direct preview link on contract	2017-09-16 18:31:30 +02:00
Laurent Destailleur	318e285ba2	NEW Add protection to avoid to send to much emails using builk actions	2017-09-16 16:00:58 +02:00
Laurent Destailleur	630dc92a13	NEW Mass PDF Merging is available on contracts	2017-09-16 15:39:52 +02:00
Laurent Destailleur	1a78e2a055	Mutualize/share code of all payments modes	2017-09-15 13:43:16 +02:00
Laurent Destailleur	a4665e17d4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinter.class.php htdocs/societe/class/societe.class.php htdocs/societe/list.php	2017-09-12 13:26:25 +02:00
Laurent Destailleur	61a0f04bbe	FIX dateSelector was not taken into account	2017-09-11 03:30:45 +02:00
Laurent Destailleur	e9e6a8e5ad	Fix center of button	2017-09-11 03:29:36 +02:00
Laurent Destailleur	ca5ef5cb11	FIX dateSelector was not taken into account	2017-09-11 01:20:15 +02:00
Laurent Destailleur	3beee569a6	Enhance support of default value in extrafields	2017-09-02 15:18:41 +02:00
Laurent Destailleur	4b9f54e571	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql	2017-09-01 17:34:57 +02:00
Laurent Destailleur	a3085cb44a	Update objectline_view.tpl.php	2017-08-30 16:43:57 +02:00
Juanjo Menent	d5a9d32778	Merge remote-tracking branch 'upstream/6.0' into 6.0	2017-08-30 14:37:43 +02:00
Juanjo Menent	bfc5f01e1e	NEW Add detail of all tax rates into pdf column tax sale. -Can be hidden by pdf setup page -For know if localtax is applied into line we have to read totaltax line	2017-08-30 14:36:00 +02:00
Laurent Destailleur	d3c95e030b	Fix delete file not possible for external user even with permissions	2017-08-30 14:34:36 +02:00
Laurent Destailleur	991a33f7b6	Make different vat rates visible	2017-08-29 20:40:51 +02:00
Laurent Destailleur	a60cd49fb0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php	2017-08-28 12:53:02 +02:00
Regis Houssin	0ce51fcb87	Fix: add resprint for passwordforgotten	2017-08-28 09:14:50 +02:00
Regis Houssin	570c683b99	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug2	2017-08-28 09:02:51 +02:00
Regis Houssin	b3642708b3	Fix: better for responsive background image	2017-08-28 08:28:58 +02:00
Regis Houssin	80af01c20f	Fix: wrong test	2017-08-27 13:57:52 +02:00
Regis Houssin	526ccc870b	Fix: add compatibility with old modules	2017-08-27 13:53:08 +02:00
Regis Houssin	1ce1899a46	Fix: add comment	2017-08-27 13:42:46 +02:00
Regis Houssin	896c8b4a78	Fix: comment old code	2017-08-27 13:24:29 +02:00
Regis Houssin	d800d10766	Fix: use resprint instead resarray	2017-08-27 13:19:57 +02:00
Laurent Destailleur	76b4a2ce06	Can set language file to use for label key of extra field	2017-08-27 12:52:26 +02:00
Laurent Destailleur	3f7eea2e0a	NEW Can set language on extrafields	2017-08-27 12:12:02 +02:00
John	0653a5d177	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec	2017-08-24 14:35:01 +02:00
Laurent Destailleur	90afbcb034	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/bank.php htdocs/core/lib/functions.lib.php	2017-08-23 17:02:53 +02:00
Laurent Destailleur	f3ef6448d7	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/admin/supplier_payment.php htdocs/core/lib/ajax.lib.php htdocs/don/admin/donation.php htdocs/product/admin/product.php	2017-08-23 16:11:51 +02:00
Laurent Destailleur	4da49dfc2d	FIX #7239	2017-08-23 15:02:38 +02:00
John	b18104788e	New extrafield on facture_rec	2017-08-22 15:22:41 +02:00
Laurent Destailleur	b3d1cdf84c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php	2017-08-22 10:11:32 +02:00
Laurent Destailleur	9ffcd9e922	Fix cover background size	2017-08-21 21:18:07 +02:00
Laurent Destailleur	70dcace0a1	Fix regression syntax	2017-08-21 12:52:47 +02:00
Laurent Destailleur	185b865d83	Merge pull request #7060 from defrance/patch-18 TPL refactoring	2017-08-17 22:36:06 +02:00
Laurent Destailleur	dcc6822c3c	Merge pull request #7056 from defrance/patch-17 Refactoring tpl Folder	2017-08-17 22:34:47 +02:00
florian HENRY	03e935f493	Better management	2017-08-04 17:11:40 +02:00
florian HENRY	8fd45383e2	NEW : manageme extrafields with multientity	2017-08-04 09:00:11 +02:00
Laurent Destailleur	b6a7ce6822	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
Laurent Destailleur	7d6d4adcdb	Fix combo for multicompany not visible where there is other hooks by other modules	2017-07-31 18:16:41 +02:00
Laurent Destailleur	9cf6c43f8a	Fix code comment	2017-07-31 15:51:08 +02:00
Laurent Destailleur	86d7644acc	Fix regression syntax error	2017-07-25 20:28:29 +02:00
Laurent Destailleur	82c25e5978	Fix syntax error	2017-07-25 20:17:58 +02:00
Laurent Destailleur	7e192559d6	Merge pull request #7055 from defrance/patch-16 Let's time to refactoring the tpl folder	2017-07-25 20:11:31 +02:00
Laurent Destailleur	d511fed504	Enhance modulebuilder	2017-07-25 12:44:55 +02:00
Laurent Destailleur	eff4282cc2	Clean files	2017-07-07 22:19:01 +02:00
BENKE Charlene	01c3e6fb82	TPL refactoring	2017-06-26 23:06:24 +02:00
BENKE Charlene	d34a8f4284	Refactoring tpl Folder	2017-06-26 14:15:36 +02:00
BENKE Charlene	fe749cbd95	Update bloc_showhide.tpl.php	2017-06-25 22:27:38 +02:00
BENKE Charlene	34727286f1	Let's time to refactoring the tpl folder Propose to refactoring all the file present in /tpl folder for hamonisation with the rest of dolibarr file. Good resolution for this summer	2017-06-25 22:03:06 +02:00
Laurent Destailleur	693b2fe3b4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture.php htdocs/core/ajax/ajaxdirpreview.php htdocs/core/class/conf.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/core/tpl/objectline_create.tpl.php	2017-06-23 11:20:29 +02:00
Marcos García	ba87549124	FIX #5640 Prices of a predefined product/service were incorrect under certain circumstances	2017-06-19 18:07:43 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Laurent Destailleur	abe736c6a6	Escape hml tags	2017-06-18 19:42:59 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Laurent Destailleur	e5fe629a0e	NEW Extrafields support formulas to be computed using PHP expressions	2017-05-24 22:48:44 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Laurent Destailleur	910a925167	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
Laurent Destailleur	5af5c23a98	Look and feel v6	2017-05-01 12:46:40 +02:00
Laurent Destailleur	cfde27820e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/translation.php htdocs/comm/card.php htdocs/core/menus/standard/eldy.lib.php	2017-04-27 17:20:40 +02:00
Laurent Destailleur	ec59f08e41	FIX extrafield css for boolean type	2017-04-24 00:46:27 +02:00
Laurent Destailleur	e97e202deb	NEW Can import users	2017-04-17 04:22:53 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	5931bc4068	NEW Feature to crop/resize images available on user and expense reports	2017-04-14 13:53:39 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	d78f3923ee	Support of preview for pdf with several pages	2017-04-12 12:13:38 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
Laurent Destailleur	e2ea5945dd	Work on look and feel v6	2017-04-06 21:48:28 +02:00
Laurent Destailleur	979bcd3a9b	NEW Can add a background image on login page	2017-03-31 11:40:31 +02:00
Laurent Destailleur	e416ea275e	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
Laurent Destailleur	df59a595de	Fix link to files	2017-03-25 01:29:19 +01:00
Laurent Destailleur	6b33a755ba	Add more log on tableDnD	2017-03-24 23:52:06 +01:00
Laurent Destailleur	e6d8b3c4db	Css enhancement	2017-03-15 11:41:15 +01:00
Laurent Destailleur	76db6c9f18	Fix css and colspan	2017-03-14 21:02:26 +01:00
Laurent Destailleur	4bf0e31299	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/loan.lang htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-03-11 02:40:42 +01:00
Laurent Destailleur	b6bdd98599	Fix css	2017-03-10 16:44:30 +01:00
Laurent Destailleur	2a3d3b4b50	Fix dol_banner for agenda	2017-03-10 16:40:38 +01:00
Laurent Destailleur	e5fc1583c7	Fix No external access without using getUrlContent function.	2017-03-10 12:05:42 +01:00
florian HENRY	76e55fcdb1	NEW :hidden Easter egg to display commitstrip strip on login page	2017-03-08 09:06:38 +01:00
Laurent Destailleur	5f79b2d0c6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2017-03-05 22:11:35 +01:00
Laurent Destailleur	f67c967d0b	FIX The vat rate line used when adding a predefined product was wrong if there is several vat line with same rate.	2017-03-04 22:27:44 +01:00
Laurent Destailleur	74ba7b4b51	Fix for multicompany	2017-03-04 21:02:27 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
Laurent Destailleur	4929ba16c4	Fix on contract card, we must show title in add entry form.	2017-03-03 13:14:59 +01:00
Laurent Destailleur	40b412728f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-28 11:49:10 +01:00
Laurent Destailleur	79c9745442	Fix size of fields	2017-02-28 11:00:11 +01:00
BENKE Charlie	a12a094172	$usemargins not used on global because it's defined on the tpl file (line 42)	2017-02-15 01:11:25 +01:00
Laurent Destailleur	e1a6e6e4ab	Rename "attributes" into "variants" to avoid confusion with extrafields	2017-02-08 12:37:38 +01:00
Laurent Destailleur	b24f244f67	Merge pull request #5533 from marcosgdf/prod-attr Feature Request: NEW Added product attributes feature	2017-02-08 11:20:33 +01:00
Laurent Destailleur	b611c5ca53	Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received NEW Develop new reduc on excess received	2017-02-08 11:16:10 +01:00
Marcos García de La Fuente	d06fb423c0	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/langs/en_US/products.lang	2017-02-02 20:07:41 +01:00
Laurent Destailleur	c3fb559d3b	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modProduct.class.php	2017-02-01 20:58:17 +01:00
Laurent Destailleur	aaa2e393c3	Fix css	2017-01-31 16:17:10 +01:00
Laurent Destailleur	d7c2bdba38	Fix: link was useless with a nofollow tag.	2017-01-29 16:42:59 +01:00
Laurent Destailleur	fd90bf466b	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/societe/soc.php	2017-01-28 15:12:14 +01:00
Laurent Destailleur	4bce208035	FIX detail of deposit and credit not was not visible into final invoice	2017-01-28 12:42:02 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Marcos García de La Fuente	d09a3628c5	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/compta/facture.php	2017-01-14 23:59:14 +01:00
Laurent Destailleur	2c6672d17a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/login.tpl.php	2017-01-12 11:32:51 +01:00
Laurent Destailleur	c42b48636a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/commande/class/api_commande.class.php htdocs/core/class/CMailFile.class.php htdocs/societe/class/api_contact.class.php	2017-01-12 11:06:24 +01:00
Laurent Destailleur	3d8c5b377b	Fix string not translated	2017-01-12 10:16:19 +01:00
IJ	635abe58be	User-friendly tooltip	2017-01-09 10:14:11 +00:00
Laurent Destailleur	1d291ee0e8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-07 17:07:29 +01:00
Laurent Destailleur	005a40c105	Fix css on login page. Pb with autocomplete-autofill.	2017-01-07 14:17:35 +01:00
Laurent Destailleur	b5c815367c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-26 15:44:31 +01:00
Marcos García de La Fuente	5669f734b8	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/comm/propal/card.php # htdocs/commande/card.php # htdocs/compta/facture.php # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/commande/card.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-12-24 21:39:40 +01:00
Laurent Destailleur	43942e6ea2	Fix css and fix navigation on resource tab.	2016-12-23 13:04:46 +01:00
Laurent Destailleur	ba7ca3da6e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 Conflicts: htdocs/core/photos_resize.php htdocs/install/mysql/data/llx_c_action_trigger.sql	2016-12-22 17:57:42 +01:00
Laurent Destailleur	26098082d0	NEW Uploaded files are indexed into database	2016-12-20 22:14:27 +01:00
Laurent Destailleur	ed0ffd6f5a	NEW Uploaded files are indexed into database	2016-12-20 19:42:25 +01:00
Laurent Destailleur	f762c98a37	Fix html not balanced	2016-12-18 11:27:22 +01:00
Laurent Destailleur	12e919b99d	Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin Fix user right write margin	2016-12-18 10:53:34 +01:00
Laurent Destailleur	78bf209119	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-18 02:21:57 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
phf	cca7967144	Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin	2016-12-15 16:19:54 +01:00
phf	21a648a052	Fix user right on margin module to write buyprice	2016-12-15 12:01:46 +01:00
Laurent Destailleur	902169cb66	Can sort on position on list of documents	2016-12-13 00:40:12 +01:00
Laurent Destailleur	e1a5a90f0a	NEW Uploaded files are indexed into database	2016-12-13 00:15:21 +01:00
Maxime Kohlhaas	ac41b61ad8	Empty inputs when editing line	2016-12-11 10:48:49 +01:00
Maxime Kohlhaas	b1d5f2689a	Fix colspan missing	2016-12-10 16:45:52 +01:00
fappels	bbbc768fa7	Change filter parameter to string with comma seperated values Change warehousefilter from int to string with comma seperated values for selectWarehouses and select_produits form functions.	2016-12-06 20:07:19 +01:00
fappels	c911f906c8	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-12-05 11:36:20 +01:00
Laurent Destailleur	788cbf9a01	Complete work on dol_banner on contracts	2016-12-04 13:30:17 +01:00
Laurent Destailleur	2b8fbf200a	Complete work on the new dol_banner	2016-12-03 21:29:49 +01:00
fappels	c697141851	hide products in closed warehouse, but show products for internal transfer Products only for internal transfer should be sellable (for example, they can have virtual stock)	2016-12-02 12:22:09 +01:00
fappels	2d4807190e	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status	2016-11-30 13:03:24 +01:00
fappels	49442c0b7f	Add filter on warehouse status to object line product list	2016-11-30 13:03:17 +01:00
gauthier	9a1309256d	Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received	2016-11-28 17:13:09 +01:00
Laurent Destailleur	e59edca855	Fix Responsive design	2016-11-27 20:55:59 +01:00
Marcos García de La Fuente	cf0ee36150	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-11-27 18:10:01 +01:00
Laurent Destailleur	2e5634e60f	Fix responsive design	2016-11-27 14:21:23 +01:00
gauthier	c433829d27	NEW : interface	2016-11-25 11:04:42 +01:00
Laurent Destailleur	fe9c880984	NEW Add missing unique key on table llx_links	2016-11-10 14:24:29 +01:00
Laurent Destailleur	cc64994f30	Better responsive design	2016-11-10 11:33:25 +01:00
Laurent Destailleur	3346fb1c75	Fix can change type from url to other string	2016-11-08 17:30:48 +01:00
Laurent Destailleur	fcca3d6be1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-11-08 17:21:41 +01:00
Laurent Destailleur	6d70d39bbd	NEW Add type "url" as possible extrafield.	2016-11-08 17:21:26 +01:00
Laurent Destailleur	a28e2a7fb6	Merge pull request #5863 from benlo06/fr_total_tva New: Permit to print TotalTTC price in objectline_view	2016-11-08 14:46:16 +01:00
Marcos García de La Fuente	1c15cfa722	Adapted code to new changes	2016-11-06 15:17:41 +01:00
Marcos García de La Fuente	286095f5cd	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/fourn/facture/card.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-11-06 15:01:40 +01:00
Laurent Destailleur	e9edbba093	NEW Usage of vat code seems ok everywhere.	2016-10-29 21:02:08 +02:00
Benoit	a46e7d8e1a	Change inputalsopricetotalwithtax to outputalsopricetotalwithtax	2016-10-24 10:18:24 +02:00
Benlo	4ebd1ff8a2	Permit to print Total TTC price in objectline	2016-10-12 12:30:22 +02:00
Laurent Destailleur	8755fa07af	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/main.inc.php	2016-10-11 12:35:14 +02:00
Laurent Destailleur	b2afe98060	Fix option unique of extrafields not saved	2016-10-11 12:20:14 +02:00
Laurent Destailleur	ee252f549a	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog dev/skeletons/skeleton_list.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/lib/cron.lib.php htdocs/core/tpl/admin_extrafields_add.tpl.php	2016-10-01 18:42:50 +02:00
Laurent Destailleur	4dfdf29a55	FIX #5742 error on project list if an extra field separator is added.	2016-10-01 18:00:17 +02:00
Laurent Destailleur	d4e324d15a	Merge remote-tracking branch 'origin/4.0' into develop Conflicts: htdocs/compta/facture.php	2016-09-21 18:38:30 +02:00
Laurent Destailleur	494d4783a7	Fix tab works when editing prices	2016-09-21 18:13:27 +02:00
Laurent Destailleur	1c15539bb4	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-09-21 01:27:25 +02:00
Laurent Destailleur	c4c7ccc226	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/societe/note.php htdocs/societe/rib.php	2016-09-19 14:05:16 +02:00
Laurent Destailleur	af28a67803	Uniformize look using dol_banner	2016-09-19 10:43:30 +02:00
Laurent Destailleur	5fb55cc9de	Fix css	2016-09-18 22:00:59 +02:00
Laurent Destailleur	46ce1d3a69	Uniformize code	2016-09-18 16:11:30 +02:00
Laurent Destailleur	aa59420413	FIX #5712 #5751	2016-09-14 19:48:57 +02:00
Raphaël Doursenaud	1d95720644	Fixed product description field name in line edit. The POST value 'desc' was never evaluated and caused fields to blank out on update action.	2016-09-13 11:38:57 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00
Laurent Destailleur	9ff1809f85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php	2016-09-12 02:05:38 +02:00
Laurent Destailleur	1bb278a587	Fix #5712	2016-09-11 23:01:04 +02:00
Laurent Destailleur	5fdca121aa	NEW Can renamed attached files on products and expense reports	2016-09-07 01:54:16 +02:00
Marcos García de La Fuente	05728075d6	Merge branch 'develop' into prod-attr # Conflicts: # htdocs/core/class/html.form.class.php # htdocs/core/tpl/objectline_create.tpl.php # htdocs/install/mysql/migration/3.9.0-4.0.0.sql # htdocs/install/mysql/migration/4.0.0-5.0.0.sql	2016-09-06 21:06:33 +02:00
BENKE Charlie	ae8f64494d	fix : extrafield required & defaut value disabled When type "separate" is selected, required & defaut value fields are disabled and we can't not enable it.	2016-08-01 09:56:41 +02:00
Laurent Destailleur	00118610bb	A fix to make editinplace working better	2016-07-28 15:29:46 +02:00
Laurent Destailleur	4e3dd4c927	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-07-28 14:38:22 +02:00
Laurent Destailleur	e8b5fc5d06	Fix css to add bold border must be forced only when not previously done	2016-07-28 14:37:36 +02:00
Laurent Destailleur	aae2086ada	Move notes on dedicated tabs like other elements. Rename also the note available into translation tab into "other" to avoid confusion because it was not the same usage.	2016-07-28 13:53:17 +02:00
Marcos García de La Fuente	c082505021	NEW Added product attributes feature	2016-07-24 11:27:52 +02:00
florian HENRY	22f028d101	FIX hidden extrafield feature edit	2016-07-05 09:05:10 +02:00
Laurent Destailleur	4708f0114c	Clean code	2016-06-29 10:05:05 +02:00
Laurent Destailleur	8356dd1080	Fix minor	2016-06-20 10:22:08 +02:00
Laurent Destailleur	34c741bf0d	FIX CSS and responsive behaviour (feature with a menu hider is on on smarpthone)	2016-06-17 16:28:16 +02:00
Laurent Destailleur	c7065cc3b8	Minor esthetic fixes	2016-06-07 13:15:38 +02:00
Laurent Destailleur	4298b685d3	Fix css	2016-05-19 20:58:14 +02:00
Laurent Destailleur	afdef9a328	Add css	2016-05-19 18:52:22 +02:00
Laurent Destailleur	901c7c9517	Link "Backtolist" was missing on products	2016-05-17 02:16:28 +02:00
Laurent Destailleur	606b7ef666	Revert "fix:erroneous form tag" This reverts commit `3093105cd0`.	2016-05-07 20:18:46 +02:00
abb	3093105cd0	fix:erroneous form tag	2016-05-06 11:20:07 +01:00
Laurent Destailleur	2960fb6df7	FIX Option not tested everywhere	2016-05-05 23:28:22 +02:00
Florian HENRY	fda5e6002f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/websites/index.php	2016-05-02 20:27:34 +02:00
Laurent Destailleur	f747018fb6	Clean dead code FIX when editing price with tax, reset price without so i will be recalculated.	2016-04-30 14:24:33 +02:00
Laurent Destailleur	8fe799f424	Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr into aternatik-dol_resource Conflicts: dev/initdata/img/printcompany.png htdocs/compta/bank/card.php	2016-04-29 17:51:11 +02:00
Florian HENRY	1d75c5f720	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2016-04-27 09:41:42 +02:00
Laurent Destailleur	78cda5dc07	Fix problem with code of reccuring invoices	2016-04-26 22:00:41 +02:00
Florian HENRY	8d91523619	NEW : Enabled feature hidden extrafeilds	2016-04-26 14:17:20 +02:00
Laurent Destailleur	c73f4e5d7b	FIX Project was lost when creating invoice from a template Can set project on invoice during creation of invoice from a template Replace duplicated code to show lines with mutualized code	2016-04-24 20:00:00 +02:00
Laurent Destailleur	00a658143d	NEW List of user in agenda view per user show photo thumb	2016-04-23 16:51:22 +02:00
Laurent Destailleur	1de36d6501	Merge pull request #5011 from altatof/supplierorder_noprice NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED	2016-04-22 18:27:42 +02:00
Juanjo Menent	bff1ec2d80	Merge remote-tracking branch 'upstream/3.9' into develop	2016-04-15 13:49:59 +02:00
Juanjo Menent	8751f6cfa0	Merge pull request #4998 from FHenry/3.9 FIX Hook resprint must be printed	2016-04-15 13:05:40 +02:00
Christophe Battarel	c3d4cd85f1	NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier order even if no supplier price defined	2016-04-15 12:28:35 +02:00
Laurent Destailleur	8d46d76f96	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:05:18 +02:00
Laurent Destailleur	e61c83d708	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/fourn/facture/paiement.php	2016-04-12 15:03:19 +02:00
Laurent Destailleur	8342a61ea9	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/core/tpl/objectline_edit.tpl.php htdocs/fourn/class/fournisseur.product.class.php htdocs/fourn/facture/card.php htdocs/product/composition/card.php	2016-04-12 15:00:02 +02:00
Florian HENRY	872c99afe9	FIX Hook resprint be printed	2016-04-12 11:35:39 +02:00
Laurent Destailleur	22bfa7a9e2	Add logs	2016-04-08 21:50:48 +02:00
Laurent Destailleur	6a4ca98ad9	Merge pull request #4908 from altatof/fix_bad_rounding FIX: systematic rounding causes prices to be updated without reason	2016-04-04 00:18:18 +02:00
Laurent Destailleur	e1bec46a34	FIX The include file for action on files should not be a template file but an action include file.	2016-04-02 14:16:16 +02:00
Laurent Destailleur	a36abd43fd	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-30 16:27:14 +02:00
Laurent Destailleur	7146a8319b	FIX Each time we edit a line, we loose the unit price.	2016-03-30 16:26:34 +02:00
Christophe Battarel	024f55d461	FIX: systematic rounding causes prices to be updated without reason	2016-03-29 12:02:36 +02:00
Laurent Destailleur	91caea5707	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
Laurent Destailleur	630f5a632d	Revert "Corrected non-static usages of Form::selectarray function" This reverts commit `87cd6e1e40`.	2016-03-25 15:34:37 +01:00
Laurent Destailleur	26de415b77	Revert commit that break compatibility of 100% of modules	2016-03-25 15:24:57 +01:00
Marcos García de La Fuente	89bd173c2f	NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate	2016-03-21 21:51:29 +01:00
Marcos García de La Fuente	5a046125db	Missing changes from previous commits	2016-03-20 14:24:49 +01:00
Marcos García de La Fuente	4d78932fe8	NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions	2016-03-20 14:15:21 +01:00
Marcos García de La Fuente	87cd6e1e40	Corrected non-static usages of Form::selectarray function	2016-03-20 14:15:17 +01:00
Laurent Destailleur	cd687f57d6	NEW Can change type of extrafields for some combinations.	2016-03-17 21:58:51 +01:00
Ion Agorria	4300ca8bdc	Use isset instead of !empty in default date	2016-03-04 00:50:47 +01:00
Ion Agorria	6feaaf906c	NEW: Configurable default hour and min in date start/end	2016-03-03 16:11:42 +01:00
Laurent Destailleur	c197ce31b6	NEW Add the admin info on combo of type of contact	2016-02-29 13:24:59 +01:00
Laurent Destailleur	972d95a3c6	Better translation for nature of contact	2016-02-29 13:21:09 +01:00
Laurent Destailleur	1fa94e4d6a	NEW Introduce position of records into dictionnary of type of contacts	2016-02-26 15:03:07 +01:00
Laurent Destailleur	14fb2c914a	Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output	2016-02-16 15:41:55 +01:00
Laurent Destailleur	060b59ac6c	Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output	2016-02-16 15:38:24 +01:00
Laurent Destailleur	d2708a4225	Merge pull request #4475 from atm-ph/new_multicurrency_module New multicurrency module	2016-02-08 14:44:49 +01:00
Laurent Destailleur	2e1011ca0c	Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that seems useless.	2016-02-06 12:29:02 +01:00
Laurent Destailleur	cb66448148	Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields NEW feature hidden extrafields	2016-02-05 17:22:51 +01:00
Laurent Destailleur	5a2647906e	Merge pull request #4530 from defrance/patch-96 Add hook on contacttpl	2016-02-05 10:50:40 +01:00
phf	32c0b2a9b1	NEW add html id/class to locate value in the DOM html	2016-02-04 21:05:19 +01:00
BENKE Charlie	87c5854382	just change for rerun travis cheking	2016-02-04 16:58:19 +01:00
phf	75c4888364	NEW feature hidden extrafields	2016-02-03 22:49:43 +01:00
phf	1b552a0b3b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module Conflicts: htdocs/core/class/link.class.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-03 18:30:59 +01:00
Laurent Destailleur	47e2e33fb7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/admin/index.php htdocs/accountancy/admin/productaccount.php htdocs/accountancy/class/html.formventilation.class.php htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/menus/init_menu_auguria.sql	2016-02-03 03:27:17 +01:00
Laurent Destailleur	229199aaad	FIX #4497	2016-02-03 01:32:50 +01:00
BENKE Charlie	324c1123e0	Update contacts.tpl.php if permission modules right are not in french	2016-01-30 17:21:42 +01:00
BENKE Charlie	d79478e66d	Add hook on contacttpl The goal is to display additionnal feature a the bottom of the contact page like display contact adress and print stamp directly Another way is to show on a google maps the travel to do between us and the multiple thirdpartie present	2016-01-30 09:43:02 +01:00
phf	83f90e2b1f	Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module Conflicts: htdocs/commande/card.php	2016-01-25 21:50:43 +01:00
phf	8e933ebb2d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module	2016-01-25 19:31:35 +01:00
phf	e86ebd6799	NEW add multicurency on customer order	2016-01-23 00:38:17 +01:00
Laurent Destailleur	93b2013aa7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/compta/bank/card.php htdocs/projet/tasks/list.php	2016-01-22 03:29:55 +01:00
Laurent Destailleur	cceeefb7c2	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/societe/index.php	2016-01-22 03:25:30 +01:00
Laurent Destailleur	cbd01bae49	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/admin/dict.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/societe/index.php	2016-01-22 03:18:51 +01:00
phf	8487058c98	FIX add input multicurrency_subprice on edit line	2016-01-21 21:54:57 +01:00
phf	f7afbcff68	NEW integration of multicurrency module (creation fields in database and admin) NEW add multicurrency_code on create, update and fetch company object NEW add multicurrency on propal FIX travis FIX back quote into sql file	2016-01-21 21:38:52 +01:00
jfefe	7c4a9d140b	Replace reserved keyword "Resource" by "DolResource" # Conflicts: # htdocs/resource/list.php	2016-01-21 11:26:21 +01:00
Laurent Destailleur	988c0131d2	Fix: markRate can be 100	2016-01-21 11:20:27 +01:00
Laurent Destailleur	d396612a7c	NEW: Add a new method for margin calculation. Added margin on "cost price" to margin on WAP price and margin on "best supplier price".	2016-01-13 12:48:59 +01:00
Laurent Destailleur	801e2bca4b	Fix #4239	2016-01-10 18:42:35 +01:00
Laurent Destailleur	cdaccf7c4b	Fix: markRate can be 100	2016-01-10 18:28:50 +01:00
Laurent Destailleur	b2924885aa	Fix css	2016-01-09 03:00:12 +01:00
Laurent Destailleur	d5fa91f7ba	Fix several bugs in css and in jmobile usage	2016-01-02 20:48:19 +01:00
Laurent Destailleur	b179a193dd	Fix param for username is $username and not $login	2015-12-21 03:01:37 +01:00
Laurent Destailleur	a2ae9b9cfc	Fix forget password page must have a different title then login page Fix Missing translations	2015-12-21 00:47:44 +01:00
cla	cb96618460	Merge branch 'develop' into develop_sunimport	2015-12-18 10:49:57 +01:00
cla	ef487c48a4	NEW Extrafields for: - expedition, expeditiondet, livraison, livraisondet	2015-12-16 16:18:29 +01:00
Laurent Destailleur	dc6ec91b2c	Merge pull request #4183 from IonAgorria/patch-3 JS error preventing hiding of dates at object line	2015-12-13 19:57:37 +01:00
Ion Agorria	26b85d7cac	Remove unnecesary variable	2015-12-11 18:28:55 +01:00
Ion Agorria	f34fb0d82d	More consistent check	2015-12-11 03:09:09 +01:00
Raphaël Doursenaud	3e2309d0e6	NEW Factorized price2numjs into lib_head.js.php Used public domain code from the MDN to provide a robust decimal rounding implementation. Warning for developers: the path of the javascript file has changed. Please update your scripts.	2015-12-10 17:03:00 +01:00
Ion Agorria	ceb2920769	Better undefined CKEDITOR fix	2015-12-10 14:17:08 +01:00
Ion Agorria	bbfd138896	Missed another CKEDITOR ref	2015-12-09 18:00:05 +01:00
Ion Agorria	238f977002	JS error preventing hiding of dates at object line The "if (CKEDITOR)" gives "ReferenceError: CKEDITOR is not defined" at JS console causing the next code to don't execute, is this code obsolete?	2015-12-08 15:45:24 +01:00
Raphaël Doursenaud	3f9efc537b	FIX #3953 Don't round supplier price The price is already rounded when inserted on the product page. It's also rounded at display. There's no need to round it here. Rounding it leads to serious calculation errors.	2015-12-07 14:35:04 +01:00
Raphaël Doursenaud	2cf36d157f	FIX #3953 Don't round supplier price The price is already rounded when inserted on the product page. It's also rounded at display. There's no need to round it here. Rounding it leads to serious calculation errors.	2015-12-07 14:24:24 +01:00
Laurent Destailleur	ff4f1e7a5b	Debug 3.9	2015-12-05 19:20:39 +01:00
fappels	4a0ea97772	FIX #3953 rounding of buying price fix javascript for rounding of buying price	2015-11-29 15:34:43 +01:00
Laurent Destailleur	cb3765bc92	Debug module Resource	2015-11-22 12:23:10 +01:00
philippe grand	55bab28b9c	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-11-21 17:15:56 +01:00
Laurent Destailleur	548ff26628	Focus on textarea works also when ckeditor is on	2015-11-21 13:42:01 +01:00
Laurent Destailleur	2a345b6fc0	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php	2015-11-21 12:48:41 +01:00
philippe grand	928c44b04f	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-11-21 04:52:19 +01:00
Florian HENRY	4ff0c22e29	continue extrafield ID filter	2015-11-20 13:22:45 +01:00
philippe grand	4f280f63d0	[Qual] Uniformize code	2015-11-19 13:59:58 +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	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	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	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
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
Laurent Destailleur	98c32fa1ec	FIX The label hidden was not supported when using jmobile	2015-11-10 00:36:33 +01:00
Marcos Garcí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
Marcos Garcí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 García de La Fuente	8ccb8c92e0	FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates Close #3897	2015-11-07 14:29: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
Raphaël Doursenaud	b0cf9bd0be	Fix #3864 Really fixed invalid jQuery code	2015-11-05 14:38:11 +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	77371af35a	FIX #3661 Margin is not selected correctly when adding a product	2015-11-05 01:08:30 +01:00
Raphaël Doursenaud	69ac75bef8	Fix #3864 Fixed invalid jQuery code	2015-11-04 22:55:14 +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	f928062e2b	FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO	2015-11-02 17:56:32 +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	8306d93286	NEW Add css on column of detail lines to allow module to easily manipulate fields.	2015-10-20 16:08:25 +02:00
Laurent Destailleur	0c6441df74	FIX Using extrafield with type "Link to object" works correctly.	2015-10-20 12:40:37 +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	b43047bc2f	Use the new banner on all tabs of contacts	2015-10-15 14:13:31 +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	0ba6bdb7c2	CSS enhancement	2015-10-11 13:26:22 +02:00
Raphaël Doursenaud	485c369d55	[Qual] Replaced deprecated form_confirm()	2015-09-24 21:10: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	378da082bd	Fix selector or margin with jmobile	2015-09-18 20:43:10 +02:00
Laurent Destailleur	9cbd236c8c	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/filefunc.inc.php	2015-09-16 22:09:21 +02:00
Laurent Destailleur	313d9ddacd	FIX #3534	2015-09-16 22:04:03 +02:00
Laurent Destailleur	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	77ef046af4	Start to mutualize the builddoc and remove_file action.	2015-09-06 14:02:21 +02:00
Laurent Destailleur	6a9933d9af	Update doc	2015-09-05 10:49:55 +02:00
Laurent Destailleur	278e90cf0a	Fix same pb than #3297 with vat edit	2015-08-31 13:06:53 +02:00
Juanjo Menent	25fca6615a	Merge pull request #3395 from fmarcet/develop NEW: Translate extrafield's labels	2015-08-28 16:44:49 +02:00
Laurent Destailleur	c3fb14855b	Try a better fix to replace PR #3297	2015-08-20 14:34:48 +02:00
Laurent Destailleur	26e3fcc636	Try a better fix to replace PR #3297	2015-08-20 03:38:21 +02:00
fmarcet	d6b84233ed	NEW: Translate extrafield's labels	2015-08-18 16:40:03 +02:00
Laurent Destailleur	f3c4e20db2	Fix centering of message on logon page	2015-08-15 03:41:57 +02:00
Laurent Destailleur	6c01403ef3	Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr into IonAgorria-resources-fixes Conflicts: htdocs/core/tpl/resource_add.tpl.php htdocs/resource/element_resource.php	2015-08-14 17:53:52 +02:00
Laurent Destailleur	2abb90713e	Fix list of resource not visible	2015-08-14 17:35:05 +02:00
Ion Agorria	2e1e9017c6	Missed the file	2015-08-12 22:00:51 +02:00
Juanjo Menent	95e8148f78	Merge pull request #3294 from GPCsolutions/totalvalidator Totalvalidator	2015-08-10 20:56:31 +02:00
Laurent Destailleur	5cea60cf58	Default price for margin was not set	2015-07-28 19:39:42 +02:00
Raphaël Doursenaud	eecc0c14b3	Qual: prefer title to summary for tables Summary is being deprecated in HTML5	2015-07-24 11:41:22 +02:00
Raphaël Doursenaud	fea3957734	Qual: use CSS centering	2015-07-24 11:41:22 +02:00
Raphaël Doursenaud	95ca9cef75	Qual: use CSS vertical alignment	2015-07-24 11:41:22 +02:00
Raphaël Doursenaud	f63f66d681	Qual: prefer CSS centering	2015-07-24 11:41:22 +02:00
Raphaël Doursenaud	bd937070d2	Accessibility: added login form hidden labels	2015-07-24 11:41:22 +02:00
Raphaël Doursenaud	7398104f33	Qual: Ignore logo by assistive technology. http://www.w3.org/TR/WCAG20-TECHS/H67.html	2015-07-24 11:40:24 +02:00
Laurent Destailleur	2f2b0df6f8	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/contact/exportimport.php htdocs/contact/info.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modSociete.class.php htdocs/core/tpl/document_actions_pre_headers.tpl.php htdocs/langs/fr_FR/categories.lang htdocs/main.inc.php htdocs/product/reassort.php htdocs/projet/list.php htdocs/societe/info.php	2015-07-19 12:26:31 +02:00
Laurent Destailleur	1fb40565f4	Fix bad parameters of function select_date	2015-07-12 12:50:24 +02:00
Marcos García de La Fuente	cba902c5ae	Fix: [ bug #3055 ] Product image thumbnails were not deleted after deleting the image Close #3055	2015-07-07 09:40:23 +02:00
aspangaro	e363b20e85	Forms are using the tab look, even in creation mode	2015-06-30 06:31:09 +02:00
Regis Houssin	c05bf7e977	New: Possibility to add javascript in main login page with "getLoginPageOptions" hook	2015-06-26 19:37:37 +02:00
Laurent Destailleur	1485ead215	Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate option to get same behaviour.	2015-06-24 21:36:28 +02:00
Marcos García de La Fuente	1e05262884	Corrected Timezone detection by using jstz external library	2015-06-16 21:19:58 +02:00
Laurent Destailleur	87e07a3038	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog htdocs/compta/bank/virement.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/card.php htdocs/societe/soc.php	2015-06-14 17:18:45 +02:00
Laurent Destailleur	a7cec18081	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/categories/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/upgrade2.php htdocs/product/liste.php	2015-06-14 17:11:36 +02:00
Marcos García de La Fuente	6514f418e5	Fix [ bug 1852 ] JS error when editing a customer order line	2015-06-13 11:46:35 +02:00
Marcos García de La Fuente	ea625628ce	Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers	2015-06-13 03:39:06 +02:00
Laurent Destailleur	9b7982bf0c	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/fourn/facture/card.php htdocs/theme/eldy/style.css.php	2015-06-08 18:28:50 +02:00
Laurent Destailleur	e9526066b7	Prepare edition of field "bydefaultinlist" for extrafields.	2015-06-08 14:12:57 +02:00
Regis Houssin	9a812a6c28	Fix: add filter for "dol_most_recent_files" for avoid conflict with option "Save file on server with name "FA0700034-Original filename""	2015-06-06 13:03:02 +02:00
Laurent Destailleur	49f2157f2d	Little debug of module resource	2015-05-31 02:05:39 +02:00
Laurent Destailleur	65c7ab7a93	Fix: Introduce error by default when function is used as a true delete function.	2015-05-29 17:11:42 +02:00
Laurent Destailleur	6f5a30638c	NEW On page to see/edit contact of an ojbect, the status of contact is visible (for both external and internal users).	2015-05-22 12:21:36 +02:00
Laurent Destailleur	4408648a68	Merge pull request #2817 from GPCsolutions/jqueryfixes jQuery fixes	2015-05-12 22:36:12 +02:00
Raphaël Doursenaud	aee61aa2c4	[Qual] Fixed deprecated HTML nowrap attribute to class	2015-05-12 15:37:35 +02:00
Raphaël Doursenaud	ce60ae0fcc	[Qual] Fixed HTML readonly attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The readonly attribute is boolean.	2015-05-12 15:09:26 +02:00
Raphaël Doursenaud	e149d49fb8	[Qual] Use jQuery property instead of attribute to test and set disabled	2015-05-12 14:53:01 +02:00
Raphaël Doursenaud	0d8641a073	[Qual] Use jQuery property instead of attribute to test and set checked	2015-05-12 14:51:30 +02:00
Raphaël Doursenaud	b8d9c20731	[Qual] Fixed HTML input form disabled attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form disabled attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	859d1b0df9	[Qual] Fixed HTML input form checked attribute Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form checked attribute should not have a value.	2015-05-07 14:21:14 +02:00
Laurent Destailleur	4e04f75c66	Fix css	2015-04-27 02:33:44 +02:00
Laurent Destailleur	96a33bbe8a	First clean of code after devcamp	2015-04-21 15:49:58 +02:00
Marcos García de La Fuente	2967bc7df7	Merge branch 'develop' into units	2015-04-19 17:19:59 +02:00
Marcos García de La Fuente	7be7a770c1	Implemented units for CommandeFournisseur and FactureFournisseur	2015-04-19 16:46:24 +02:00
Maxime Kohlhaas	e692950627	Fix : multi upload of files in document tabs	2015-04-19 04:04:43 +02:00
Marcos García de La Fuente	87f97ed545	Merge branch 'develop' into units Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php	2015-04-18 23:38:14 +02:00
Maxime Kohlhaas	c3bcda74f3	Fix : unit price without tax is now subprice (not pu_ht)	2015-04-18 19:17:05 +02:00
Laurent Destailleur	e1403b136c	Merge pull request #2639 from aternatik/stable_resource New : mark resource module as stable	2015-04-18 18:48:24 +02:00
jfefe	f2e19f2326	Fix: error when deleting resource	2015-04-18 18:07:59 +02:00
philippe grand	eaf0fda6aa	fix syntax errors	2015-04-18 18:07:41 +02:00
Laurent Destailleur	ce81f58986	Fix several bugs into edit of supplier lines	2015-04-18 16:54:00 +02:00
Maxime Kohlhaas	3073aab48b	Fix : discount were not working anymore on supplier order and bill	2015-04-17 23:31:51 +02:00
Laurent Destailleur	5dc1102601	Fix object not defined	2015-04-13 13:34:13 +02:00
Laurent Destailleur	ae103e34b8	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/debian/changelog htdocs/compta/facture.php htdocs/core/lib/price.lib.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/opensurvey/public/studs.php htdocs/projet/element.php	2015-04-13 13:08:46 +02:00
Laurent Destailleur	44f10ebec2	Fix: do not add new value	2015-04-13 13:01:23 +02:00
Marcos García de La Fuente	7075ac74c4	Merge branch 'develop' into units Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/class/product.class.php	2015-04-03 15:45:54 +02:00
Laurent Destailleur	69eaa032bf	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-03 01:10:55 +02:00
Laurent Destailleur	98b1d6170d	Fix style fieldrequired must be used only in create/edit mode.	2015-04-03 01:07:17 +02:00
Laurent Destailleur	b83e9ea32f	Merge branch 'loan' of https://github.com/frederic34/dolibarr into frederic34-loan Conflicts: htdocs/compta/bank/ligne.php	2015-03-30 02:56:26 +02:00
Marcos García de La Fuente	3d50b41b8e	Reverted $rowid instead of $id property	2015-03-23 01:40:33 +01:00
Marcos García de La Fuente	4349f27299	Revert "Revert "Refactor 1""	2015-03-23 01:39:12 +01:00
Laurent Destailleur	1a1959b52c	Fix: Solve conflict with imgup and imgdown class use for sort fields and to drag and drop lines.	2015-03-22 21:18:25 +01:00
Laurent Destailleur	2d90256640	Revert "Refactor 1"	2015-03-22 12:51:29 +01:00
Laurent Destailleur	a79a779b04	Merge pull request #2456 from marcosgdf/refactor-1 Refactor 1	2015-03-22 12:47:05 +01:00
Laurent Destailleur	a55af4387b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: .travis.yml htdocs/core/class/notify.class.php htdocs/product/stock/class/mouvementstock.class.php test/phpunit/AllTests.php test/phpunit/MouvementStockTest.php	2015-03-22 12:10:39 +01:00
Laurent Destailleur	b8ed553365	We must keep the @, some tools use it to know it is login page.	2015-03-21 01:08:29 +01:00
Laurent Destailleur	166fda4909	Normalize class names	2015-03-17 11:26:23 +01:00
Marcos García de La Fuente	086e439543	Merge branch 'develop' into refactor-1 Conflicts: htdocs/core/tpl/objectline_view.tpl.php	2015-03-15 18:16:55 +01:00
Marcos García de La Fuente	efb9f7f4fd	Merge branch 'develop' into refactor-1 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/includes/tcpdi/fpdf_tpl.php	2015-03-15 18:07:30 +01:00
aspangaro	d69f066735	QUAL: Traduce terms + remove <center>	2015-03-15 14:04:07 +01:00
BENKE Charles	9e62013bca	Update admin_extrafields_edit.tpl.php add new type of extrafields : link	2015-03-14 12:44:26 +01:00
BENKE Charles	4783db82ac	Update admin_extrafields_add.tpl.php new type of extrafield : link	2015-03-14 12:42:52 +01:00
Laurent Destailleur	687e3d250b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: dev/fixdosfiles.sh htdocs/core/tpl/objectline_edit.tpl.php	2015-03-13 17:46:31 +01:00
Laurent Destailleur	a452823e1e	Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility with 3.6	2015-03-13 15:20:08 +01:00
Laurent Destailleur	a5645b626c	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/tpl/objectline_view.tpl.php htdocs/projet/element.php	2015-03-11 03:55:46 +01:00
Laurent Destailleur	c1432eb2da	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/salaries/fiche.php htdocs/projet/element.php	2015-03-11 03:29:52 +01:00
Laurent Destailleur	548e720ca2	Uniformize code	2015-03-10 19:31:04 +01:00
Estephe L.	9d320e4268	Fix Anchor link for quick access when editing. This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...	2015-03-08 23:29:09 +01:00
Laurent Destailleur	a1567778ab	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/commande/card.php	2015-03-06 18:51:55 +01:00
Laurent Destailleur	a169b3348e	Fix show alays date fields for contract module. Fix select of product were lost.	2015-03-06 14:36:22 +01:00
Laurent Destailleur	96de912661	NEW: Add module "Supplier commercial proposals" to requests quotation/price to suppliers. Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into atm-ph-new_ask_price Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/html.formfile.class.php htdocs/core/tpl/document_actions_post_headers.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 17:54:43 +01:00
Marcos García de La Fuente	174f1cb5f7	Refactored supplier invoice line view to fit commonobjectline view	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	b84cf4afac	Renamed FactureFournisseurLine to SupplierInvoiceLine	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	4c08d34bb5	Standardized $rowid as property	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	b4c84fac9d	NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-03-01 12:42:38 +01:00
Laurent Destailleur	b888a04af9	Reduce a lot of duplicate code. Move all tables of extrafields setup into a tpl file.	2015-02-28 20:14:26 +01:00
Laurent Destailleur	4d226885cb	Rewrite code for supplier order and invoice to use shared code of customer supplier and invoice. Work on extrafield for supplier order and invoice.	2015-02-28 18:10:31 +01:00
Laurent Destailleur	ef14e4e7ed	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/fourn/class/fournisseur.product.class.php	2015-02-28 03:11:15 +01:00
Laurent Destailleur	5d1545ad1f	Work on supplier order and customer extrafields Use templates to show/edit supplier order and invoice lines	2015-02-27 18:05:12 +01:00
Laurent Destailleur	070accd1e0	Work on new module expense report	2015-02-21 12:57:17 +01:00
Laurent Destailleur	e3885d6d73	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/lib/tax.lib.php	2015-02-10 21:36:38 +01:00
Laurent Destailleur	ddb95e5765	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/comm/mailing/fiche.php htdocs/compta/paiement/liste.php htdocs/contact/class/contact.class.php htdocs/core/lib/tax.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/langs/en_US/agenda.lang htdocs/webservices/server_contact.php	2015-02-10 21:33:43 +01:00
Laurent Destailleur	039a184d70	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/core/tpl/objectline_edit.tpl.php	2015-02-10 21:13:12 +01:00
phf	34bc1dbc15	Merge branch 'develop' into new_ask_price	2015-02-09 09:07:50 +01:00
phf	f15d18dbb1	[CORE] ajout d'une colonne pour la référence fournisseur sur une demande de prix (#new_ask_price).	2015-02-03 15:21:10 +01:00
phf	5266542bc9	[CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price).	2015-02-02 17:50:33 +01:00
phf	d2c4e8c98f	[CORE] retrait d'une condition ajout auparavant mais qui est inutile (#new_ask_price).	2015-02-02 16:18:07 +01:00
phf	4408828af4	[CORE] ajouts des conditions pour le fonctionnement avec le module (#new_ask_price).	2015-01-29 12:13:06 +01:00
phf	a58899d354	[CORE] ajout d'une condition pour le fonctionnement du module (#new_ask_price).	2015-01-29 10:41:08 +01:00
Christophe Battarel	04f83ae4ff	FIX: always show fournprice select	2015-01-28 16:19:56 +01:00
phf	903f739449	[CORE] avancement du mercredi matin (#new_ask_price).	2015-01-28 10:33:15 +01:00
Florian HENRY	a510a1ef5c	First step add contract lines extrafields	2015-01-27 12:53:02 +01:00
Florian HENRY	22c253cfc1	add extrafield type, check box from table	2015-01-18 16:02:31 +01:00
Marcos García de La Fuente	78905c6af1	Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas	2015-01-17 20:29:51 +01:00
Laurent Destailleur	eeeb6de8d9	Merge pull request #2020 from GPCsolutions/situationsinvoices Situations invoices support	2015-01-17 14:44:05 +01:00
Laurent Destailleur	f92bc7986b	Add Weighted average price as default price for buying price for margin calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price.	2015-01-14 10:46:50 +01:00
Laurent Destailleur	033e77c04a	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/product/stock/product.php	2015-01-13 15:41:45 +01:00
Laurent Destailleur	8b3faf46db	Add PMP into selection of buy price.	2015-01-13 15:38:59 +01:00
Laurent Destailleur	e4b89779f7	Fixed: css conflict	2015-01-10 21:39:40 +01:00
Raphaël Doursenaud	50c2b75ef8	Invoices: added situation (or interim) invoices support	2015-01-06 17:12:13 +01:00
Laurent Destailleur	5ead994955	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog	2014-12-26 04:57:55 +01:00
Laurent Destailleur	40404530ba	Fixed: [ bug #1756 ] PHP error while removing an import profile	2014-12-25 12:09:00 +01:00
Marcos García de La Fuente	1179f722af	Merge branch '3.7' into bug-1533	2014-12-25 01:26:00 +01:00
Laurent Destailleur	e8addcb8ba	Fixed: [ bug #1756 ] PHP error while removing an import profile	2014-12-23 12:25:21 +01:00
Marcos García de La Fuente	8a14409974	Fix: [ bug #1533 ] Links triggers do not show trigger error message	2014-12-23 11:39:43 +01:00
Laurent Destailleur	52b64f3441	CSS	2014-12-17 13:27:44 +01:00
Laurent Destailleur	a0112ba724	Better position of elements	2014-12-11 21:38:53 +01:00
Laurent Destailleur	4d7f3cb741	Fixed: Pb of wrapping login page New: Use placeholder	2014-12-08 02:41:21 +01:00
Laurent Destailleur	d7dd496239	Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5	2014-12-08 00:09:01 +01:00
Laurent Destailleur	3186a8c23f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-12-07 12:07:53 +01:00
Laurent Destailleur	344aa40858	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: .travis.yml dev/codesniffer/ruleset.xml htdocs/core/class/conf.class.php htdocs/langs/en_US/productbatch.lang	2014-12-05 20:21:40 +01:00
Laurent Destailleur	ceba894d57	Start to work on new generation combo box.	2014-12-05 13:26:47 +01:00
Laurent Destailleur	8d405a147f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: build/debian/changelog htdocs/core/tpl/objectline_create.tpl.php	2014-12-04 15:29:45 +01:00
Laurent Destailleur	e90996b2de	Merge pull request #2121 from frederic34/patch-10 Fix missing </div>	2014-12-03 12:21:29 +01:00
Frédéric FRANCE	ddee145c66	Update objectline_view.tpl.php	2014-11-30 20:28:41 +01:00
Frédéric FRANCE	f1fa7e720a	Fix missing </div>	2014-11-30 18:33:00 +01:00
aspangaro	c27e2676e3	Modify presentation of login page	2014-11-29 07:08:35 +01:00
aspangaro	1c89186652	Merge remote-tracking branch 'Upstream/develop' into develop-html5	2014-11-28 06:20:01 +01:00
Laurent Destailleur	a724c3aa70	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/main.inc.php	2014-11-28 02:26:40 +01:00
Laurent Destailleur	a81c483061	Revert "Update objectline_create.tpl.php" This reverts commit `fdac53bfca`.	2014-11-28 02:14:25 +01:00
Laurent Destailleur	9ba5e9434d	Fix: W3C a label must be used if there is an "input" field only. Also it is recommanded to have the input inside the label tags, not outside. This solve bugs on some smatphone browsers.	2014-11-28 02:05:40 +01:00
Laurent Destailleur	d9cb9c1585	Merge pull request #2102 from aspangaro/develop-center Task 1603 - Remove <center> deprecated HTML5 tags	2014-11-27 23:58:44 +01:00
aspangaro	b98c0a3208	Login - Better presentation with RWD	2014-11-27 20:32:29 +01:00
aspangaro	38d94bac33	Correct login page	2014-11-25 21:47:08 +01:00
aspangaro	559bf93acb	Correct	2014-11-25 20:40:00 +01:00
aspangaro	c4c69e191b	Replace <center> tags	2014-11-25 20:13:43 +01:00
aspangaro	aa8c165f06	Presentation	2014-11-23 21:03:34 +01:00
BENKE Charles	fdac53bfca	Update objectline_create.tpl.php add label tags for product mode type	2014-11-19 18:53:33 +01:00
Laurent Destailleur	737dfab5b2	Fix: If error on add line of type "product" when creating proposal/order/invoice, do not show date of services.	2014-11-16 19:12:05 +01:00
Laurent Destailleur	7177c04378	Minor css enhancement	2014-11-11 20:45:30 +01:00
Laurent Destailleur	8a89997c79	Fix: bug into edition of extrafields	2014-11-07 22:40:13 +01:00
Laurent Destailleur	3d5a45e274	Fix: textarea too small	2014-11-07 22:19:31 +01:00
Laurent Destailleur	9e92b469b9	Merge pull request #2005 from altairis-fr/hidemargininfos improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option	2014-11-07 21:47:06 +01:00
Juanjo Menent	2f30e769f6	Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown	2014-11-06 22:16:27 +01:00
Christophe Battarel	44882f4035	improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option	2014-11-05 17:03:53 +01:00
Laurent Destailleur	80581b2908	Merge pull request #1978 from atm-maxime/3.6 Fix : product list was wrong on supplier invoice because fourn_id is not fetched	2014-10-30 17:56:22 +01:00
Maxime Kohlhaas	efd99a6f44	Fix : extrafield errors	2014-10-27 10:20:35 +01:00
MAxime Kohlhaas	374b761fdf	Fix : product list was wrong on supplier invoice because fourn_id is not fetched	2014-10-25 19:20:02 +02:00
Maxime Kohlhaas	ee4b807a5d	Qual : refactoring extrafields display on objects into a single tpl file	2014-10-14 17:00:06 +02:00
Maxime Kohlhaas	452636b0e4	New : Add option to allow extrafield to be modified regardless of the document status	2014-10-14 15:27:40 +02:00
Laurent Destailleur	9768550696	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: ChangeLog htdocs/categories/fiche.php htdocs/comm/action/index.php htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/fiche.php htdocs/product/composition/fiche.php htdocs/product/price.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php	2014-10-12 02:54:34 +02:00
Maxime Kohlhaas	4fd67d725a	Fix bug 1588 : relative discount not working anymore	2014-10-09 13:58:43 +02:00
Laurent Destailleur	168b0db094	Fix: button must be align to right	2014-10-08 15:09:07 +02:00
Laurent Destailleur	8bc57e38d1	Uniformize, support, install and login page with a more neutral background (nearest bootstrap). Remove image background.	2014-10-03 01:48:14 +02:00
Laurent Destailleur	74cba062b4	Add a TODO to explain why we keep some extends into class. Should be removed once php min will be 5.4.	2014-09-23 19:37:59 +02:00
Laurent Destailleur	08d4195504	Merge branch 'develop' of github.com:aspangaro/dolibarr into aspangaro-develop Conflicts: htdocs/fichinter/card.php	2014-09-22 23:34:56 +02:00
Laurent Destailleur	f7f0059767	Missing hook to add button on intervention Prepare to move location into resource Can select which king of contact show into contact tab.	2014-09-22 20:16:58 +02:00
aspangaro	0b20369dd7	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
Laurent Destailleur	154d1520fb	Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1	2014-08-30 20:36:53 +02:00
Regis Houssin	a446318649	Fix: strict mode anarchy ;-) check your variable please	2014-08-27 19:03:32 +02:00
Regis Houssin	34561906fc	Fix: strict mode anarchy ;-) check your variable please	2014-08-27 19:03:01 +02:00
Regis Houssin	76cb6f760a	Fix: strict mode anarchy ;-) check your variable please	2014-08-27 19:02:13 +02:00
Laurent Destailleur	eb3c53d897	Merge pull request #1823 from Devensys/Develop-removeVersion Hidden version on login page	2014-08-21 23:24:08 +02:00
Laurent Destailleur	c79fc516d3	Maj squelette	2014-08-14 17:27:28 +02:00
Andrelec1	1ffb964dd1	Change method Replace by existing constant ..	2014-08-14 16:06:43 +02:00
Laurent Destailleur	98f140962a	Merge remote-tracking branch 'origin/3.6' into develop	2014-08-13 19:25:55 +02:00
Andrelec1	8b6d613cb0	Hidde version on login page Create option and use it in login template	2014-08-12 12:29:20 +02:00
Laurent Destailleur	d801bcc690	Fix: When jmobile is forced, we force enable of javascript.	2014-08-08 14:37:51 +02:00
Laurent Destailleur	dec7fe42af	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/fourn/commande/fiche.php	2014-07-20 15:37:50 +02:00
Laurent Destailleur	a9779ca1ff	Fix: bad colspan for line with date selector	2014-07-20 02:18:21 +02:00
Laurent Destailleur	04a20d2008	- New: Enable feature developed for 3.6 we forgot to enabled: Adding prefix on uploaded file names. - New: No more dependency between contract and service module.	2014-07-19 22:05:35 +02:00
Laurent Destailleur	b42a33b203	Fix: For contract, only services available by default. Product appears if option is set only.	2014-07-19 21:14:56 +02:00
Marcos García de La Fuente	ec661d0c6c	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
Raphaël Doursenaud	55d062784d	Added labels on objectline form elements	2014-07-11 13:25:44 +02:00
Raphaël Doursenaud	b206ceea9e	Added label for captcha	2014-07-10 16:46:10 +02:00
Raphaël Doursenaud	4a57a2adcd	Added HTML5 autofocus attribute to login form	2014-07-10 16:34:19 +02:00
Laurent Destailleur	4dbc1dd1c6	Merge remote-tracking branch 'origin/3.6' into develop	2014-07-06 21:09:10 +02:00
Florian HENRY	b8c293fb16	$dateSelector is a paramters of formAddObjectLine, if use global it is reset to 0 because not declare in outer context but already exists in the same context.	2014-07-04 14:48:27 +02:00
Laurent Destailleur	29dfb71bbd	Merge branch 'patch-11' of github.com:defrance69/dolibarr into defrance69-patch-11 Conflicts: htdocs/core/class/commonobject.class.php	2014-06-26 23:04:26 +02:00
Laurent Destailleur	8d8ca154f1	Fix: For supplier order/invoice, deselect product when free line is selected.	2014-06-09 14:58:58 +02:00
BENKE Charles	86e0d377f8	Update objectline_view.tpl.php	2014-05-19 09:40:06 +02:00
Laurent Destailleur	757d92a318	Merge pull request #1589 from aternatik/resource_core Core integration of resource module	2014-05-14 11:25:25 +02:00
Laurent Destailleur	18848eaf74	Clean forms	2014-05-12 13:25:36 +02:00
Laurent Destailleur	5fa05ee29d	Start to clean code of templates to input lines	2014-05-12 12:53:10 +02:00
jfefe	12aafd219d	Fix : update linked resource	2014-05-11 10:19:38 +02:00
jfefe	225c7ae07b	New : link resource with any element With tpl system, external modules can declare resource with hook getElementResources	2014-05-10 22:07:54 +02:00
Jean-François Ferry	d9c567ca3d	Prepare structure for upstream merge	2014-05-10 22:03:05 +02:00
Laurent Destailleur	3776f7b146	Fix: margin calculation from % when we enter a free product.	2014-05-10 20:10:59 +02:00
Laurent Destailleur	2bac66fd52	Merge remote-tracking branch 'origin/3.5' into develop	2014-05-10 19:53:06 +02:00
Laurent Destailleur	7bb24969d8	Fix: [ bug #1372 ] Margin calculation does not work in proposals	2014-05-10 19:52:24 +02:00
Laurent Destailleur	01001592e6	Finished task to merge form of free product and predefined product.	2014-05-06 18:31:39 +02:00
Laurent Destailleur	dca53accaf	Fix: translation	2014-05-05 18:30:07 +02:00
Laurent Destailleur	131f133e07	New: Merge free product and predefined product area to enter new product (Supplier orders now use same template than customer orders/proposal/invoices).	2014-05-05 17:59:43 +02:00
Laurent Destailleur	d224128c46	New: Merge free product and predefined product area to enter new product.	2014-05-05 14:30:08 +02:00
Laurent Destailleur	8c7ff91341	Fix: Removed html5 warnings	2014-04-27 01:51:50 +02:00
Laurent Destailleur	8beaf30e88	Qual: Removed useless use of js	2014-04-27 01:51:31 +02:00
Laurent Destailleur	f9c1b590d0	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: build/debian/changelog build/doxygen/dolibarr-doxygen.doxyfile build/exe/doliwamp/doliwamp.iss build/perl/virtualmin/dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/compta/facture.php htdocs/core/modules/import/import_csv.modules.php htdocs/filefunc.inc.php	2014-03-19 22:29:18 +01:00
Laurent Destailleur	561a1a1aac	Fix: Miscellaneous problems on task tabs (withproject parameter lost and download fails).	2014-03-14 02:07:54 +01:00
Laurent Destailleur	2a853329e5	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/core/class/doleditor.class.php htdocs/main.inc.php htdocs/product/class/product.class.php	2014-03-08 14:25:59 +01:00
Laurent Destailleur	0a2a635755	Fix: td balance. Fix: New price was not used when editing a line when margin module was on.	2014-03-07 11:58:30 +01:00
Laurent Destailleur	827f7e898a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2014-02-27 10:50:27 +01:00
Laurent Destailleur	f7fe25e408	Uniformize code to prepare mass update	2014-02-27 10:37:23 +01:00
Laurent Destailleur	480b09f192	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: ChangeLog htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/societe/class/societe.class.php	2014-02-26 15:49:29 +01:00
Laurent Destailleur	63a2aa3365	Fix: sql error with postgres when creating extrafield with an upper cas character. code for new fields must be always lowercase.	2014-02-25 15:48:13 +01:00
Florian Henry	46ae5d6e9c	- New: Price management enhancement (multiprice level, price by customer, if MAIN_FEATURES_LEVEL=2 Price by qty) - Fix: Project Task numbering rule customs rule works	2014-02-23 16:16:47 +01:00
Laurent Destailleur	860ca15cfc	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/core/class/extrafields.class.php	2014-02-17 15:27:30 +01:00
Laurent Destailleur	abc96b51fa	Enable extrafields for customer order, proposal and invoice lines. This feature was developed for 3.5 but was disabled (hidden) because of a bug not possible to fix enough quickly for 3.5.0 release.	2014-02-16 23:51:29 +01:00
Laurent Destailleur	935b30470d	Fix: Missing nowrap	2014-02-16 20:09:25 +01:00
Laurent Destailleur	908c39098d	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/comm/action/fiche.php	2014-02-16 19:47:51 +01:00
Laurent Destailleur	85e93872b3	Fix: javascript calculation of unit price from margin rate was broken.	2014-02-16 19:42:43 +01:00
Laurent Destailleur	3aba53a9ae	Fix: javascript calculation of unit price from margin rate was broken.	2014-02-16 19:26:41 +01:00
Laurent Destailleur	ce8d13ead0	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: ChangeLog build/debian/changelog build/doxygen/dolibarr-doxygen.doxyfile build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/perl/virtualmin/dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/comm/action/fiche.php htdocs/filefunc.inc.php htdocs/install/check.php	2014-02-10 00:38:10 +01:00
Laurent Destailleur	b750e98d40	Fix: Pb of file upload and download.	2014-02-08 02:02:01 +01:00
Laurent Destailleur	d8b8f8c646	Uniformize code for contacts forms.	2014-02-04 20:49:07 +01:00
Laurent Destailleur	0da1a64335	Fix: Missing vars and bar id.	2014-02-04 20:41:23 +01:00
Laurent Destailleur	1b88ab2355	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/contact/class/contact.class.php	2014-01-31 10:12:41 +01:00
BENKE Charles	a10ccb4d92	Update objectline_add.tpl.php Adding extra fields on line of element	2014-01-29 16:45:37 +01:00
Laurent Destailleur	cd277aaf12	Fix: Missing translation	2014-01-26 19:10:05 +01:00
Laurent Destailleur	699a079ed7	New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add timestamp and user line into editionf field when editing a note.	2014-01-20 00:31:32 +01:00
Laurent Destailleur	123cd787f5	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-19 22:44:34 +01:00
Laurent Destailleur	79e4c283db	Fix: Deletion of files was broken	2014-01-19 22:43:36 +01:00
Laurent Destailleur	c7a73e4e00	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-18 12:57:13 +01:00
Laurent Destailleur	22767bac36	Fix: Missing the version into url	2014-01-18 12:51:27 +01:00
Laurent Destailleur	1fd67807ce	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-18 01:13:29 +01:00
Laurent Destailleur	031fd2f8b8	Fix: No set focus	2014-01-17 03:25:31 +01:00
Laurent Destailleur	795dcad59f	Fix: The login page should have same code than standard page using common footer.	2014-01-12 22:26:48 +01:00
Laurent Destailleur	171e74ae7e	Reduce time to hide/show	2014-01-11 13:31:12 +01:00
Laurent Destailleur	9b9492a5d6	New: Start to work on option MAIN_AUTO_TIMESTAMP_IN_NOTES to automatically add timestamp and user line into comment. Remain to do: Add button "cancel" into note edition mode.	2014-01-10 01:31:23 +01:00
Laurent Destailleur	c7ef0b7c57	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/core/lib/company.lib.php htdocs/societe/consumption.php	2014-01-07 16:41:00 +01:00
Laurent Destailleur	667908baf8	Fix: Missing lang loading	2014-01-05 16:37:33 +01:00
Laurent Destailleur	eadccb5d9b	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/langs/bg_BG/main.lang htdocs/langs/el_GR/cron.lang htdocs/langs/el_GR/help.lang htdocs/langs/el_GR/main.lang htdocs/langs/el_GR/margins.lang htdocs/langs/el_GR/stocks.lang htdocs/langs/el_GR/suppliers.lang htdocs/langs/et_EE/admin.lang htdocs/langs/et_EE/agenda.lang htdocs/langs/et_EE/banks.lang htdocs/langs/et_EE/bills.lang htdocs/langs/et_EE/commercial.lang htdocs/langs/et_EE/companies.lang htdocs/langs/et_EE/compta.lang htdocs/langs/et_EE/dict.lang htdocs/langs/et_EE/help.lang htdocs/langs/et_EE/main.lang htdocs/langs/et_EE/margins.lang htdocs/langs/et_EE/other.lang htdocs/langs/et_EE/stocks.lang htdocs/langs/et_EE/suppliers.lang htdocs/langs/et_EE/users.lang htdocs/langs/et_EE/withdrawals.lang htdocs/langs/lv_LV/admin.lang htdocs/langs/lv_LV/agenda.lang htdocs/langs/lv_LV/banks.lang htdocs/langs/lv_LV/bills.lang htdocs/langs/lv_LV/boxes.lang htdocs/langs/lv_LV/opensurvey.lang htdocs/langs/lv_LV/users.lang htdocs/langs/ro_RO/admin.lang htdocs/langs/ro_RO/banks.lang htdocs/langs/ro_RO/bills.lang htdocs/langs/ro_RO/companies.lang htdocs/langs/ro_RO/compta.lang htdocs/langs/ro_RO/cron.lang htdocs/langs/ro_RO/dict.lang htdocs/langs/ro_RO/help.lang htdocs/langs/ro_RO/main.lang htdocs/langs/ro_RO/margins.lang htdocs/langs/ro_RO/other.lang htdocs/langs/ro_RO/stocks.lang htdocs/langs/ro_RO/suppliers.lang htdocs/langs/ro_RO/withdrawals.lang htdocs/langs/uz_UZ/main.lang	2013-12-31 12:18:31 +01:00
Laurent Destailleur	e142bd252d	Fix: disable code making jmobile crazy.	2013-12-31 10:48:15 +01:00
Laurent Destailleur	6946fdbcda	Merge remote-tracking branch 'origin/3.5' into develop	2013-12-16 00:09:29 +01:00
Laurent Destailleur	7864fe3cfd	Merge remote-tracking branch 'origin/3.4' into 3.5 Conflicts: htdocs/core/tpl/objectline_edit.tpl.php	2013-12-16 00:07:50 +01:00
Laurent Destailleur	6e9b8dc77a	Fix: Missing special code	2013-12-15 21:10:39 +01:00
Laurent Destailleur	3c87e1e20d	Fix: no required class for not mandatory fields	2013-12-15 18:11:56 +01:00
Laurent Destailleur	eaf151d7f5	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/.gitignore htdocs/contact/fiche.php	2013-12-14 03:13:46 +01:00
Laurent Destailleur	6c7e173bba	Fix: jmobile broken with css tagtable, tagtr and tagtd	2013-12-02 22:31:02 +01:00
Laurent Destailleur	0b9e8d6832	Fix: Alignement	2013-12-01 19:41:41 +01:00
Laurent Destailleur	e9e94b9e47	Fix: Alignement	2013-12-01 19:39:21 +01:00
Cédric Salvador	22d31817de	made getVATRates synchronous to avoid concurrency problems	2013-11-29 12:13:23 +01:00
Cédric Salvador	ec3fc4e6e6	indentation	2013-11-28 15:53:28 +01:00
Cédric Salvador	2da88a2966	made getVATRates synchronous to avoid concurrency problems	2013-11-28 15:52:26 +01:00
Raphaël Doursenaud	302a230bf2	Made update price synchronous to avoid dependency hell	2013-11-21 18:00:27 +01:00
Laurent Destailleur	4356496ee8	Qual: File is not a class of a module	2013-11-18 00:20:05 +01:00
Laurent Destailleur	48570f599a	Fix: form is not allowed into a table. This break some javascript and make some browsers crazy.	2013-11-17 23:25:25 +01:00
Laurent Destailleur	45aac81b71	Doc: More comments	2013-11-16 18:12:13 +01:00
Laurent Destailleur	b3a1d695cd	Qual: Better message for total of buying price Fix: Little debug of add link feature. Link was broken because of missing http, fix W3C making output wrong with some browsers.	2013-11-15 11:43:16 +01:00
Laurent Destailleur	2e5320a532	Qual: Clean and uniformize code	2013-11-13 23:35:33 +01:00
Laurent Destailleur	cf3d6d410c	Fix: Use correct css	2013-11-13 21:50:16 +01:00
Raphaël Doursenaud	81ecb4b4a5	Updated method call to new prototype	2013-11-06 10:26:09 +01:00
Cédric Salvador	00c9df670c	renamed templates	2013-11-06 10:22:01 +01:00

... 17 18 19 20 21 ...

2232 Commits