dolibarr

Author	SHA1	Message	Date
atm-arnaud	bd6d49f04a	FIX advanced target emailing sql and ergonomy	2020-02-06 12:08:50 +01:00
Florian Mortgat	eb17a52027	FIX 11.0 - default filtering for extrafields of type 'select' should not use a LIKE "%value%" condition because keys might overlap	2020-02-05 14:57:40 +01:00
Laurent Destailleur	1875b6a49b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/security2.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php	2020-02-05 14:53:47 +01:00
Laurent Destailleur	c367c6f34e	Avoid warning	2020-02-03 21:17:45 +01:00
Scrutinizer Auto-Fixer	5fda829023	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-30 00:48:28 +00:00
Laurent Destailleur	df478dc170	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-27 01:53:49 +01:00
Laurent Destailleur	d13e5bc90b	FIX #12875	2020-01-26 23:22:47 +01:00
Laurent Destailleur	3215af9900	Merge pull request #12923 from simicar29/develop New: Add Hook doPreMassActions	2020-01-26 22:32:46 +01:00
Laurent Destailleur	02f8faeeac	Update massactions_pre.tpl.php	2020-01-26 22:32:37 +01:00
Laurent Destailleur	09e707b818	trans	2020-01-25 13:05:40 +01:00
stickler-ci	cfa67b6a5d	Fixing style errors.	2020-01-24 08:47:11 +00:00
simicar29	4761671fc8	Add Hook doPreMassActions Add Hook doPreMassActions to allow dedicated form display for custom mass actions	2020-01-24 09:41:22 +01:00
Laurent Destailleur	18f2b09fb1	Debug v11	2020-01-20 12:25:25 +01:00
Laurent Destailleur	0ebed529e1	FIX #12872	2020-01-17 15:27:43 +01:00
Laurent Destailleur	ad7278e6a5	FIX Label of DEPOSIT on screen Fix look and feel v11	2020-01-16 02:48:24 +01:00
Laurent Destailleur	f48c7d2ecf	Fix modulebuilder	2020-01-09 22:31:23 +01:00
Laurent Destailleur	255c280170	Fix visibility	2020-01-09 11:44:15 +01:00
Laurent Destailleur	115b7f2c6b	Fix break on second column	2020-01-09 11:05:23 +01:00
Laurent Destailleur	d80764a179	Fix column not visible after switching column when visibility=3	2020-01-07 12:43:05 +01:00
Laurent Destailleur	b98251f7b0	Fix phpcs	2020-01-01 23:14:13 +01:00
Laurent Destailleur	607d013a9d	Fix phpcs	2020-01-01 23:01:42 +01:00
Laurent Destailleur	b90dbb585a	Fix ident	2020-01-01 22:45:47 +01:00
Laurent Destailleur	7d07c198bc	FIX Price of purchase order and vendor invoice with multicurrency FIX entering predefined product with a forced unit price	2020-01-01 17:15:26 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer	c8baaa2995	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-16 12:06:25 +00:00
Laurent Destailleur	ce47de453e	Fix HTML5	2019-12-12 10:31:08 +01:00
Laurent Destailleur	0b73cdb7cc	Fix use of currency accuracy	2019-12-11 17:14:32 +01:00
Laurent Destailleur	6ac5e1a4f3	Merge pull request #12601 from TobiasSekan/FixAddFolderSymbolAccess Fix style of add folder button based on rights	2019-12-03 13:46:21 +01:00
Laurent Destailleur	2d95544abd	Update filemanager.tpl.php	2019-12-03 13:46:12 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
Tobias Sekan	d7a8fb98fc	Fix style of add folder button based on rights	2019-12-02 13:02:16 +01:00
Laurent Destailleur	d900475c5d	Merge pull request #12571 from inoveaconseil/FIX#12473 Fix#12473	2019-12-01 12:42:01 +01:00
Laurent Destailleur	6bf3af5d83	Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 Conflicts: htdocs/compta/tva/index.php htdocs/core/lib/pdf.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/tpl/objectline_view.tpl.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php	2019-12-01 10:30:22 +01:00
ATM John BOTELLA	773f823748	factoring token usage	2019-12-01 10:20:11 +01:00
Laurent Destailleur	1d564c2a39	Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 Conflicts: htdocs/core/class/notify.class.php	2019-12-01 00:58:01 +01:00
Maxime Kohlhaas	558669dd88	Fix #6497 : deposit lines were not translated	2019-11-30 16:14:16 +01:00
stickler-ci	a13b2267aa	Fixing style errors.	2019-11-30 14:22:25 +00:00
Nicolas	fd7a18c26f	FIX #12473	2019-11-30 12:49:31 +01:00
Laurent Destailleur	58c38912ab	Fix action into actionlogin to avoid conflict	2019-11-20 16:42:18 +01:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Laurent Destailleur	86094613e8	Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 Scrutinizer Auto-Fixes	2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer	b40ecc3933	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer	ac40dd8bbe	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer	8a527631a0	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:35:02 +00:00
Laurent Destailleur	545c2207b2	Fix on exact date when we don't know the second is useless	2019-11-13 19:32:27 +01:00
Laurent Destailleur	b9900c20cc	Merge pull request #11035 from atm-ph/new_search_input_on_type_list NEW show html list instead input text for extrafields typed as list	2019-11-13 19:26:19 +01:00
Laurent Destailleur	bdf0219941	Missing link to create contact Fix css	2019-11-13 18:18:45 +01:00
Laurent Destailleur	74239d48bf	Fix translation of extrafields when $extralabels not loaded	2019-11-13 11:11:08 +01:00
Laurent Destailleur	dc77a58a73	Work on MO	2019-11-12 01:48:12 +01:00
Laurent Destailleur	03e35623c6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-12 00:43:37 +01:00
Laurent Destailleur	8be0a6d470	Fix: Can set savingdocmask by caller. Fix permissions names. Fix: Disable crop on svg images.	2019-11-12 00:43:26 +01:00
Scrutinizer Auto-Fixer	038bda254d	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-11 22:59:36 +00:00
Laurent Destailleur	814dce5b55	Fix var not defined	2019-11-11 19:26:19 +01:00
Laurent Destailleur	6a4ba74ee7	Fix regression introduced by `991e1b2747`	2019-11-11 13:17:36 +01:00
Laurent Destailleur	6990732c71	Fix missing action in POST	2019-11-10 13:49:04 +01:00
Laurent Destailleur	6233f8e1c5	Fix visibility = 3	2019-11-09 18:19:04 +01:00
Laurent Destailleur	94fce39562	Fix visibility on modulebuilder	2019-11-09 18:13:59 +01:00
Laurent Destailleur	f11943126a	Fix scrutinizer	2019-11-08 09:42:39 +01:00
Laurent Destailleur	c0b8684475	Merge pull request #12341 from inoveaconseil/bankStatementDocument NEW add upload for account statement	2019-11-07 15:06:47 +01:00
Nicolas	f18bca7687	Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument	2019-11-06 20:51:17 +01:00
Inovea Conseil	fed6ed8760	Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument	2019-11-06 20:48:24 +01:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
stickler-ci	f537ae60b6	Fixing style errors.	2019-11-05 12:52:58 +00:00
Nicolas	991e1b2747	NEW Add upload document on account statement	2019-11-05 13:51:52 +01:00
Laurent Destailleur	7ab19ef66b	Fix selection not lose if creation of vendor invoice fails	2019-11-05 13:34:25 +01:00
Laurent Destailleur	ce1dec253f	FIX #11364	2019-11-05 12:47:38 +01:00
Laurent Destailleur	6f82c212a0	Finished migration to the new architecture of extrafields	2019-11-02 17:38:19 +01:00
Laurent Destailleur	e087ac434d	Merge pull request #12283 from frederic34/socid replace deprecated user->societe_id by user->socid	2019-11-02 13:34:21 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
stickler-ci	8765e7648e	Fixing style errors.	2019-10-31 11:03:46 +00:00
atm-ph	526aeab9af	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_search_input_on_type_list	2019-10-31 12:02:53 +01:00
atm-ph	2f68a73a2a	New update comments is now available	2019-10-30 15:45:04 +01:00
Frédéric FRANCE	8f6d38ee82	clean indent	2019-10-27 17:01:23 +01:00
Laurent Destailleur	fd04729727	Fix tooltip on extrafield title was on wrong line.	2019-10-23 20:35:39 +02:00
Laurent Destailleur	a8ca8c7a1f	Fix edit of extrafields link when empty	2019-10-23 16:38:15 +02:00
Laurent Destailleur	da00591bba	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/product.lib.php htdocs/expedition/card.php htdocs/product/list.php	2019-10-23 04:04:32 +02:00
Laurent Destailleur	161f2a018f	Fix responsive and bad closing td	2019-10-23 03:50:48 +02:00
Frédéric FRANCE	86f22c4563	do not ignore lines with mix od tabs and spaces	2019-10-20 17:17:22 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	78bfc8997d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/link.class.php	2019-10-11 16:14:29 +02:00
Laurent Destailleur	868bfb518b	FIX #11702 FIX #12088	2019-10-11 15:08:10 +02:00
Laurent Destailleur	99da69fb69	NEW Can edit the price of predefined product during adding in documents	2019-10-07 21:01:52 +02:00
Laurent Destailleur	539f4355c3	Try to fix stickler	2019-10-07 20:48:44 +02:00
Laurent Destailleur	c2a7ae23bc	Merge pull request #12034 from aspangaro/11_faicon Fix Fa-icon	2019-10-07 13:03:27 +02:00
Laurent Destailleur	a3d0b9e374	Fix syntax error	2019-10-06 18:11:28 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Laurent Destailleur	76dad97cb1	Fix syntax error	2019-10-06 14:39:43 +02:00
Laurent Destailleur	6743169faa	Fix js syntax error	2019-10-06 14:34:24 +02:00
Alexandre SPANGARO	ddadff5731	Add globe fa-icon	2019-10-03 21:32:55 +02:00
Laurent Destailleur	aa484d484d	css	2019-10-03 19:02:29 +02:00
Alexandre SPANGARO	16c6c9ae75	Merge remote-tracking branch 'upstream/develop' into 11.0_https	2019-10-01 06:12:24 +02:00
Alexandre SPANGARO	91b3bf76fd	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
Laurent Destailleur	d8de78dca9	Merge pull request #11984 from fuhraih/develop Fix 11554 and 7533	2019-09-30 15:31:41 +02:00
Laurent Destailleur	d2881eb85b	FIX CSS Conflicts: htdocs/core/tpl/extrafields_list_search_input.tpl.php	2019-09-29 19:26:37 +02:00
Laurent Destailleur	8acf7298b2	FIX CSS	2019-09-29 19:22:01 +02:00
obrunet	3e4e64ab1a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2019-09-27 21:36:35 +02:00
fuhraih	40a8fe3e79	FIX #11554 Extrafields: members autosubscription formular issue	2019-09-27 21:26:06 +02:00
Laurent Destailleur	138b494b98	Merge pull request #11936 from aspangaro/11.0_translation Translate and some fix	2019-09-27 12:15:50 +02:00
Laurent Destailleur	b3c49f2ec8	End of dev for extrafields on holiday	2019-09-24 16:26:15 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Alexandre SPANGARO	278312f38f	Translate	2019-09-20 07:02:14 +02:00
Laurent Destailleur	5cc0b24f6f	Fix param	2019-09-08 21:24:01 +02:00
Laurent Destailleur	5d6ccfdf00	Fix phpcs	2019-09-07 13:12:39 +02:00
Laurent Destailleur	881b69d117	Merge branch 'develop' into Edit_priceHT_for_predefined_products	2019-09-07 11:29:49 +02:00
Laurent Destailleur	eb7f964268	Update objectline_create.tpl.php	2019-09-07 11:25:11 +02:00
Laurent Destailleur	7386ba61d7	Merge pull request #11673 from ptibogxiv/patch-221 NEW display supplier in objectline if defined	2019-09-07 10:50:32 +02:00
Laurent Destailleur	165f64463b	Fix look and feel v10	2019-09-06 12:46:54 +02:00
Laurent Destailleur	123eace8c0	Fix look and feel v10	2019-09-06 12:44:23 +02:00
Laurent Destailleur	bbda4269b2	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-27 17:55:21 +02:00
Laurent Destailleur	e09223ed4d	FIX #11702	2019-08-27 17:52:46 +02:00
Maxime Kohlhaas	9c09876bd4	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin	2019-08-27 14:33:34 +02:00
Laurent Destailleur	290766acaa	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-26 23:57:15 +02:00
ptibogxiv	ad38478fc6	Fix lang for "nature" in contact	2019-08-26 20:01:05 +02:00
Laurent Destailleur	999db7ed41	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/salaries/card.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/takepos/invoice.php	2019-08-26 16:49:25 +02:00
Laurent Destailleur	0c8640bfd9	FIX #11752	2019-08-26 16:09:20 +02:00
Laurent Destailleur	d2d7fb4b04	Fix management of collapsing of extrafields separators.	2019-08-21 03:38:57 +02:00
Laurent Destailleur	2510c1e5e4	Better help text	2019-08-16 03:05:55 +02:00
Laurent Destailleur	c131af5ae1	FIX #11672	2019-08-15 19:16:52 +02:00
ptibogxiv	b06bfef632	NEW display supplier in objectline if defined	2019-08-11 13:08:17 +02:00
wdammak	909dbfab96	Update objectline_edit.tpl.php optimization code (double declaration deletion)	2019-08-10 16:35:02 +02:00
Laurent Destailleur	76d721559c	Merge pull request #11630 from hregis/9.0_html FIX adding a "div" for better interaction with login submit button	2019-08-10 01:41:19 +02:00
Regis Houssin	e81ccf1cff	FIX addinf a "div" for better interaction with login submit button	2019-08-04 17:21:13 +02:00
Laurent Destailleur	34f78c555d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-30 20:55:35 +02:00
Laurent Destailleur	e54c6fb5e2	FIX #11460 FIX #11492 FIX #11576 FIX #11590	2019-07-30 19:30:56 +02:00
Laurent Destailleur	a871aa818b	FIX #11460 FIX #11492 FIX #11576 FIX #11590	2019-07-30 18:15:04 +02:00
Maxime Kohlhaas	5c2763d0dd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin	2019-07-27 10:53:43 +02:00
Laurent Destailleur	d6d1b29257	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-21 16:15:32 +02:00
Laurent Destailleur	4f34a8b6e8	FIX Position was lost when we edit the line of template invoice	2019-07-21 16:15:13 +02:00
Laurent Destailleur	932530bd37	FIX ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on	2019-07-21 16:00:32 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	b9fe874b5f	Revert "Merge pull request #11022 from altatof/freetext" This reverts commit `879b4d8e7f`, reversing changes made to `ddc01b4c27`.	2019-07-18 18:19:51 +02:00
Laurent Destailleur	879b4d8e7f	Merge pull request #11022 from altatof/freetext NEW : manage output languages for free text	2019-07-18 17:29:45 +02:00
Laurent Destailleur	f44182c89f	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-16 00:13:52 +02:00
Regis Houssin	294bc5dcb5	FIX avoid conflict with "$classname" in card.php	2019-07-15 10:19:06 +02:00
Laurent Destailleur	adfbd62f8b	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-14 00:44:35 +02:00
Laurent Destailleur	b1e21ed5fc	FIX Computed field were not calculated into lists.	2019-07-11 22:18:44 +02:00
atm-lena	a3f5397988	FIX help text 2	2019-07-10 15:55:50 +02:00
atm-lena	cebf81a514	FIX helpp text	2019-07-10 15:18:25 +02:00
Maxime Kohlhaas	9c47cb6f91	NEW : can choose lines while creating order from origin	2019-07-08 23:16:32 +02:00
Laurent Destailleur	01b1b2e4a7	Fix syntax error	2019-07-04 17:07:26 +02:00
Laurent Destailleur	1c33dd2e75	Merge pull request #11436 from fbosman/fbosman-patch-1 Feature request: Extrafields - store computed value #11435	2019-07-04 16:23:08 +02:00
Laurent Destailleur	0d738a04f9	Update admin_extrafields_edit.tpl.php	2019-07-04 16:22:10 +02:00
Laurent Destailleur	f14b0b4fcc	Update admin_extrafields_add.tpl.php	2019-07-04 16:20:01 +02:00
Laurent Destailleur	b691396fce	Update admin_extrafields_add.tpl.php	2019-07-04 16:19:24 +02:00
Laurent Destailleur	f2c1568d09	NEW Extrafields separator can be collapsed or not	2019-07-04 15:43:05 +02:00
Frans Bosman	9962243df3	Update admin_extrafields_edit.tpl.php	2019-07-03 16:19:51 +02:00
Frans Bosman	123cf7ce50	Update admin_extrafields_add.tpl.php	2019-07-03 16:16:45 +02:00
Frans Bosman	135e47892b	Update admin_extrafields_add.tpl.php	2019-07-03 16:15:20 +02:00
Laurent Destailleur	2a3b4c3fd7	Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse NEW add extrafield separator collapsing capabilities	2019-06-24 19:04:51 +02:00
Laurent Destailleur	b98874848f	Fix backport 9.0	2019-06-24 16:12:54 +02:00
Laurent Destailleur	3c4956838e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/tpl/massactions_pre.tpl.php	2019-06-24 15:44:44 +02:00
John Botella	6a68c8cd99	Fix display option email per participient	2019-06-20 11:09:37 +02:00
John Botella	252bd6d9ba	FIX condition	2019-06-20 09:48:08 +02:00
Laurent Destailleur	0123a18ff8	Look and feel v10	2019-06-17 18:44:08 +02:00
Laurent Destailleur	2ac8723ce9	Code comment	2019-06-11 21:02:41 +02:00
Laurent Destailleur	7d2cedfdcf	Debug bom module	2019-06-03 19:29:49 +02:00
ptibogxiv	5b6821c191	FIX display job/fucnction in contact list Display job/function is usefull for correct choice of additionnal contact in a object (PR from returns of severals professionnal dolibarr's user)	2019-05-29 16:55:44 +02:00
Laurent Destailleur	a5865d3e4a	Debug BOM	2019-05-25 19:29:33 +02:00
Laurent Destailleur	ccfb4f575b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formfile.class.php	2019-05-24 15:00:14 +02:00
Laurent Destailleur	89455672a2	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php	2019-05-24 14:58:21 +02:00
Marc de Lima Lucio	18a6ed17cf	FIX: extrafield list search: SQL error when field is multiselect	2019-05-21 14:49:23 +02:00
Laurent Destailleur	eafc35b00f	Look and feel v10	2019-05-21 13:27:45 +02:00
Laurent Destailleur	c3732f2b7a	Fix edition of margins in recurring invoices	2019-05-20 14:41:47 +02:00
Laurent Destailleur	3c1b860da4	Fix css	2019-05-20 12:16:39 +02:00
Laurent Destailleur	d86fc28aba	Fix CSS	2019-05-19 13:01:11 +02:00
Marc de Lima Lucio	d428f79d46	NEW: new line template: hidden conf to fill service dates from the last service line	2019-05-15 12:26:39 +02:00
Laurent Destailleur	e84003d4ff	Escape param	2019-05-13 09:29:34 +02:00
Laurent Destailleur	74875690a0	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/tpl/massactions_pre.tpl.php	2019-05-08 19:14:31 +02:00
Laurent Destailleur	f6de2d091d	FIX Sending email to mass actions send same email on same customer	2019-05-08 19:07:12 +02:00
Lionel VESSILLER	8bb4b3f339	Fix contact address substitution before sending by mail in shipment card	2019-05-06 11:12:56 +02:00
Lionel VESSILLER	87e83a7967	New add extrafield separator collapse with theses specific values - empty for a simple separator - 1 to extend by default all extrafields after the separator position - 2 to collapse by default all extrafields after the separator position	2019-05-03 16:14:44 +02:00
Laurent Destailleur	425dd6faf7	Merge branch 'develop' into patch-2	2019-05-02 12:38:38 +02:00
Laurent Destailleur	ceeb9752ce	Fix PHPCS	2019-05-02 12:28:40 +02:00
Frédéric FRANCE	ac304f58b0	clean new commits	2019-04-30 20:37:59 +02:00
Laurent Destailleur	61bf731d17	FIX Balance of td	2019-04-30 18:11:35 +02:00
Laurent Destailleur	9c45b781af	Fix balance of colspan	2019-04-30 16:44:11 +02:00
Laurent Destailleur	3007905508	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.formmail.class.php htdocs/core/modules/modProduct.class.php htdocs/core/modules/modService.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/stripe/class/stripe.class.php	2019-04-30 03:30:40 +02:00
Laurent Destailleur	ef8bb1f5ca	Add MAIN_DOLEDITOR_HEIGHT as quick hack to fix pb of too small area	2019-04-29 20:55:45 +02:00
Laurent Destailleur	10dde837d0	Debug email collector	2019-04-25 19:32:48 +02:00
Laurent Destailleur	68d438b697	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/commande/card.php htdocs/user/class/user.class.php	2019-04-25 01:50:48 +02:00
Laurent Destailleur	fe3fe60efc	Cleaner setup page	2019-04-24 18:31:11 +02:00
Laurent Destailleur	287b8ebe53	Merge pull request #11060 from hregis/9.0_mc FIX missing compatibility with multicompany	2019-04-24 11:33:16 +02:00
Laurent Destailleur	99639ef429	FIX #11013	2019-04-24 11:25:14 +02:00
Laurent Destailleur	f0bb9288bf	FIX #11013	2019-04-24 11:23:49 +02:00
Regis Houssin	41a82023e3	FIX missing compatibility with multicompany	2019-04-24 08:17:10 +02:00
Christophe Battarel	0b5cb9770f	use dol_escapa_js	2019-04-18 09:59:39 +02:00
atm-ph	1e087b68e1	New show html list instead input text for extrafields typed as list	2019-04-17 16:29:48 +02:00
Christophe Battarel	20953d3522	fix javascript	2019-04-16 17:36:42 +02:00
Christophe Battarel	62f59a13af	fix javascript	2019-04-16 17:30:57 +02:00
Christophe Battarel	f4cc1695f4	fix when ckeditor is not enabled	2019-04-16 17:22:33 +02:00
Christophe Battarel	c157cfad74	add freetextsubstitutionexclude parameter	2019-04-16 16:21:32 +02:00
Christophe Battarel	502b1e4d31	add lang management to freetext	2019-04-16 16:16:37 +02:00
Laurent Destailleur	7db0c0c705	Merge pull request #10993 from altatof/presend NEW : use outputlangs in fullname construction for emails	2019-04-11 16:33:07 +02:00
Laurent Destailleur	862917edff	NEW Tooltip with vat amount and price incl tax on lines of objects.	2019-04-10 21:24:23 +02:00
Laurent Destailleur	2eeb4b8734	Debug ticket module	2019-04-10 15:45:55 +02:00
Laurent Destailleur	ac25003d33	Dolibarize module ticket	2019-04-10 11:39:54 +02:00
Christophe Battarel	79beb59385	use outputlangs in fullname construction for emails	2019-04-10 11:11:41 +02:00
Laurent Destailleur	861c1b412c	CSS	2019-04-09 19:23:34 +02:00
Laurent Destailleur	ff629b2355	NEW Color for hover and for checked line is on by default	2019-04-09 15:57:26 +02:00
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

... 13 14 15 16 17 ...

2232 Commits