dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	9df85a26b8	Fix var_dump	2020-01-06 03:50:42 +01:00
Laurent Destailleur	821ff375b0	Fix update ref	2020-01-01 13:15:42 +01:00
Alexandre SPANGARO	c664a1e42d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2019-12-31 08:34:37 +01:00
Laurent Destailleur	58771c7d8a	Debug MRP v11	2019-12-20 17:39:42 +01:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	17b9964678	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: build/generate_filelist_xml.php htdocs/core/class/utils.class.php htdocs/core/lib/files.lib.php	2019-12-14 14:43:14 +01:00
Laurent Destailleur	a8de7b850a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/admin/system/filecheck.php	2019-12-14 14:33:46 +01:00
Laurent Destailleur	835d22f556	Merge branch 'develop' into doxygen_todo	2019-12-14 13:46:40 +01:00
Frédéric FRANCE	d4dfa840d9	doxygen	2019-12-12 20:48:14 +01:00
Frédéric FRANCE	307bad1d2a	doxygen todo	2019-12-11 19:11:13 +01:00
Laurent Destailleur	c0e23c7b71	Merge pull request #12670 from frederic34/patch-7 The variable $id seems to be never defined	2019-12-10 05:53:46 +01:00
Frédéric FRANCE	de741f5dd0	The variable $id seems to be never defined	2019-12-09 23:22:13 +01:00
Frédéric FRANCE	a16e342af6	typo	2019-12-09 23:15:15 +01:00
Laurent Destailleur	2ca5a4378b	Fix empty div when no address Fix deletion of MO	2019-12-09 00:54:42 +01:00
Laurent Destailleur	9e479afff1	WIP Complete module MRP	2019-12-09 00:06:51 +01:00
Laurent Destailleur	2b5866aca2	WIP Complete module MRP	2019-12-08 23:45:06 +01:00
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Laurent Destailleur	1636d341c7	Debug module BOM Enhance demo data for TakePOS	2019-11-28 15:18:14 +01:00
Daniel Seichter	7a4beb824f	Merge remote-tracking branch 'upstream/develop' into develop	2019-11-25 23:14:19 +01:00
Daniel Seichter	9eafc8f550	fix small css issues	2019-11-25 23:13:31 +01:00
Laurent Destailleur	e2009ceff0	Fix extrafields of line for receptions	2019-11-22 14:22:35 +01:00
Laurent Destailleur	6bfb76d40d	Merge pull request #12464 from bb2a/patch-6 Update getfullname	2019-11-19 10:55:47 +01:00
Scrutinizer Auto-Fixer	cd7523318d	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-19 08:30:26 +00:00
Laurent Destailleur	16d67a1a8e	Fix several trouble with some types in modulebuilder Fix difference between null and 0	2019-11-17 17:36:36 +01:00
Anthony Berton	7a5883588c	Update commonobject.class.php	2019-11-17 14:07:01 +01:00
Scrutinizer Auto-Fixer	1648fc142e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-16 22:24:29 +00:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. Fix remove empty id	2019-11-16 14:38:05 +01:00
Scrutinizer Auto-Fixer	f4aaa8d9bb	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-13 18:34:37 +00:00
Laurent Destailleur	dc77a58a73	Work on MO	2019-11-12 01:48:12 +01:00
stickler-ci	f8138c22a3	Fixing style errors.	2019-11-10 10:12:10 +00:00
Philippe GRAND	9bf4347371	add some comment	2019-11-10 11:11:43 +01:00
Laurent Destailleur	5ebd5a401c	Fix avoid error on lang not defined when calling trigger	2019-11-09 13:09:05 +01:00
Laurent Destailleur	ab26356e92	Fix avoid error on lang not defined when calling trigger	2019-11-09 13:08:30 +01:00
Laurent Destailleur	c0abb725cb	Fix price2num needs lang loaded when it may not exists	2019-11-09 12:46:45 +01:00
Laurent Destailleur	f9869dbfed	Fix price2num need langs when lang is not necessarly loaded.	2019-11-09 12:46:11 +01:00
Laurent Destailleur	4c01f33228	Fix removed a debug die	2019-11-05 15:57:22 +01:00
Laurent Destailleur	4d84ee2041	Fix var not init	2019-11-05 10:15:00 +01:00
Laurent Destailleur	9499398f86	Code syntax	2019-11-05 10:11:28 +01:00
Frédéric FRANCE	872f58f261	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-11-03 21:48:24 +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
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	c12e66e2a2	Merge branch 'develop' into new_branch_01_11_2019	2019-11-02 12:00:04 +01:00
Laurent Destailleur	f9031cdbfd	Clean code	2019-11-02 11:36:48 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Laurent Destailleur	012c5ef0c4	Can use substitution variables into filter of fields link	2019-11-01 18:35:48 +01:00
Philippe Grand	74ae90f9da	Update commonobject.class.php	2019-11-01 11:18:12 +01:00
stickler-ci	0c6938aa2a	Fixing style errors.	2019-11-01 09:44:29 +00:00
Philippe GRAND	4fe3e49502	add some comment	2019-11-01 10:42:14 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Frédéric FRANCE	f7747ed00a	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-30 20:06:43 +01:00
Laurent Destailleur	66a288a343	Merge pull request #12235 from frederic34/scopeindent clean indent	2019-10-30 02:57:59 +01:00
Laurent Destailleur	bc3f088f50	Enhance modulebuilder Work on MO	2019-10-30 01:35:41 +01:00
Frédéric FRANCE	1ba9612f12	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-27 17:03:50 +01:00
Frédéric FRANCE	e203f87c84	clean indent	2019-10-27 11:18:36 +01:00
Laurent Destailleur	e17cc5b2e5	Debug cloning of BOMs	2019-10-27 00:26:11 +02:00
Frédéric FRANCE	a43e6f96b5	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-25 08:12:54 +02:00
Laurent Destailleur	c4be61c55c	FIX Better compatible fix for the trouble of weight / size units Conflicts: htdocs/core/class/html.form.class.php htdocs/product/card.php	2019-10-22 18:42:59 +02:00
Laurent Destailleur	e7e9898e0d	FIX Better compatible fix for the trouble of weight / size units	2019-10-22 18:36:36 +02:00
Laurent Destailleur	5ad7ca5620	Code more generic around setting projet on a card	2019-10-22 13:43:24 +02:00
Laurent Destailleur	6aa2ceac1a	Fix phpcs	2019-10-22 02:53:29 +02:00
Laurent Destailleur	e261d63295	NEW Can add a button "Create" after combo of object with modulebuilder.	2019-10-21 14:44:39 +02:00
Frédéric FRANCE	f4540dddb8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-17 20:24:04 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	b0355dd149	Module BOM have now status DRAFT, VALIDATED, DISABLED	2019-10-16 01:20:58 +02:00
Frédéric FRANCE	2351750d2b	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-14 19:02:46 +02:00
Laurent Destailleur	7973b03201	NEW Add estimated duration on the BOM module	2019-10-14 11:38:36 +02:00
Frédéric FRANCE	b78187c1eb	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 00:07:27 +02:00
Laurent Destailleur	c6c498fd67	Merge pull request #11829 from atm-florian/dev_contactdefault NEW : Address/Contact by default on third parties	2019-10-07 15:27:58 +02:00
Frédéric FRANCE	ec8569dd85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-06 15:56:21 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
Frédéric FRANCE	6384e7eb67	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-05 20:02:16 +02:00
Laurent Destailleur	b883a8092a	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php htdocs/core/lib/functions.lib.php htdocs/core/lib/product.lib.php htdocs/core/tpl/extrafields_list_search_input.tpl.php htdocs/fourn/facture/card.php htdocs/product/class/html.formproduct.class.php	2019-10-05 19:35:40 +02:00
Laurent Destailleur	1a66e0b05e	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/product/card.php	2019-10-03 17:53:59 +02:00
Frédéric FRANCE	ad3cbd17c2	backport commit for setmulticurrency `a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)`	2019-10-02 11:12:30 +02:00
Frédéric FRANCE	aca9d92db8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-01 22:03:33 +02:00
florian HENRY	d48f0fa791	resolve conflixt	2019-10-01 18:07:59 +02:00
Laurent Destailleur	68055e579f	Check array is array	2019-10-01 16:26:55 +02:00
Laurent Destailleur	8ad81a092a	Clean code	2019-10-01 16:19:54 +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
Frédéric FRANCE	b87610adcc	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-30 19:34:35 +02:00
stickler-ci	103efbbe5b	Fixing style errors.	2019-09-28 20:55:58 +00:00
Frédéric FRANCE	cea3669ffa	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-28 00:35:14 +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
florian HENRY	885d958e63	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault	2019-09-27 20:12:09 +02:00
Laurent Destailleur	46e019642f	Code comment	2019-09-27 17:51:22 +02:00
Laurent Destailleur	f3bc319a78	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expedition/class/expedition.class.php htdocs/takepos/takepos.php	2019-09-27 14:11:14 +02:00
Frédéric FRANCE	03086026b8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-27 08:06:13 +02:00
Laurent Destailleur	aa5f35f14f	Fix image on ticket	2019-09-26 14:28:34 +02:00
altairis	c59e26457d	add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant	2019-09-25 12:18:19 +02:00
Alexandre SPANGARO	02dbc11f98	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
Laurent Destailleur	0194f48041	Merge pull request #10795 from altatof/clonecat NEW : copy linked categories on product clone process	2019-09-15 16:34:42 +02:00
Laurent Destailleur	6bfba0b731	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php	2019-09-15 15:17:38 +02:00
TuxGasy	e0238705cc	Check if childtablesoncascade is not empty	2019-09-14 19:04:43 +02:00
Frédéric FRANCE	6444c7378f	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-14 16:40:23 +02:00
Laurent Destailleur	aad6b003fb	Add cache in fetch_optionnals() to avoid duplicate call to fetch_name_optionals_label	2019-09-14 00:02:48 +02:00
Frédéric FRANCE	3fddef0c9e	add socialnetworks dictionary	2019-09-11 22:27:09 +02:00
florian HENRY	bdb297a380	resolve conflict	2019-09-09 10:15:44 +02:00
Laurent Destailleur	7fe2483a82	Merge branch 'develop' into Hook_on_commonGenerateDocument	2019-09-07 10:26:23 +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
stickler-ci	cd96238adc	Fixing style errors.	2019-09-05 14:19:35 +00:00
Christophe Battarel	6902b2cbf2	fix function visibility thanks to stckler	2019-09-05 16:14:15 +02:00
Christophe Battarel	1cfd5615d3	resolv conflict	2019-09-05 16:10:23 +02:00
florian HENRY	6c20fbafdf	add trigger files	2019-09-03 17:04:42 +02:00
florian HENRY	d811de4da2	let only triggers part	2019-09-02 22:01:48 +02:00
florian HENRY	405c92640c	on going	2019-09-02 14:47:32 +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
Maxime Kohlhaas	4bd806ea65	Move $selectedlines to parameter	2019-08-27 14:33:28 +02:00
Laurent Destailleur	9f18b3d690	Update commonobject.class.php	2019-08-15 19:53:38 +02:00
ptibogxiv	a489207122	Fix force recalculate price with multicurrency	2019-08-12 13:56:12 +02:00
Laurent Destailleur	d663657f15	FIX format of field with type timestamp	2019-08-04 13:06:48 +02:00
Laurent Destailleur	31648f856c	FIX format of field with type timestamp	2019-08-04 13:04:37 +02:00
Laurent Destailleur	5b2ca3b631	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2019-08-03 16:37:25 +02:00
Laurent Destailleur	25ee539f92	FIX Missing where on entity Conflicts: htdocs/core/class/commonobject.class.php	2019-08-03 16:35:15 +02:00
Laurent Destailleur	acf8314935	FIX Missing where on entity	2019-08-03 16:32:35 +02:00
Laurent Destailleur	3d8f6dca76	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-01 16:30:32 +02:00
Laurent Destailleur	6512435f9f	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/core/modules/cheque/doc/pdf_blochet.class.php htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php	2019-08-01 16:27:55 +02:00
Laurent Destailleur	a7390e7e47	Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop NEW Management of retained warranty on situation invoices	2019-07-30 21:53:09 +02:00
Laurent Destailleur	ed7a57e3ef	Merge pull request #11571 from atm-john/9.0_fix_showOutputField Fix sellist showOuputField	2019-07-30 21:40:37 +02:00
ATM john	581ae226ff	Fix sellist showOuputField	2019-07-27 18:25:25 +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	9f7d118f6f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-27 02:40:56 +02:00
Laurent Destailleur	1ca3c6e3ae	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-26 13:17:47 +02:00
Regis Houssin	6409cc06ae	FIX duplicate on the check (TODO field $onetrtd not used ?)	2019-07-22 11:44:56 +02:00
Alexandre SPANGARO	2c74caff90	WIP	2019-07-22 06:56:55 +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	3cffd70ed3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/prelevement/create.php htdocs/core/class/commonobject.class.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/commande/dispatch.php htdocs/fourn/product/list.php htdocs/opensurvey/index.php htdocs/ticket/index.php htdocs/ticket/list.php	2019-07-18 18:09:37 +02:00
Laurent Destailleur	b044d95acf	Merge	2019-07-18 17:50:15 +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	e0095871aa	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/compta/stats/byratecountry.php htdocs/core/class/html.form.class.php	2019-07-14 00:19:56 +02:00
Laurent Destailleur	3bfc1938d3	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/class/commonobject.class.php	2019-07-14 00:13:16 +02:00
Laurent Destailleur	4dabdfa5ac	Merge pull request #11483 from inoveaconseil/FIX_update_price FIX element name in update_price	2019-07-13 23:30:17 +03:00
Laurent Destailleur	f041110a7e	Update commonobject.class.php	2019-07-13 22:29:50 +02:00
Nicolas ZABOURI	abd0abf115	FIX element name in update_price	2019-07-10 18:36:12 +02:00
Laurent Destailleur	e5d34de877	FIX compatibility mysql 8. rank is reserved FIX Permission for BOM menu	2019-07-09 00:14:01 +02:00
Maxime Kohlhaas	9c47cb6f91	NEW : can choose lines while creating order from origin	2019-07-08 23:16:32 +02:00
Frans Bosman	cd7d4de6ec	Update commonobject.class.php	2019-07-03 16:53:26 +02:00
Frans Bosman	116c6d7a6a	Update commonobject.class.php	2019-07-03 11:09:24 +02:00
Frans Bosman	9064737930	Update commonobject.class.php	2019-07-03 07:08:53 +02:00
Frans Bosman	221c202add	Update commonobject.class.php	2019-07-03 06:59:52 +02:00
fbosman	3e91fdda77	Update commonobject.class.php	2019-07-01 12:34:27 +02:00
John Botella	7e14a598e2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-26 09:43:43 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +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	609eefaf08	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/actions_massactions.inc.php	2019-06-24 16:36:08 +02:00
Laurent Destailleur	28024d5cd1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/core/actions_massactions.inc.php	2019-06-24 16:28:48 +02:00
John Botella	ec7446762c	Fix travis	2019-06-24 14:36:06 +02:00
Laurent Destailleur	1daac232b0	Code comment	2019-06-24 14:31:58 +02:00
John Botella	7b6925b8f7	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-24 10:29:43 +02:00
Laurent Destailleur	b202c7eaa0	Fix confusion between ->childs and ->childsoncascade	2019-06-22 20:17:40 +02:00
florian HENRY	0865bdb60f	fix depending extrafeilds list	2019-06-20 12:16:48 +02:00
florian HENRY	1cf38fa635	fix scrutinizer	2019-06-05 16:08:04 +02:00
Laurent Destailleur	21a1e0d7b3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 Conflicts: htdocs/categories/index.php htdocs/comm/action/list.php htdocs/comm/action/rapport/index.php htdocs/compta/paiement.php htdocs/compta/sociales/document.php htdocs/compta/tva/document.php htdocs/core/actions_massactions.inc.php htdocs/core/class/commonobject.class.php htdocs/fourn/facture/paiement.php htdocs/loan/document.php htdocs/main.inc.php	2019-06-04 19:03:27 +02:00
John BOTELLA	d7a393bbd3	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop	2019-06-04 14:00:18 +02:00
Laurent Destailleur	664e0b81d8	Debug module BOM	2019-06-03 22:07:34 +02:00
Laurent Destailleur	a143dba9f8	Work on incomplete code on BOM module	2019-06-03 20:46:11 +02:00
Laurent Destailleur	7d2cedfdcf	Debug bom module	2019-06-03 19:29:49 +02:00
Laurent Destailleur	72f55e1d81	Debug modulebuilder	2019-06-03 18:11:53 +02:00
Laurent Destailleur	57cfb4b007	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php	2019-06-02 12:36:07 +02:00
Laurent Destailleur	5f0fbcea9a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/contact/card.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php	2019-06-02 11:49:33 +02:00
Laurent Destailleur	912e29a746	FIX #11244	2019-05-29 11:06:01 +02:00
Laurent Destailleur	3c05cfe690	Fix useless test	2019-05-29 10:50:33 +02:00
Laurent Destailleur	b46b675b7c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-05-29 10:36:00 +02:00
Christophe Battarel	83d883c36a	finally eldy is always right	2019-05-24 15:14:34 +02:00
Christophe Battarel	545cdd0762	test include return on FALSE	2019-05-24 12:54:24 +02:00
Christophe Battarel	abc7c2f0f8	test include return on TRUE	2019-05-24 12:33:40 +02:00
Christophe Battarel	aaaad71347	FIX : do not include disabled modules tpl	2019-05-24 12:10:58 +02:00
Laurent Destailleur	43e098caae	Fix phpcs	2019-05-23 12:35:53 +02:00
Laurent Destailleur	111239094a	Work to finish module BOM for v10	2019-05-22 20:28:24 +02:00
Laurent Destailleur	c3732f2b7a	Fix edition of margins in recurring invoices	2019-05-20 14:41:47 +02:00
Francis Appels	6e5d826d65	Clean PHPCS for commonobject.class	2019-05-13 22:02:33 +02:00
Laurent Destailleur	590b1d1e90	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php	2019-05-08 18:24:50 +02:00
Laurent Destailleur	f2e24ed96e	Fix bad contact used	2019-05-08 18:20:28 +02:00
Laurent Destailleur	1e036f3513	Correct support for type price on module builder Fix link of ref in cash fence list	2019-05-08 01:09:38 +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	86f5889a72	Merge pull request #11078 from Supermanu/help_extrafields Show help text for extrafields in forms	2019-05-02 12:36:15 +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
Supermanu	bbc6c0fe0c	Show help text for extrafields in forms	2019-04-29 20:18:47 +02:00
Laurent Destailleur	8e9a4e1877	Fix output of fields with type "real"	2019-04-13 10:42:43 +02:00
Laurent Destailleur	861c1b412c	CSS	2019-04-09 19:23:34 +02:00
Christophe Battarel	f167ad910e	camelCase and generic cloneCategories function	2019-04-05 11:30:51 +02:00
Laurent Destailleur	fff9b7db9d	Fix doxygen	2019-04-04 18:33:12 +02:00
Laurent Destailleur	aa33e4fd2a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-03-21 18:26:29 +01:00
Laurent Destailleur	55d64d441f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-21 18:26:02 +01:00
Laurent Destailleur	a1fe1bb58c	FIX when 2 extra fields are mandatory in 2 different entities	2019-03-21 12:33:39 +01:00
Laurent Destailleur	5d21547854	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php	2019-03-21 12:20:24 +01:00
Laurent Destailleur	a7fdd34973	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-03-21 12:17:50 +01:00
Laurent Destailleur	032aa869e4	FIX Can't insert if there is extrafields mandatory on another entity. FIX Can't set default value of extrafield of type varchar	2019-03-21 12:14:15 +01:00
Laurent Destailleur	4c85068a85	FIX Can't insert if there is extrafields mandatory on another entity.	2019-03-21 11:53:04 +01:00
atm-greg	a8cdb63a25	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Hook_on_commonGenerateDocument	2019-03-20 06:49:36 +01:00
Laurent Destailleur	d44be341a5	NEW Add property 'noteditable' in modulebuilder	2019-03-17 01:45:46 +01:00
Laurent Destailleur	6ae36ce6a7	Work on BOM	2019-03-12 19:20:01 +01:00
Frédéric FRANCE	b47a54c652	update doc in commonobject class	2019-03-09 18:05:48 +01:00
Laurent Destailleur	a426c8e9bf	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/system/filecheck.php htdocs/compta/facture/class/facture.class.php htdocs/filefunc.inc.php htdocs/install/upgrade2.php htdocs/product/class/product.class.php	2019-03-07 11:16:24 +01:00
gauthier	598d1fc914	FIX : extrafields always visible on view mode	2019-03-05 16:53:36 +01:00
Laurent Destailleur	ca9449c70e	Work on BOM	2019-03-04 14:01:30 +01:00
Frédéric FRANCE	9b165f6b3f	add visibility	2019-02-27 20:45:07 +01:00
Frédéric FRANCE	5a4ac82880	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 08:23:29 +01:00
Frédéric FRANCE	c89e4d79b8	wip	2019-02-25 22:27:04 +01:00
Alexandre SPANGARO	acb9cfe07a	NEW: Add LinkedIn field	2019-02-25 09:07:58 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45: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
Laurent Destailleur	e309261140	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-03 18:19:58 +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
Laurent Destailleur	ebe30f7a0e	FIX error report not returned	2019-02-01 19:19:23 +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	eb3621839a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/members.lang htdocs/langs/fr_FR/members.lang	2019-02-01 15:14:19 +01:00
Laurent Destailleur	ae81bbac93	Better var name	2019-02-01 13:49:07 +01:00
Laurent Destailleur	b14a16a119	Code comment	2019-02-01 13:48:09 +01:00
Laurent Destailleur	849b3b640b	Code comment	2019-02-01 13:41:23 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
Laurent Destailleur	3198f9fbbe	Merge pull request #10441 from aspangaro/10.0_email Move my email to the new one	2019-01-30 14:59:58 +01:00
Laurent Destailleur	3d218cadb7	FIX last_main_doc var not saved Conflicts: htdocs/core/class/commonobject.class.php	2019-01-29 19:03:45 +01:00
Laurent Destailleur	9ef93bceca	FIX last_main_doc var not saved	2019-01-29 18:40:47 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +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	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +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
Laurent Destailleur	8fba387673	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-22 10:39:18 +01:00
Laurent Destailleur	3cca0df28e	Support getFormatedCustomerRef into contract list	2019-01-22 10:39:06 +01:00
Günter Lukas	1cf786acff	Fix #10278 Fix #10278	2019-01-22 00:09:36 +01:00
Laurent Destailleur	eba8a8f34d	Merge pull request #10376 from atm-maxime/fix_extrafields_computed Compute value of computed extrafield on fetch, not on show	2019-01-21 23:41:06 +01:00
Laurent Destailleur	42743027d4	Merge branch 'develop' into objectline_etc	2019-01-21 18:04:48 +01:00
Laurent Destailleur	8950720fb5	NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods	2019-01-21 15:22:35 +01:00
Maxime Kohlhaas	23438b1f48	Compute extrafields after having set all others	2019-01-21 14:40:33 +01:00
Maxime Kohlhaas	f50de03585	Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_extrafields_computed	2019-01-21 14:36:23 +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
Maxime Kohlhaas	c0b0d5484c	Compute value of computed extrafield on fetch, not on show	2019-01-19 17:14:56 +01:00
Philippe GRAND	29fdad144d	update with html5 compliant code	2019-01-19 12:40:17 +01:00
Laurent Destailleur	3d4879c538	Code comment	2019-01-06 05:16:50 +01:00
Laurent Destailleur	8b380489f2	Update commonobject.class.php Conflicts: htdocs/core/class/commonobject.class.php	2019-01-02 19:55:51 +01:00
Laurent Destailleur	85d60b93d6	Update commonobject.class.php	2019-01-02 19:53:59 +01:00
Günter Lukas	2857447aee	Update commonobject.class.php	2018-12-30 00:20:38 +01:00
ldestailleur	7b91c14cb3	FIX sql error when resetting payment mode / term	2018-12-28 23:14:41 +01:00
ldestailleur	2fef2b633a	FIX sql error when resetting payment mode / term	2018-12-28 23:13:39 +01:00
Laurent Destailleur	35debd06fb	List of events show user firstname by default	2018-12-23 01:28:36 +01:00
Laurent Destailleur	44a6644969	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-18 21:55:53 +01:00
Laurent Destailleur	89068ffef1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/langs/es_ES/companies.lang htdocs/langs/es_ES/errors.lang htdocs/product/stock/product.php htdocs/user/card.php	2018-12-18 21:55:14 +01:00
Laurent Destailleur	f2318716ec	FIX Error reported when creation of thirdparty from member fails	2018-12-18 21:27:16 +01:00
Laurent Destailleur	27f8096afa	Merge branch 'develop' into PR_NEW_reception	2018-12-15 12:50:31 +01:00
Laurent Destailleur	9fb672d51b	Merge pull request #10127 from atm-florian/develop_scrunitizer fix scrunitizer	2018-12-14 17:28:34 +01:00
Laurent Destailleur	8c9f81807f	Merge pull request #9702 from bafbes/abb80027 New : Link to create new element on linked fields	2018-12-14 11:01:39 +01:00
Laurent Destailleur	42de7da334	Update commonobject.class.php	2018-12-14 11:01:27 +01:00
Laurent Destailleur	3213b3be07	Standardize code: Move jabberid into social network module	2018-12-11 09:17:02 +01:00
florian HENRY	faf7ea345f	fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0	2018-12-01 15:23:46 +01:00
ATM John BOTELLA	c6f4879575	Fix issue from scrutinizer	2018-12-01 12:04:34 +01:00
Laurent Destailleur	e020597ba7	Fix deletion for class build with modulebuilder	2018-11-19 21:11:26 +01:00
Laurent Destailleur	39621ec686	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2018-11-19 20:07:51 +01:00
Laurent Destailleur	8191df4857	Merge pull request #9962 from atm-john/fix_extrafield_view FIX hidden extrafield	2018-11-19 18:37:18 +01:00
atm-ph	129034ba76	Fix new params has been added not optional	2018-11-19 15:46:30 +01:00
Laurent Destailleur	6d640ab83c	Fix feature to drag and drop rows of table (not generic)	2018-11-15 19:58:06 +01:00
John BOTELLA	500bb7bc96	best conditions testing	2018-11-13 10:20:34 +01:00
John BOTELLA	4f7be36249	fix extrafield hidden	2018-11-07 09:14:29 +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
Laurent Destailleur	2c3cd7a668	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/modSyslog.class.php	2018-10-30 15:32:09 +01:00
Maxime Kohlhaas	b68b8fe412	Fix changing currency in a doc was recalculating amounts in company currency #9801	2018-10-28 11:02:51 +01:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	03b93781a0	Merge pull request #9848 from bafbes/abb80038 New : parameter for getnomurl in field specification	2018-10-24 01:53:19 +02:00
Laurent Destailleur	d5285ca359	Update commonobject.class.php	2018-10-24 01:53:07 +02:00
atm-quentin	04eb9ca167	fix dont change num version	2018-10-23 17:06:21 +02:00
atm-quentin	96d0bb8f2e	FIX adapt develop	2018-10-23 14:31:58 +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
Abbes Bahfir	7e7473e7df	New : parameter for getnomurl in field dpecification	2018-10-23 01:25:38 +01:00
Abbes Bahfir	5bac6a92e6	Fix:empty value instead of 0 for empty links	2018-10-23 00:03:34 +01:00
Laurent Destailleur	6a6a8ae14b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:22 +02:00
Laurent Destailleur	5a1a5548df	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php	2018-10-19 14:27:15 +02:00
Laurent Destailleur	762d82f2fe	Move declaration into common	2018-10-19 13:38:05 +02:00
atm-ph	72dd182b1f	Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields	2018-10-16 18:22:43 +02:00
Laurent Destailleur	ded5c4c3dd	Social network module	2018-10-12 11:02:03 +02:00
atm-quentin	7ad4a7e384	NEW creation facture fourn depuis reception	2018-10-09 16:26:40 +02:00
atm-quentin	c6ab79bad3	NEW note, contact and lines on card	2018-10-08 16:54:33 +02:00
Abbes Bahfir	f0d8a5da9a	Fix: Reminder : TODO Add Javascript code to add input fields contents to new elements urls	2018-10-08 12:39:59 +01:00
Abbes Bahfir	7d25311ce5	New : Link to create new element on linked fields	2018-10-08 10:59:01 +01:00
atm-quentin	6a8092dfae	NEW entete reception card	2018-10-05 16:21:50 +02:00
Frédéric FRANCE	2af15ee932	Update commonobject.class.php	2018-09-30 17:59:04 +02:00
Laurent Destailleur	f667270d4d	Add option to not load all object and fix so linkedObjectsIds has same content than linkedObjects	2018-09-28 17:38:29 +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
Laurent Destailleur	2b8ccc0c81	FIX Link template invoice to contract	2018-09-27 01:53:12 +02:00
Laurent Destailleur	9123329800	FIX Link template invoice to contract	2018-09-26 23:44:27 +02:00
Philippe GRAND	746d73b8e6	Add some code comment	2018-09-25 17:26:57 +02:00
atm-greg	4e4a6294f6	missing return	2018-09-25 15:18:10 +02:00
atm-greg	45bef65fc9	add hook on commongeneratedocument	2018-09-25 14:47:13 +02:00
Laurent Destailleur	61f5a2e899	Merge pull request #9533 from frederic34/trimParameters trimParameters function	2018-09-18 15:04:32 +02:00
Laurent Destailleur	0bf540b3c1	Fix regression in edition of date	2018-09-17 09:17:11 +02:00
Frédéric FRANCE	b950043618	trimParameters	2018-09-16 15:16:08 +02:00
Laurent Destailleur	ab0f842db6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-16 12:55:44 +02:00
Laurent Destailleur	cc4fbfc3ef	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/class/commonobject.class.php	2018-09-16 12:54:39 +02:00
Laurent Destailleur	eebd329c7c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modAgenda.class.php htdocs/core/modules/modFacture.class.php htdocs/langs/en_US/admin.lang htdocs/langs/en_US/main.lang htdocs/stripe/transaction.php	2018-09-16 09:50:13 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Jean-Marie Arsac	345c24990e	Correction of variable name	2018-09-11 20:51:54 +02:00
Jean-Marie Arsac	2f2dff8155	Convert localized numeric extrafields value before inserting - add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()	2018-09-11 14:57:31 +02:00
Regis Houssin	43ac51b44c	FIX remove debug	2018-09-10 10:11:07 +02:00
Regis Houssin	8699866062	FIX better compatibility with multicompany	2018-09-10 10:08:04 +02:00
Frédéric FRANCE	8249756726	replace select_date	2018-09-09 10:40:00 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	04c1a7d4af	move phpcs:ignore	2018-09-02 13:38:11 +02:00
Philippe GRAND	3de16a145e	Standardize and update code	2018-09-02 11:08:41 +02:00
Laurent Destailleur	c8912d6a4f	Merge pull request #9242 from frederic34/camelCaps mark non camelCaps function	2018-09-01 15:37:56 +02:00
Laurent Destailleur	359eebbbec	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-01 14:26:48 +02:00
Laurent Destailleur	08bc81a7ab	Merge pull request #9370 from joseplluis/patch-5 NEW optional param to show a specific extrafield	2018-09-01 14:24:23 +02:00
Laurent Destailleur	bc71aef7b4	Code comment	2018-09-01 14:24:02 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Josep Lluís	78c0aa437f	NEW optional param to show a specific extrafield Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas. For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));	2018-08-31 17:16:27 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Frédéric FRANCE	cbdc669ba9	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-29 18:45:36 +02:00
Laurent Destailleur	7bf48b8d77	Fix date_start and date_end not saved on supplier invoice Conflicts: htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/facture/card.php	2018-08-29 17:26:41 +02:00
Laurent Destailleur	98356c6ed0	Fix date_start and date_end not saved on supplier invoice	2018-08-29 17:03:18 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	7219bac0b2	Merge pull request #9168 from frederic34/trimtrailing Trimtrailing	2018-08-28 02:30:02 +02:00
Philippe GRAND	215677c972	Standardize and update code	2018-08-23 18:17:09 +02:00
Philippe Grand	e09f7bedd0	Update commonobject.class.php	2018-08-23 09:57:19 +02:00
Philippe GRAND	504b0e3d16	Update and standardize code	2018-08-22 18:34:50 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	5146ab9177	trim	2018-08-14 15:34:44 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	2f559a7edb	Merge pull request #9199 from atm-quentin/FIX_hook_update_price NEW Add hook changeRoundingMode in update_price	2018-08-12 18:17:52 +02:00
Laurent Destailleur	3d4d42462c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-12 16:30:21 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
John BOTELLA	d6d8f98f38	add retained warranty cond field and add forms	2018-08-10 15:06:00 +02:00
Laurent Destailleur	61d7629ab1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php	2018-08-08 17:44:22 +02:00
Laurent Destailleur	8d54df4263	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2018-08-08 17:31:23 +02:00
ATM-Nicolas	5b15e688af	FIX : PHP warning, undefined index notnull	2018-08-07 09:38:18 +02:00
atm-quentin	6662bf05ba	FIX hook on update price AND fix id on line	2018-08-03 11:47:43 +02:00
Laurent Destailleur	508133b336	Clean code	2018-07-17 13:04:54 +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
Regis Houssin	9709207a4f	Fix: superadmin can show all users in master entity	2018-07-02 10:18:16 +02:00
Regis Houssin	df718cca5c	Fix: better sql request with multicompany transverse mode	2018-07-02 10:09:56 +02:00
Regis Houssin	df55bee8ae	Fix: missing "$disableremove" global	2018-07-01 15:33:10 +02:00
Laurent Destailleur	ee2d543781	Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist NEW support selllist in the module builder	2018-06-30 15:33:17 +02:00
Laurent Destailleur	ac758e02a9	Fix error message with old usage of childtables	2018-06-27 01:32:54 +02:00
Laurent Destailleur	668608db5e	Fix error message with old usage of childtables	2018-06-26 18:26:44 +02:00
Laurent Destailleur	00165871bd	CSS	2018-06-23 15:10:44 +02:00
Laurent Destailleur	4b84b7ccf2	Merge pull request #8926 from fappels/develop_fix_setvaluefrom FIX commonobject setValueFrom trigger	2018-06-13 20:50:26 +02:00
Laurent Destailleur	50aa674ebc	Fix support of 'help' field property. Fix bad td closing.	2018-06-13 13:36:40 +02:00
fappels	a9f60bcdac	fix travis	2018-06-06 22:04:12 +02:00
fappels	81ef355b65	Fix trigger on setValueFrom Load updated values into object for trigger.	2018-06-06 17:10:46 +02:00
Laurent Destailleur	87d073b5cd	Fix conflict with external ticketsup module	2018-06-04 21:49:29 +02:00
Laurent Destailleur	b094ae953e	Better log	2018-06-01 17:20:49 +02:00
Laurent Destailleur	7eea70ebc8	FIX #8858 #8860 Backport better compatibility fix	2018-05-29 10:13:34 +02:00
Frédéric FRANCE	e2a557aadd	limit length of lines to 500 chars	2018-05-27 15:04:12 +02:00
patrick Delcroix	ef37fccef4	Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist	2018-05-26 23:43:17 +02:00
patrick Delcroix	adda3144bc	Fix Show double(x,y) fields	2018-05-26 23:39:36 +02:00
Laurent Destailleur	bcbe28d802	Code comment	2018-05-25 12:48:33 +02:00
Laurent Destailleur	f3713844ee	Update commonobject.class.php	2018-05-25 12:38:01 +02:00
Laurent Destailleur	770e97431b	Update commonobject.class.php	2018-05-25 12:36:38 +02:00
Laurent Destailleur	86b1904a41	Update commonobject.class.php	2018-05-25 12:33:30 +02:00
Laurent Destailleur	520ce99e56	Merge pull request #8828 from bgenere/develop FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php	2018-05-25 11:17:45 +02:00
Laurent Destailleur	a3bea8d298	Update commonobject.class.php	2018-05-25 11:17:01 +02:00
Laurent Destailleur	fbcaf8872b	Merge pull request #8808 from atm-john/Add_table_thead_and_tbody Add table thead and tbody for object lines	2018-05-25 10:42:26 +02:00
delcroix Patrick	3158fdc551	Update commonobject.class.php	2018-05-24 21:20:34 +02:00
delcroix Patrick	c85d216f8e	Merge branch 'develop' into patch-modulebuilder-supportsellist	2018-05-22 22:24:20 +02:00
patrick Delcroix	29d26b6e89	New: support sellist in modulebuilder	2018-05-22 22:16:25 +02:00
patrick Delcroix	2ccaf1ad95	New: support sellist in modulebuilder	2018-05-22 22:00:20 +02:00
Laurent Destailleur	1b20ec05d1	Save translation	2018-05-21 19:37:47 +02:00
Laurent Destailleur	c141c3ecfd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-21 19:35:26 +02:00
Laurent Destailleur	05c2f206ff	Fix missing lang	2018-05-21 19:35:12 +02:00
bgenere	227539d647	FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php for date and datetime fields The jdate function is not called when not needed.	2018-05-21 16:55:35 +02:00
John	8710cf570d	Add table thead and tbody for object lines	2018-05-17 16:52:16 +02:00
John	b01893d536	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull	2018-05-16 15:29:57 +02: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	2fc2c44de4	Fix phpcs	2018-04-29 20:18:50 +02:00
Laurent Destailleur	0cdfd6800a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +02:00
Regis Houssin	2906358383	Fix: use "socpeople" instead "societe"	2018-04-27 10:42:10 +02:00
Laurent Destailleur	659fd46b76	Merge pull request #8653 from ATM-Marc/NEW_commonObject_array NEW: work on CommonObject 'array' field typeNew common object array	2018-04-27 09:39:26 +02:00
Laurent Destailleur	9d070cac87	NEW Can add product in supplier order/invoice even w/o predefined price Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY, SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old behaviour.	2018-04-24 12:57:31 +02:00
florian HENRY	67329b8805	fix commonobject double style	2018-04-24 12:33:07 +02:00
Laurent Destailleur	fb8ad77378	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/6.0.0-7.0.0.sql	2018-04-23 23:09:53 +02:00
Laurent Destailleur	0a5e606937	FIX extrafields price and double were lost during a failed post.	2018-04-23 22:53:57 +02:00
Laurent Destailleur	e9a2894727	Fix PSR2	2018-04-22 20:59:29 +02:00
Laurent Destailleur	cca4b1cbf5	NEW Optimize load of hooks classes (save 1-5Kb of memory)	2018-04-21 11:24:45 +02:00
Marc de Lima Lucio	39e890e2d7	FIX: handle non-js users	2018-04-20 16:43:27 +02:00
Marc de Lima Lucio	2bf66780cb	FIX: travis + code readability	2018-04-20 16:38:52 +02:00
Marc de Lima Lucio	41a0727481	NEW: work on CommonObject 'array' field type	2018-04-20 16:38:52 +02:00
Laurent Destailleur	d0efc41983	New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD	2018-04-20 14:50:11 +02:00
Laurent Destailleur	bbd1257222	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-20 01:50:08 +02:00
Laurent Destailleur	e621daa61d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-20 01:47:54 +02:00
Laurent Destailleur	54154343b2	Merge pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default FIX: CommonObject: don't require 'notnull' field if 'default' set	2018-04-20 01:28:00 +02:00
Marc de Lima Lucio	893ce55852	FIX: commonobject: don't require notnull field if default set	2018-04-19 10:29:48 +02:00
Marc de Lima Lucio	e88830820a	FIX: dont print empty date in CommonObject::showOutputField	2018-04-18 11:13:18 +02:00
Regis Houssin	ff76e60c49	Fix: some bugs and warnings	2018-04-18 10:13:20 +02:00
Laurent Destailleur	2135365e0a	Bug new extrafields architecture	2018-04-17 14:44:55 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Philippe GRAND	0a6bcb2a39	fix typo and translation	2018-04-15 07:37:23 +02:00
Philippe GRAND	7943a19402	fix typo	2018-04-15 07:07:04 +02:00
Laurent Destailleur	9f5eed0c9a	Code comment	2018-04-13 14:12:31 +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	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
Laurent Destailleur	ea2fd67e0d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang	2018-04-12 13:31:14 +02:00
Laurent Destailleur	ca6b7205ef	Update commonobject.class.php	2018-04-11 16:27:56 +02:00
Laurent Destailleur	273eadab43	Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830)	2018-04-11 13:18:10 +02:00
Laurent Destailleur	f181719769	Can fetch a companypaymentmode of a thirdparty	2018-04-10 18:11:08 +02:00
ATM-Nicolas	47d5b1f6fd	FIX : update wrong datetime extrafield	2018-04-10 16:39:28 +02:00
Marc de Lima Lucio	7aa4d16eef	NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked	2018-04-10 16:23:56 +02:00
Laurent Destailleur	0bf4381226	NEW The field "visible" on extrafield can accept expression as condition	2018-04-10 15:39:11 +02:00
Laurent Destailleur	24f4d5040a	Move isInEEC from common to thirdparty class.	2018-04-09 14:25:02 +02:00
John	63180f45a8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-09 09:17:26 +02:00
Laurent Destailleur	2d547abaa9	Merge pull request #8498 from atm-john/New_import_lines_from_linked_element New import lines from linked element	2018-04-05 18:26:47 +02:00
Laurent Destailleur	eeb2d5a4da	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/cron/list.php	2018-04-05 13:24:36 +02:00
Regis Houssin	5914bfdf18	Fix: more complete	2018-04-05 13:00:55 +02:00
Regis Houssin	156d26ddb9	Fix: backward compatibility	2018-04-05 13:00:50 +02:00
John	ce24ca08ee	move list of situation table and fix credit note display	2018-04-04 12:33:48 +02:00
John	b7681e7249	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation	2018-04-03 14:12:49 +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
florian HENRY	cc7deb0add	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0	2018-03-29 09:36:05 +02:00
florian HENRY	78812ef826	better error management	2018-03-29 09:35:47 +02:00
Laurent Destailleur	1c86eb1c44	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/quarter_report.php htdocs/core/lib/tax.lib.php	2018-03-29 03:08:01 +02:00
Laurent Destailleur	125085acee	Fix name of method to avoid ci errors	2018-03-29 03:01:05 +02:00
florian HENRY	af7c1d8da1	fix error log	2018-03-27 18:39:18 +02:00
Laurent Destailleur	852191010a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:29:11 +02:00
fappels	caa43ae2f6	Make helper methods available for derived classes. Use-case: a module build with modulebuilder can make it's own fetch method using the helper methods.	2018-03-23 17:35:46 +01:00
John	88fab15c60	Change situation display	2018-03-23 17:12:09 +01:00
Laurent Destailleur	171ad5dce2	Enhance code for template invoices	2018-03-22 21:42:19 +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
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	f8ca4b1b5c	NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD	2018-03-19 11:34:48 +01:00
Laurent Destailleur	3f7cd8b1bd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-14 13:56:41 +01:00
Laurent Destailleur	5c2a005e75	Work on generic customer payment modes	2018-03-14 13:56:21 +01:00
Laurent Destailleur	cc9a6ee6e0	Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE	2018-03-14 10:49:54 +01:00
Laurent Destailleur	da617f7d32	Can work both with remote and local payment modes	2018-03-13 22:43:50 +01:00
Alexis Algoud	74dc815bfa	fix commonobject isInt for module builder capabilities	2018-03-10 19:02:06 +01:00
Alexis Algoud	b370a3096c	fix commonobject isInt for module builder capabilities	2018-03-10 14:14:31 +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
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
florian HENRY	03873038d5	fix comment task	2018-03-07 08:47:34 +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	9355c5a8d7	Fix scrutinizer	2018-03-04 11:31:57 +01:00
Laurent Destailleur	e574ec4bf1	Fix backward compatibility	2018-03-04 11:28:01 +01:00
Laurent Destailleur	82fd84fb48	Fix scrutinizer errors	2018-03-04 11:22:43 +01:00
Laurent Destailleur	6338328c90	Fix scrutinizer errors	2018-03-04 11:09:53 +01:00
Laurent Destailleur	7584fe62e3	Merge pull request #8244 from hregis/develop_bug Fix: avoid warning during "upgrade2" process	2018-03-02 17:51:47 +01:00
Laurent Destailleur	48b578b9f2	Update commonobject.class.php	2018-03-02 17:51:21 +01:00
Laurent Destailleur	0f237e4d5c	NEW Add mass action enable/disable on cron job list	2018-03-01 15:24:50 +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
Laurent Destailleur	8ac4cb9c43	Add fetch_product	2018-02-27 16:33:50 +01:00
Regis Houssin	1aa1b0a3ea	Fix: avoid warning during "upgrade2" process	2018-02-26 12:15:30 +01:00
Laurent Destailleur	c8078b54b5	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php	2018-02-24 12:52:57 +01:00
Laurent Destailleur	435e4823a5	Fix some warning during install	2018-02-24 11:58:09 +01:00
Laurent Destailleur	d8bf553ea9	Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing	2018-02-23 19:55:15 +01:00
Laurent Destailleur	7cf7bf6e45	Code comment	2018-02-23 16:26:23 +01:00
Laurent Destailleur	f3e1e81219	Fix update of extrafield password that are crypted	2018-02-23 16:11:25 +01:00
Laurent Destailleur	93a8176813	Fix do not encrypt if empty	2018-02-23 15:28:24 +01:00
Laurent Destailleur	863cab362f	NEW Cat set the encryption algorithm for extrafields of type password	2018-02-23 14:38:41 +01:00
John	f313fb925b	Add new checkbox for lines	2018-02-21 17:06:40 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +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
Marc de Lima Lucio	f5ad93b272	NEW: supplier credit notes: handle Excess Paid + translation	2018-02-19 15:52:07 +01:00
Marc de Lima Lucio	e2b65b3755	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note	2018-02-16 09:14:53 +01:00
Laurent Destailleur	362aec3e4b	NEW Add param $dolibarr_main_restrict_ip in config file to limit ips	2018-02-15 19:49:50 +01:00
Laurent Destailleur	6b74c79798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/website.lang	2018-02-15 15:34:17 +01:00
Laurent Destailleur	b515448bbd	Fix delete when no extrafields used	2018-02-15 00:01:25 +01:00
Laurent Destailleur	5f0f9ff326	Fix delete page	2018-02-14 23:57:57 +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	36ac380cac	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 22:26:48 +01:00
Laurent Destailleur	b2835fc803	Fix check of vat only for european countries	2018-02-12 15:54:24 +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
Rui Strecht	8c732a1443	Trying to not include sql request into method setMysoc	2018-02-06 12:01:54 +00:00
Rui Strecht	31372f8948	Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE # Conflicts: # htdocs/core/class/commonobject.class.php	2018-02-06 10:26:38 +00:00
Laurent Destailleur	eedbcbdc40	Merge branch 'develop' into patch-2	2018-02-05 15:43:18 +01:00
Laurent Destailleur	6291cb4cbe	Update commonobject.class.php	2018-02-05 15:41:34 +01:00
Laurent Destailleur	9a0dca57af	Update commonobject.class.php	2018-02-05 15:40:18 +01:00
Laurent Destailleur	9731a7fedc	Code for update more similar than insert	2018-02-05 15:31:40 +01:00
Regis Houssin	839de65012	Fix: avoid error -1	2018-02-05 11:30:31 +01:00
Laurent Destailleur	f57ea2682a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/contrat/card.php htdocs/core/class/commonobject.class.php htdocs/core/class/notify.class.php htdocs/societe/class/societe.class.php	2018-02-03 19:33:24 +01:00
Regis Houssin	13106d34a6	Fix: compatibility with multicompany sharing	2018-02-02 12:36: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	ed3bcf59b6	Try doc hint array of array of int with @var int[][]	2018-02-01 10:50:50 +01:00
Laurent Destailleur	14ecdce650	Fix merge of thirdparties (pb when merging codes and error management)	2018-01-31 18:01:56 +01:00
Rui Strecht	b387c3fdf8	Forgot to update other files to same PR changes	2018-01-31 11:45:30 +00:00
Rui Strecht	75b9caf744	Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2018-01-31 11:19:39 +00:00
Frédéric FRANCE	336c44dc88	trigger on shipping method update	2018-01-26 08:33:35 +01:00
Frédéric FRANCE	d0e83b7902	trigger on bank account update	2018-01-26 08:14:39 +01:00
Frédéric FRANCE	ec38b8a5a2	Update interface_99_modMyModule_MyModuleTriggers.class.php	2018-01-25 22:07:10 +01:00
Frédéric FRANCE	9e0a548eff	Update commonobject.class.php	2018-01-25 17:42:25 +01:00
fappels	00185bd9d4	Fix fetchCommon should return 0 iso error if not found	2018-01-15 11:21:24 +01:00
fappels	25b455272a	Fix 0 is a valif value for a NOT NULL field	2018-01-14 15:31:31 +01:00
Laurent Destailleur	50596a5214	Fix trans key	2018-01-12 14:06:48 +01:00
Laurent Destailleur	e6c7f9e69b	Debug module inventory	2017-12-22 21:29:09 +01:00
Laurent Destailleur	f504716501	Fix sync contact - external user	2017-12-19 16:16:31 +01:00
Laurent Destailleur	1351a43a30	FIX Maxi debug of permission for users external or restricted to sales representatives	2017-12-18 16:13:05 +01:00
Laurent Destailleur	247c380d18	Several fixes	2017-12-12 16:11:40 +01:00
Laurent Destailleur	cc813df2a5	Fix modulebuilder	2017-12-09 20:17:47 +01:00
Laurent Destailleur	f22e7ee24a	Fixes	2017-12-09 17:29:19 +01:00
Laurent Destailleur	ce32da6217	Fix debugs APIs	2017-12-01 15:39:18 +01:00
Laurent Destailleur	0b9a3087ea	Fix bug reported by scrutinizer	2017-11-25 12:11:02 +01:00
Laurent Destailleur	c16a150a70	NEW Remove background on agenda view when event is a not busy event.	2017-11-24 20:02:46 +01:00
Laurent Destailleur	831099fef8	Debug modulebuilder	2017-11-24 16:24:42 +01:00
Laurent Destailleur	b93e35cdd2	Fix a lot of request to use the IN getentity instead of = Fix a lot of request to use left join on type of payment table	2017-11-23 15:06:16 +01:00
Laurent Destailleur	aa91b9075a	Fix cancel button	2017-11-22 11:54:02 +01:00
Laurent Destailleur	5849efd9fc	Work on public sharing files	2017-11-19 20:44:57 +01:00
Laurent Destailleur	c85acbfc11	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php	2017-11-14 19:47:33 +01:00
Laurent Destailleur	b5196b7164	FIX A lot of several fix on local taxes and NPR tax	2017-11-13 14:24:40 +01:00
Laurent Destailleur	53a523ba9d	Module builder	2017-11-12 20:45:06 +01:00
Laurent Destailleur	955ed7dbbf	NEW Show the supplier ref into supplier cards	2017-11-12 15:30:21 +01:00
Regis Houssin	3ffe1b6725	Fix: missing status 3 (only on form)	2017-11-10 16:51:37 +01:00
Laurent Destailleur	c78c06776b	Fix bug reported by scrutinizer	2017-11-05 03:39:27 +01:00
Laurent Destailleur	cd70e1506b	Work on common core code	2017-11-03 17:20:08 +01:00
Laurent Destailleur	a346a1a5e9	Work on website module	2017-11-03 15:56:16 +01:00
Laurent Destailleur	f26d970d58	Remove option MAIN_HTML5_PLACEHOLDER (on by default now)	2017-11-01 10:17:24 +01:00
Laurent Destailleur	9458c80c48	Work on reminders	2017-10-31 23:10:29 +01:00
Laurent Destailleur	bbe1c9c494	NEW Can download PDF document from the payment page	2017-10-30 00:45:47 +01:00
Laurent Destailleur	76b0e7ee5a	NEW Add option PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD	2017-10-29 21:24:54 +01:00
Laurent Destailleur	00db7e16ec	Clean code	2017-10-28 16:00:07 +02:00
Laurent Destailleur	9283aaf6aa	Fix scrutinizer	2017-10-27 00:07:58 +02:00
Laurent Destailleur	89baa0b307	Work on website	2017-10-26 14:49:30 +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	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	bb996019c2	NEW Support visibility on extrafields	2017-10-25 11:42:14 +02:00
Laurent Destailleur	0b120dd1a9	Prepare code to remove hooks on extrafield update	2017-10-24 18:45:34 +02:00
Laurent Destailleur	5984222794	FIX #7679	2017-10-22 03:47:36 +02:00
Laurent Destailleur	19a5780f7f	Clean code	2017-10-20 23:49:20 +02:00
Laurent Destailleur	9c45e86a1c	Introduce main_doc into table of objects to know what is main doc. Work on option PROPOSAL_USE_ONLINE_SIGN	2017-10-19 11:40: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
florian HENRY	51ce8bf2a5	js	2017-10-16 21:08:09 +02:00
florian HENRY	17db813a4e	Logical variable name suffix/prefix	2017-10-16 21:05:12 +02:00
florian HENRY	695740142a	FIX : Extrafield default value admin/defaultvalues.php enabled	2017-10-16 20:54:53 +02:00
Rui Strecht	6c0cb31c08	Fixed issue with merge error	2017-10-09 11:44:10 +01:00
Rui Strecht	1a5cdf2406	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE # Conflicts: # htdocs/admin/company.php # htdocs/core/class/commonobject.class.php	2017-10-09 11:36:38 +01:00
Laurent Destailleur	3e0ccd6312	FIX #7585	2017-10-09 10:43:19 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Laurent Destailleur	2148622d40	Clean code	2017-10-06 12:55:48 +02:00
Inovea Conseil	2f3f04c2b1	Add constant to manage update_price function Some external module want no update price after a trigger because they have a other method to calculate the total (ex: with a extrafield).	2017-10-06 10:42:25 +02:00
Laurent Destailleur	ded55f41fb	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2017-10-04 16:08:22 +02:00
Laurent Destailleur	13cb806436	FIX #7531 #7537	2017-10-04 15:18:15 +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	e23a88732e	Fix default value on extrafields	2017-09-30 20:05:34 +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
Rui Strecht	3ebb18ab16	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE	2017-09-26 16:34:59 +01:00
Laurent Destailleur	c9e9f60f8f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/filefunc.inc.php	2017-09-25 19:55:52 +02:00
Laurent Destailleur	fe55feb82f	FIX #7461	2017-09-25 19:45:01 +02:00
Rui Strecht	395100ca70	Added missing comments for new function parameters, removed unused parameter $searchlabel	2017-09-20 12:45:18 +01:00
Rui Strecht	24f8ea003a	Added self to contributors list	2017-09-20 12:30:59 +01:00
Rui Strecht	f1126b65bf	Updated method to fetch state name, code and id to match method used with country Reverted some previous changes to allow backwards compatibility Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card	2017-09-20 12:06:35 +01:00
arnaud	9795f48046	NEW comment system working with all objects	2017-09-18 17:27:29 +02:00
Laurent Destailleur	5e34b121dd	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00
Laurent Destailleur	b80b7bbcb9	Merge pull request #7384 from atm-ph/fix_6.0_get_class_self Fix get_class(self) instead of get_class($this)	2017-09-14 12:16:16 +02:00
Laurent Destailleur	74b55d8e8d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-14 11:49:43 +02:00
Laurent Destailleur	ed013c1b7e	Compatibilty php 7.2	2017-09-14 10:21:04 +02:00
Laurent Destailleur	eadfbfe2bd	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions2.lib.php	2017-09-13 20:57:53 +02:00
Laurent Destailleur	a5a08006e9	FIX multicompany better accuracy in rounding and with revenue stamp.	2017-09-13 19:27:21 +02:00
atm-ph	30eb03af4c	Fix get_class(self) instead of get_class($this)	2017-09-12 16:36:14 +02:00
Laurent Destailleur	e7abb39ee2	NEW Template invoices are visible on the customer tab	2017-09-10 19:28:20 +02:00
Laurent Destailleur	3126676ffb	FIX inert of extra field must not change extrafield values in memory	2017-09-03 14:27:46 +02:00
Laurent Destailleur	a4d3e48773	FIX inert of extra field must not change extrafield values in memory	2017-09-03 12:40:49 +02:00
Laurent Destailleur	9923c87fd8	Fix translation of extrafields	2017-09-02 13:03:14 +02:00
Laurent Destailleur	36eb21c135	Fix translation of extrafields	2017-09-02 13:02:01 +02:00
Laurent Destailleur	e5400a4a36	Fix translation of extrafields	2017-09-02 13:01:41 +02:00
Laurent Destailleur	3f7eea2e0a	NEW Can set language on extrafields	2017-08-27 12:12:02 +02:00
Laurent Destailleur	326d3df63f	FIX select of category FIX pb with extrafield list and key '0' Conflicts: htdocs/core/class/extrafields.class.php	2017-08-24 13:28:56 +02:00
Laurent Destailleur	7da6f93d7e	FIX select of category FIX pb with extrafield list and key '0'	2017-08-24 13:23:15 +02:00
Laurent Destailleur	db9cc4683a	Fix php warning	2017-08-22 15:29:40 +02:00
Laurent Destailleur	188653a85d	Work on website module	2017-08-20 18:50:51 +02:00
Laurent Destailleur	260beed512	NEW Generated files are now indexed in database	2017-08-18 23:19:55 +02:00
Laurent Destailleur	81b11100b0	Prepare code to clone site an fetch external page	2017-08-03 01:45:31 +02:00
Laurent Destailleur	760d2617a0	Can disable the search of previous/next in dol_banner	2017-07-25 23:03:28 +02:00
Laurent Destailleur	5b9ac2a7a9	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/index.php	2017-07-25 21:11:36 +02:00
Laurent Destailleur	c386a02889	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/langs/en_US/stocks.lang	2017-07-25 21:10:08 +02:00
Laurent Destailleur	8b793a261f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/modules/DolibarrModules.class.php	2017-07-25 21:08:31 +02:00
Laurent Destailleur	a7c96416ba	Merge pull request #7194 from hregis/6.0_bug2 Fix: getEntity $shared param value is now 1 by default	2017-07-25 13:29:42 +02:00
Laurent Destailleur	dcf5fd20bb	Fix navigation on card generated by modulebuilder	2017-07-25 10:38:39 +02:00
Laurent Destailleur	bfd1fa3984	Enhance modulebuilder	2017-07-25 02:56:19 +02:00
Laurent Destailleur	13cd203502	Enhance modulebuilder	2017-07-25 01:54:54 +02:00
Laurent Destailleur	70341d6169	Debug modulebuilder	2017-07-25 00:33:43 +02:00
Laurent Destailleur	307b8ef4f6	Debug modulebuilder	2017-07-25 00:32:06 +02:00
Laurent Destailleur	dcb79e66cc	Debug modulebuilder	2017-07-24 13:55:12 +02:00
Regis Houssin	48800bc268	Fix: getEntity $shared param value is now 1 by default	2017-07-24 08:52:10 +02:00
Laurent Destailleur	6830fe4f91	Fix generic clone function	2017-07-21 13:39:06 +02:00
Laurent Destailleur	312b153005	Fix phpcs	2017-07-13 23:46:01 +02:00
Laurent Destailleur	43f6eab2ea	FIX #7146	2017-07-13 15:16:17 +02:00
Laurent Destailleur	c434f72d31	Merge pull request #7146 from hregis/6.0_bug3 Fix: travis error (categorie)	2017-07-13 14:46:41 +02:00
Regis Houssin	44a44ab0a2	Fix: travis error	2017-07-12 16:45:32 +02:00
Laurent Destailleur	33ceb22b8b	Fix error management into modulebuilder	2017-07-12 13:25:18 +02:00
Laurent Destailleur	f40afcf023	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php	2017-07-08 18:32:34 +02:00
gauthier	a6f1e08c19	FIX : we have to check if contact doesn't already exist on add_contact() function	2017-07-07 11:48:30 +02:00
Laurent Destailleur	6f82837b0f	Fix GETPOST of lang_id	2017-06-27 17:27:01 +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
Laurent Destailleur	d8b0199ba2	FIX #7040	2017-06-20 10:24:54 +02:00
BENKE Charlene	fcdf68db6a	Update commonobject.class.php	2017-06-17 16:31:54 +02:00
BENKE Charlene	5320ebc051	getTotalWeightVolume : add conversion Lb & oz to KG New conversion value : Oz once Little az a wizzard...	2017-06-17 10:16:52 +02:00
Laurent Destailleur	1af74b4c42	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-06-09 12:50:56 +02:00
Laurent Destailleur	62933e9a26	Fix sql syntax error in some cases	2017-06-09 11:22:42 +02:00
Laurent Destailleur	929946ad47	Fix several problem with hook printFieldListWhere	2017-06-09 10:12:01 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	e667d72547	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: dev/skeletons/build_class_from_table.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php	2017-05-29 10:41:51 +02:00
Laurent Destailleur	d03d179fa3	FIX Fullname when member is a moral entity with no name.	2017-05-28 23:43:24 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	46ff62fc87	Work on inventory module debug	2017-05-06 22:28:07 +02:00
Laurent Destailleur	11b1a2adac	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php	2017-05-05 14:49:25 +02:00
Laurent Destailleur	eb2124bfc8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-05 14:14:53 +02:00
Laurent Destailleur	2120b9af85	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/theme/eldy/style.css.php	2017-05-05 14:14:21 +02:00
Laurent Destailleur	90542d119a	FIX trigger name and status set of setStatus for commercial proposal	2017-05-05 13:25:30 +02:00
Laurent Destailleur	9785e9b298	Update commonobject.class.php	2017-05-05 09:57:51 +02:00
Laurent Dinclaux	24a2fb57ea	Resolved merge conflict	2017-05-05 10:22:46 +11:00
Laurent Dinclaux	f63f28c7fe	Fix vat_src_code propagation between post types	2017-05-03 21:37:30 +11:00
alexis portable	da4d179d36	fix travis	2017-05-02 23:20:23 +02:00
alexis portable	d1a443f0f0	fix camelcase for travis	2017-05-02 23:11:05 +02:00
Laurent Destailleur	3917bdfc79	Fix vat_src_code propagation.	2017-05-02 22:37:43 +02:00
alexis Algoud	6138d197e4	FIX major issues for inventory - Move all needed declaration from coreobject to commonobject for updateCommon, fetchCommon, deleteCommon, createCommon - Just leave method for child object into coreobject, check later if is useless - debug inventory card, PHP 7.0 compatibility - activate rights for inventory into stock module - add inventory options into stock admin module	2017-05-02 15:19:55 +02:00
Marcos García de La Fuente	166f2d262d	Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume	2017-05-02 14:00:27 +02:00
Laurent Destailleur	1e3384a842	Fix travis	2017-04-30 14:16:58 +02:00
Laurent Destailleur	865c8140d1	Clean code	2017-04-30 03:23:06 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	e6e9b65594	NEW Reduce memory usage by removing deprecated constant loading.	2017-04-14 12:38:52 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	2446cb5431	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: htdocs/compta/facture.php htdocs/compta/facture/fiche-rec.php htdocs/contact/list.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/facture/card.php htdocs/societe/list.php htdocs/user/document.php	2017-04-11 11:43:54 +02:00
altatof	d892a89f45	FIX: dont get empty "Incoterms : - " string if no incoterm	2017-04-07 14:15:51 +02:00
Laurent Destailleur	e2ea5945dd	Work on look and feel v6	2017-04-06 21:48:28 +02:00
dolibarr95	1489847a74	Display mobile icon Display a specific icon when mobile	2017-03-30 09:49:34 +02:00
Laurent Destailleur	d951114c18	Merge branch 'develop' into NEW_odt_others_objects	2017-03-14 10:44:05 +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	209bd0b3e4	2nd try to fix better compatibility	2017-03-10 16:53:26 +01:00
Laurent Destailleur	c72e7c1057	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php	2017-03-10 14:54:35 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
Laurent Destailleur	8389db18bf	Fix solution for comaptibility	2017-03-10 10:07:09 +01:00
Laurent Destailleur	92d9eb3c5d	Several fix for a better management of #6424	2017-02-22 17:46:54 +01:00
Laurent Destailleur	596c092ec8	Merge pull request #6219 from atm-florian/dev_changelistchild NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list	2017-02-08 16:49:18 +01:00
Laurent Destailleur	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
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	756919de2a	Fix deadlock feature: could not solve a situation where an emailing was validated by error.	2017-01-29 16:08:45 +01:00
florian HENRY	055a00a338	fix travis	2017-01-27 15:18:12 +01:00
florian HENRY	cb6209de31	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild Conflicts: htdocs/core/class/commonobject.class.php	2017-01-27 15:16:28 +01:00
Laurent Destailleur	3c86507ce6	FIX #6328	2017-01-27 00:51:22 +01:00
florian HENRY	d714a52f95	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild Conflicts: htdocs/core/class/commonobject.class.php	2017-01-23 11:35:11 +01:00
Laurent Destailleur	5362d10c0d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/hookmanager.class.php	2017-01-21 21:56:24 +01:00
Laurent Destailleur	b8a80f9311	Fix code comment and missing showLinkToObjectBlock hook declaration as an addreplace hook.	2017-01-21 17:30:35 +01:00
Laurent Destailleur	2566df8252	Merge pull request #6298 from benlo06/fix_shipping_contactid FIX getIdContact for shipping	2017-01-18 15:53:32 +01:00
Benoit	73852beb4e	FIX contactid for shipping pdf	2017-01-17 21:55:21 +01:00
Laurent Destailleur	36bd63c1a7	NEW PHP 7.1 compatibility	2017-01-16 09:05:18 +01:00
Laurent Destailleur	6bfd534a36	NEW PHP 7.1 compatibility	2017-01-16 01:21:33 +01:00
Laurent Destailleur	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	5553be4aa9	Fix code comment	2017-01-11 16:08:04 +01:00
Laurent Destailleur	51b9802de4	NEW Hook to allow inserting custom product head #6001	2017-01-07 20:42:35 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Laurent Destailleur	f46ce68d08	NEW Can sort thumbs visible on product card	2016-12-31 16:16:20 +01:00
florian HENRY	337897e0a1	NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list	2016-12-23 15:01:49 +01:00
Laurent Destailleur	54aa8696ad	Fix regression	2016-12-18 13:01:26 +01:00
Laurent Destailleur	4ece746437	Merge pull request #6168 from defrance/patch-61 FIX navigation field is always ref	2016-12-18 11:02:14 +01:00
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
BENKE Charlie	2cebeb72aa	FIX navigation field is always ref	2016-12-14 15:04:07 +01:00
Maxime Kohlhaas	f7524b93ad	Actualize currency on supplier order and invoice	2016-12-11 02:50:21 +01:00
Maxime Kohlhaas	177ec97689	Actualize currency on propal, order and invoice	2016-12-11 01:04:58 +01:00
Maxime Kohlhaas	7c82b18da0	New : allow to actualize currency rate	2016-12-10 22:07:25 +01:00
Laurent Destailleur	017e384f16	FIX Preselected value for extrafield link was not correctly set	2016-12-06 13:10:44 +01:00
Laurent Destailleur	788cbf9a01	Complete work on dol_banner on contracts	2016-12-04 13:30: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	16ce156631	Fix responsive design	2016-11-25 18:32:52 +01:00
gauthier	c433829d27	NEW : interface	2016-11-25 11:04:42 +01:00
Laurent Destailleur	e9b78db1ac	Several bug fixes: missing import_key field, ref generator parameter must be task not project, import must use css, serious database integrity problem accepting duplicate tasks.	2016-11-19 02:16:12 +01:00
Laurent Destailleur	a28e2a7fb6	Merge pull request #5863 from benlo06/fr_total_tva New: Permit to print TotalTTC price in objectline_view	2016-11-08 14:46:16 +01:00
Laurent Destailleur	341e014a3d	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/don/document.php	2016-11-08 11:36:31 +01:00
Laurent Destailleur	9b64fbaa98	Fix having the css of extrafield on td is not enough to detect it. We must have it on tr too.	2016-11-06 16:26:18 +01:00
Laurent Destailleur	a3607fff77	Fix customer ref of shipment	2016-10-30 16:34:46 +01:00
Laurent Destailleur	b4303470f8	Fix do not update instance status if method used to update other element	2016-10-30 15:42:43 +01:00
Laurent Destailleur	32b6660f63	Uniformize code	2016-10-29 16:18:39 +02:00
Benoit	a46e7d8e1a	Change inputalsopricetotalwithtax to outputalsopricetotalwithtax	2016-10-24 10:18:24 +02:00
Laurent Destailleur	35601775e0	By default we open a new tab on external url link	2016-10-22 17:05:47 +02:00
Benlo	4ebd1ff8a2	Permit to print Total TTC price in objectline	2016-10-12 12:30:22 +02:00
Laurent Destailleur	db3e3642b0	NEW Can generate SEPA mandate for each bank account of your customers	2016-10-06 00:14:25 +02:00
Laurent Destailleur	45a808e034	NEW Generation of document is available on member card	2016-10-03 00:08:47 +02:00
Laurent Destailleur	0d9f28bd61	Fix dash in incoterm label	2016-10-02 16:50:28 +02:00
aspangaro	2dbeeedd14	Move tab menu for subscription in member.lib Move all pages for subscription member in adherent/subscription (Card / Info / List) Rename llx_cotisation in llx_subscription Rename all db field cotisation in subscription Rename class Cotisation in class Subscription	2016-09-24 06:48:40 +02:00
Laurent Destailleur	c4c7ccc226	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/societe/note.php htdocs/societe/rib.php	2016-09-19 14:05:16 +02:00
Laurent Destailleur	4f842fd2cb	Uniformize look and feel	2016-09-19 13:57:50 +02:00
Laurent Destailleur	c8b8e13014	Work on dol_banner for proposals.	2016-09-18 21:38:20 +02:00
phf	0cf5ee2f28	Fix clone object with "link" as extrafield	2016-09-13 10:12:55 +02:00
Laurent Destailleur	0ab377440d	Complete param of setValueFrom	2016-09-12 20:16:39 +02:00
Laurent Destailleur	5c1127fc54	NEW Enhance function setValueFrom so we can use it for "edit in form" feature.	2016-09-12 20:00:47 +02:00
Laurent Destailleur	5ea9fc7467	NEW Support extrafields on product lot.	2016-09-12 17:27:44 +02:00

... 12 13 14 15 16 ...

2123 Commits