dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	cdf6e4b65a	Fix some PSR rules	2019-03-14 16:43:27 +01:00
Laurent Destailleur	30c327c702	CSS	2019-03-12 17:19:58 +01:00
Christophe Battarel	ae50a8b896	change add_commercial signature	2019-03-12 10:48:08 +01:00
markus	1e4ed531b4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-03-08 11:47:08 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
markus	c905575d3e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-03-04 17:26:40 +01:00
Laurent Destailleur	dd9a4a8cbc	CSS	2019-03-04 12:29:36 +01:00
Laurent Destailleur	4f9981063f	Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing	2019-03-02 18:26:50 +01:00
Laurent Destailleur	56d921ea52	CSS	2019-03-02 12:57:07 +01:00
Frédéric FRANCE	62501b11e8	add visibility	2019-03-02 00:14:22 +01:00
Laurent Destailleur	3bffa69f1d	Remove deprecated code	2019-02-27 15:23:56 +01:00
Laurent Destailleur	6373e1db84	Merge branch 'develop' into 10.0_linkedin	2019-02-27 01:16:21 +01:00
Laurent Destailleur	3a2a1b4a56	Debug module ticket	2019-02-26 13:43:09 +01:00
markus	d38bff6f14	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-02-26 12:31:24 +01:00
atm-quentin	dc7a2fbb30	FIX placement function	2019-02-25 10:01:26 +01:00
Alexandre SPANGARO	2da1447a0b	Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin	2019-02-25 09:12:04 +01:00
Alexandre SPANGARO	acb9cfe07a	NEW: Add LinkedIn field	2019-02-25 09:07:58 +01:00
Laurent Destailleur	6b46a927f1	Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket	2019-02-24 20:53:54 +01:00
Laurent Destailleur	3fa2680859	Merge pull request #10669 from frederic34/html5fix replace by html5 in ticket supplier_proposal, stripe, societe	2019-02-24 20:36:24 +01:00
Frédéric FRANCE	894123fb06	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
Frédéric FRANCE	8b090c165e	replace html code by html5 in societe	2019-02-23 21:18:44 +01:00
Frédéric FRANCE	c1c6103138	replace html code by html5 in societe	2019-02-23 21:02:39 +01:00
Frédéric FRANCE	a497a81aac	Update api_contacts.class.php	2019-02-23 19:09:27 +01:00
atm-quentin	7850925441	FIX amount opened on thirdparty card dont care of credit note not converted	2019-02-22 15:10:41 +01:00
markus	aa5dfb3cf9	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2019-02-16 14:43:35 +01:00
Laurent Destailleur	551a195595	Merge pull request #10612 from frederic34/patch-22 remove dead code in /societe/contact.php	2019-02-15 15:18:06 +01:00
Laurent Destailleur	43ef2d1be6	Update api_contacts.class.php	2019-02-15 15:10:10 +01:00
ptibogxiv	df9f248537	Update api_contacts.class.php	2019-02-14 21:12:00 +01:00
Frédéric FRANCE	dd1d7121a8	remove dead code in /societe/contact.php	2019-02-14 20:36:08 +01:00
ptibogxiv	bc8b6ed993	Fix count ref in contact list API	2019-02-14 17:23:48 +01:00
Laurent Destailleur	a7af1b1765	Remove deprecated code	2019-02-14 16:29:13 +01:00
Laurent Destailleur	aedf91b522	Fix: add parameter $includecount	2019-02-14 16:22:42 +01:00
ptibogxiv	0aeaac7c5f	Fix count of ref in an contact object API	2019-02-14 16:00:45 +01:00
markus	01b12793d2	fix typo in comment	2019-02-12 13:59:55 +01:00
Laurent Destailleur	e054b080a5	Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing	2019-02-12 13:33:39 +01:00
Frédéric FRANCE	b041eeae22	first parameter of print_liste_field_titre was translated	2019-02-10 18:11:34 +01:00
klemens	beb2791dde	spelling fixes	2019-02-10 12:59:09 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	14a48b2c95	Fix phpcs	2019-02-08 11:17:04 +01:00
Laurent Destailleur	7334f02e5c	Merge pull request #10514 from atm-florian/dev_defautselectcustomertype Dev defautselectcustomertype	2019-02-08 09:56:29 +01:00
Laurent Destailleur	af92303319	Merge pull request #10487 from frederic34/psr2squizwhite psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-08 09:30:25 +01:00
Laurent Destailleur	0156cd40a6	Fix name	2019-02-07 14:00:32 +01:00
Laurent Destailleur	065e74379b	Missing picto	2019-02-07 13:54:38 +01:00
Laurent Destailleur	2ef8544a39	sort and filter on parent company	2019-02-07 13:52:51 +01:00
florian HENRY	bc74cd5066	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_defautselectcustomertype	2019-02-07 12:21:45 +01:00
Laurent Destailleur	5516cb061d	Fix filter	2019-02-06 18:50:34 +01:00
Laurent Destailleur	d960159b73	NEW Column of parent company is available in list of third parties	2019-02-06 18:49:58 +01:00
florian HENRY	f0f0b69d87	add comment	2019-02-06 10:59:24 +01:00
florian HENRY	3f6187fe12	remove useless parameters	2019-02-06 10:58:40 +01:00
florian HENRY	813a7a0085	remove comment	2019-02-06 10:57:11 +01:00
florian HENRY	3f20cae6d3	NEW: setup default thridparty type (customer or prospect/customer)	2019-02-06 10:54:11 +01:00
Laurent Destailleur	9e28db4202	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/tools/export.php	2019-02-06 00:51:10 +01:00
Laurent Destailleur	ce5717a7b7	FIX Default language of company is not set	2019-02-05 20:43:26 +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
markus	bc2c6282d9	Merge branch 'develop' of https://github.com/mwelters/dolibarr into develop	2019-02-03 17:48:04 +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	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	869159c09f	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:39 +01:00
Laurent Destailleur	1a292839ca	Fix regression in look and feel (if empty, we do not sho value)	2019-01-30 15:31:18 +01:00
Laurent Destailleur	17c3337c9b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-30 15:25:43 +01:00
Regis Houssin	9539bea68a	FIX bad sql request	2019-01-29 12:17:51 +01:00
Regis Houssin	39b696af02	FIX multicompany compatibility	2019-01-29 12:01:40 +01:00
Pierre Ardoin	eca1a2cd64	Update societe.class.php	2019-01-29 11:08:13 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	77747ac2a3	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-28 16:35:12 +01:00
Laurent Destailleur	0827929ede	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/card.php	2019-01-28 16:29:34 +01:00
Laurent Destailleur	1ebd7048fb	Add hook in list of stripe payment mode list	2019-01-28 03:00:28 +01:00
Laurent Destailleur	4398649af6	Add hooks to add column in list of payment modes	2019-01-28 01:46:59 +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	de0a057b8a	Fix div not closed	2019-01-27 19:41:14 +01:00
Laurent Destailleur	f30a3d59ba	Merge branch 'develop' into toomanylines	2019-01-27 17:59:13 +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	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
markus	00597477e4	Fix #10263	2019-01-26 16:06:40 +01:00
Philippe GRAND	73606c85b3	update with html5 compliant code	2019-01-21 10:08:20 +01:00
Laurent Destailleur	300889f53a	# WARNING: head commit changed in the meantime Fix	2019-01-19 13:22:38 +01:00
Laurent Destailleur	2bbaae88d6	Fix standardize 'createfromclone' param when cloning	2019-01-19 12:46:38 +01:00
Laurent Destailleur	2e55bdf087	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-17 19:11:18 +01:00
JC Prieto	5223b1ee1a	FIX: To add more pdf models in thirdparties	2019-01-16 20:23:16 +01:00
atm-quentin	013c078c8b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice	2019-01-16 10:52:46 +01:00
Laurent Destailleur	0f2406c202	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-15 10:55:28 +01:00
Laurent Destailleur	8c6fde72f8	Several fixes in look and feel of module survey	2019-01-13 19:36:00 +01:00
Laurent Destailleur	8ffe4db853	Merge pull request #10317 from mapiolca/patch-1 FIX Multicompany	2019-01-10 14:00:48 +01:00
Laurent Destailleur	5d0ff28556	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/societe/card.php	2019-01-08 01:56:03 +01:00
Laurent Destailleur	d2f6899346	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/admin/defaultvalues.php htdocs/societe/card.php	2019-01-08 01:53:00 +01:00
Laurent Destailleur	087a4400b0	FIX Default value on sales representative on third party creation	2019-01-08 01:05:42 +01:00
mapiolca	aa10d345bd	Update societe.class.php Ajoute la sélection de l'entité avec Multicompagny pour les encours clients.	2019-01-04 17:57:16 +01:00
ldestailleur	bc00fb177a	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-02 19:42:15 +01:00
ldestailleur	a9e8e13bb6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 Conflicts: ChangeLog htdocs/user/param_ihm.php	2019-01-02 19:41:39 +01:00
Frédéric FRANCE	cad95c7dc2	Update societe.class.php	2019-01-02 15:39:22 +01:00
Josep Lluís	f496945677	FIX search by fax field Search by fax field is looking for another field	2018-12-20 14:02:10 +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	31d032d5d3	FIX Can't create a thirdparty from member if customer code is mandatory.	2018-12-18 21:00:06 +01:00
Laurent Destailleur	4a4bf3273b	Experiment disabling of creation of contact+thirdparty with hidden option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION	2018-12-16 13:22:38 +01:00
Laurent Destailleur	88a52aa11d	Merge branch 'develop' into develop_mc	2018-12-14 15:58:52 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Regis Houssin	8953a3ed73	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc Conflicts: ChangeLog	2018-12-03 08:46:03 +01:00
Maxime Kohlhaas	2e496ea83a	QUAL rename facnumber by ref	2018-12-02 17:33:44 +01:00
Laurent Destailleur	6d84036f66	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/index.php htdocs/contact/list.php htdocs/core/class/html.form.class.php htdocs/expensereport/card.php htdocs/install/doctemplates/shipment/template_shipment.odt htdocs/public/payment/newpayment.php	2018-12-01 19:23:06 +01:00
Juanjo Menent	1c04c2b5f4	Fix #10097	2018-12-01 10:38:40 +01:00
Laurent Destailleur	ef3a280f40	Merge pull request #10082 from grandoc/new_branch_26_11_2018 fix typo error	2018-11-29 10:57:48 +01:00
Laurent Destailleur	7c22504252	Fix position of field must be ssame between create/edit/view	2018-11-27 09:22:59 +01:00
Philippe GRAND	8722ccef82	fix typo error	2018-11-26 14:35:29 +01:00
Laurent Destailleur	1d2c2a23ef	Fix look and feel v8	2018-11-25 11:57:19 +01:00
Regis Houssin	7cba680f38	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-18 17:07:03 +01:00
Laurent Destailleur	a2c9fefee0	Fix do not show tool to check european vat if country is not in EEC	2018-11-17 00:40:39 +01:00
atm-quentin	c18f486179	set facture to invoice AND check invoicenumber conf	2018-11-16 11:20:03 +01:00
atm-quentin	a8ab666d62	remplacement en masse des $conf->entity par des getEntity('facture')	2018-11-16 11:17:18 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +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	3e844db74f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fichinter/stats/index.php	2018-11-08 20:19:28 +01:00
Laurent Destailleur	27dcf18637	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 18:43:31 +01:00
Laurent Destailleur	e92a63ba73	FIX If we change customer/supplier rule we can't edit old thirdparty.	2018-11-08 17:15:35 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	c5231112c5	Fix regression with old canvas	2018-11-07 12:22:12 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	0c7f33e1ba	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-05 09:58:19 +01:00
Laurent Destailleur	2900947019	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 09:56:57 +01:00
Maxime Kohlhaas	29c0448a2e	Fix parent link was not removed on societe deletion #9106	2018-11-01 15:41:58 +01:00
Philippe GRAND	b7f5e9e6c7	complete comment	2018-11-01 11:50:55 +01:00
Frédéric FRANCE	c92a2084f1	remove fieldlabel and add fieldeditkey	2018-10-27 14:50:27 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	9c7ec434b7	remove fieldlabel and add fieldeditkey	2018-10-27 13:48:30 +02:00
Laurent Destailleur	461bd76f70	Fix customer and supplier code name Fix bill time flag must be visible only if option on	2018-10-26 23:27:29 +02:00
Laurent Destailleur	0e464ea4f5	Merge pull request #9866 from frederic34/emptylines Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-26 15:31:24 +02:00
Laurent Destailleur	094bcc519f	Fix show customer code only if customer in company tooltip	2018-10-25 17:25:36 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	d0ab12ba6e	Fix not used var	2018-10-24 11:10:55 +02:00
Laurent Destailleur	cd9431809b	Fix: do not loose country_code after update	2018-10-21 11:44:21 +02:00
Laurent Destailleur	4e82a6da46	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-19 14:29:32 +02: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	6d1a934e8d	Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type NEW Add configuration to disable "customer/prospect" thirdparty type	2018-10-19 13:47:33 +02:00
Laurent Destailleur	b6e333876e	FIX #9813	2018-10-19 12:56:21 +02:00
atm-greg	d86c44e641	Add conf to disable a thirdparty type	2018-10-17 15:55:46 +02:00
gauthier	aea7299970	FIX : use discount with multicurrency	2018-10-17 15:49:08 +02:00
Laurent Destailleur	2ce1aaaebf	Update api_thirdparties.class.php	2018-10-16 21:43:40 +02:00
ptibogxiv	5e20390e15	FIX call of bankaccount class	2018-10-16 21:33:42 +02:00
Laurent Destailleur	44d8333633	Fix external link must be after label	2018-10-16 20:00:53 +02:00
Laurent Destailleur	97273ff746	Merge pull request #9768 from ptibogxiv/patch-75 Add source link in stripe	2018-10-16 19:50:11 +02:00
Laurent Destailleur	78d7ea459d	Update paymentmodes.php	2018-10-16 19:49:16 +02:00
Laurent Destailleur	97429aeb7a	Merge pull request #9721 from grandoc/new_branch_10_10_2018 Standardize and update code	2018-10-16 19:30:19 +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
ptibogxiv	2cf87db10a	Add source link in stripe	2018-10-16 17:59:58 +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	9f27dd41e5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: ChangeLog htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php	2018-10-12 19:08:06 +02:00
Philippe GRAND	995e9b4f55	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-12 12:16:57 +02:00
Laurent Destailleur	53b099858f	FIX cutomer or supplier categories visible or not when required	2018-10-12 12:04:04 +02:00
Laurent Destailleur	ded5c4c3dd	Social network module	2018-10-12 11:02:03 +02:00
Philippe GRAND	7e6cdfb5ec	Standardize and update code	2018-10-12 09:34:54 +02:00
Frédéric FRANCE	c3f07dd2e0	define $code for all execution paths	2018-10-09 19:28:52 +02:00
Laurent Destailleur	0938ac4afa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/user/list.php	2018-10-09 14:54:18 +02:00
Laurent Destailleur	3c8b365c3e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-09 14:53:39 +02:00
Philippe GRAND	ac214a7258	Standardize code	2018-10-09 08:53:08 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Laurent Destailleur	923b561aff	FIX Option for prof id mandatory not working with custom type of company	2018-10-08 20:01:45 +02:00
Laurent Destailleur	44d0ed7a0c	Introduce SOCIETE_SHOW_FIELD_IN_TOOLTIP for fields to show in tooltip	2018-10-08 15:13:01 +02:00
Philippe GRAND	956c7b21e2	Standardize code	2018-10-06 12:18:03 +02:00
Philippe GRAND	b3925dd2bd	Standardize code	2018-10-05 16:04:10 +02:00
Philippe GRAND	bcfdeeea88	Standardize code	2018-10-05 15:55:47 +02:00
Philippe GRAND	073ec85208	Standardize code	2018-10-05 15:51:08 +02:00
Alexey Pyltsyn	49de7a5881	Replace multiple load calls with loadLangs method	2018-10-01 09:22:23 +03:00
Laurent Destailleur	84c062a03d	Merge pull request #9637 from frederic34/patch-10 add code_compta_client to Societe class	2018-10-01 01:16:18 +02:00
Frédéric FRANCE	a88262e9a6	add code_compta_client to Societe class	2018-09-30 10:52:40 +02:00
Philippe GRAND	b183054073	Standardize and update code	2018-09-28 15:57:13 +02:00
Laurent Destailleur	e9dd967610	Support nomassaction param on list	2018-09-28 13:12:47 +02:00
Laurent Destailleur	b2576305c1	Clean code	2018-09-28 10:46:59 +02:00
Laurent Destailleur	98b1e13ed7	Work on module socialnetworks	2018-09-26 16:55:46 +02:00
Laurent Destailleur	79ade6a1af	Work on website	2018-09-26 15:20:37 +02:00
Laurent Destailleur	436deea4c5	Code comment	2018-09-24 10:26:49 +02:00
Laurent Destailleur	ad6895aa2e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-24 10:23:09 +02:00
Ferran Marcet	d6d58b1f68	FIX #9432	2018-09-21 10:18:54 +02:00
Ferran Marcet	1a7b38f22a	FIX #9432	2018-09-21 10:14:23 +02:00
Ferran Marcet	4597cd44e5	FIX #9432	2018-09-20 17:52:44 +02:00
Philippe GRAND	9c9f5bd3c3	Standardize and update code	2018-09-20 17:26:39 +02:00
Laurent Destailleur	6ea7a6bce7	Try some fix to generate mandate	2018-09-20 17:09:31 +02:00
Frédéric FRANCE	237f888356	Update api_thirdparties.class.php	2018-09-19 18:47:59 +02:00
Frédéric FRANCE	9ee88e9d35	remove superfluous spaces	2018-09-19 18:33:11 +02:00
Laurent Destailleur	cde023148a	Merge pull request #9121 from yolocodefrench/develop Generation of the mandate file from the api	2018-09-19 14:47:25 +02:00
Laurent Destailleur	f240cd130d	Update api_thirdparties.class.php	2018-09-19 14:47:11 +02:00
Laurent Destailleur	019ba74225	Update api_thirdparties.class.php	2018-09-19 14:44:16 +02:00
Laurent Destailleur	d35687c8b3	Work on module social network	2018-09-19 01:45:56 +02:00
Frédéric FRANCE	cb2d72d5c1	reduce complexity libstatut societe class	2018-09-16 09:22:49 +02:00
Frédéric FRANCE	e89ef9c3db	reduce complexity libstatut societe.account.class	2018-09-16 07:58:16 +02:00
Laurent Destailleur	e9159dda02	Merge pull request #9513 from ptibogxiv/patch-62 FIX link in connect mode	2018-09-15 17:28:35 +02:00
Laurent Destailleur	bbfe4462dc	NEW Add lib for multiselect with checkboxes NEW Can select several prospect level in thirdparty filter. Remove old multiselect lib that was not used by core.	2018-09-15 13:31:25 +02:00
ptibogxiv	362c9fd0b1	FIX link in connect mode	2018-09-14 15:38:38 +02:00
Laurent Destailleur	961505d510	NEW Add filter on staff range in list of thirdparties	2018-09-14 01:29:03 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +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	50478b1bd4	FIX capital must be empty and not 0 if undefined	2018-09-12 15:21:11 +02:00
Laurent Destailleur	5bd2c01411	Fix email missing in tooltip	2018-09-12 14:43:05 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Laurent Destailleur	20fa294ff1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-09-10 01:22:16 +02:00
Laurent Destailleur	15aa99fc8e	Fix css	2018-09-10 01:22:01 +02:00
Laurent Destailleur	f9e2fb7a36	Style	2018-09-10 01:16:32 +02:00
Frédéric FRANCE	7e0b1055db	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-09 13:36:53 +02:00
Laurent Destailleur	6b47b63e61	Code comment	2018-09-09 13:23:41 +02:00
Laurent Destailleur	f0950e4cfb	Add last change date	2018-09-09 13:15:32 +02:00
Laurent Destailleur	0db7f6b8f3	Clean code	2018-09-08 23:00:17 +02:00
Frédéric FRANCE	2b62c4ca8f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-08 10:50:27 +02:00
Laurent Destailleur	e2df3fd4ad	Merge pull request #9423 from ptibogxiv/patch-55 Fix error when delete stripe customer	2018-09-07 19:34:45 +02:00
Philippe GRAND	97c740f510	Merge branch 'develop' of github.com:grandoc/dolibarr into develop	2018-09-06 19:28:10 +02:00
Laurent Destailleur	ff05997f0a	FIX Several fixes on the management of minimal amount for orders	2018-09-06 17:37:02 +02:00
ptibogxiv	da4e902645	Fix error when delete stripe customer	2018-09-06 11:35:19 +02:00
Frédéric FRANCE	4e619dd0ed	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 18:51:21 +02:00
Laurent Destailleur	ab8155f170	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php	2018-09-04 21:35:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Laurent Destailleur	aec0d4022b	Fix responsive	2018-09-04 19:59:20 +02:00
Laurent Destailleur	154e44e761	Fix responsive	2018-09-04 19:57:20 +02:00
Philippe Grand	c32c67ca57	Merge branch 'develop' into develop	2018-09-04 16:58:59 +02:00
Philippe GRAND	42565e722e	Standardize and update code	2018-09-04 13:37:00 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +02:00
Frédéric FRANCE	22b9632555	move phpcs:ignore	2018-09-02 21:08:57 +02:00
Frédéric FRANCE	e13a8ec572	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-02 18:19:45 +02:00
Laurent Destailleur	887a40cf1d	Remove TODO	2018-09-02 16:46:01 +02:00
Frédéric FRANCE	b60f7db60a	move phpcs:ignore	2018-09-02 10:43:34 +02:00
Frédéric FRANCE	e98b8e5e25	move phpcs:ignore	2018-09-02 09:27:59 +02:00
Philippe GRAND	db32d8903e	Standardize and Update code	2018-09-01 23:20:20 +02:00
Philippe GRAND	7b0d3c32ab	Standardize and Update code	2018-09-01 22:55:10 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Philippe GRAND	45cbc36a15	Standardize and update code	2018-09-01 15:27:55 +02:00
Laurent Destailleur	26cff9e11f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/langs/en_US/blockedlog.lang htdocs/stripe/config.php	2018-09-01 14:13:01 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	482ddd548a	Merge pull request #9332 from frederic34/functionClosingBrace PSR2 FunctionClosingBrace	2018-09-01 12:06:08 +02:00
Philippe GRAND	bb05e80a87	Standardize and update code	2018-08-31 18:47:25 +02:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Laurent Destailleur	e7d4956f5b	Clean not used function	2018-08-31 11:29:30 +02:00
Laurent Destailleur	07d5bd143a	Fix entity	2018-08-31 11:26:53 +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	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	b1fc45fe3d	Merge branch 'develop' into develop	2018-08-28 02:43:04 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 Update and standardize code	2018-08-28 02:13:28 +02:00
Laurent Destailleur	998dca9b9f	Update api_thirdparties.class.php	2018-08-28 02:05:37 +02:00
Jean Traullé	e0c2dd0c3c	Fix of an oversight when swapping parameters	2018-08-26 21:57:07 +02:00
Jean Traullé	d348ac83bb	Fix Travis CI Code reported coding style issues	2018-08-26 20:16:21 +02:00
Jean Traullé	e035a688f0	Keep params order in sync between @parm, @url annotations and function signature.	2018-08-26 19:41:32 +02:00
Jean Traullé	cc7ca8c7fa	Opening brakets should be on new lines	2018-08-26 18:15:14 +02:00
Jean Traullé	d8e15e529c	New REST API improvements to thirdparties bank accounts and gateways - API endpoints has been added and documented to allow user to add, update and delete payment gateways like the one used by Stripe module (stored in table llx_societe_account) - API endpoints for CompanyBankAccounts has been slightly modified to be harmonized with other API endpoints (this should not be a problem since these methods are not yet in Dolibarr latest stable version (aka 8.0)) - Some documentation has been improved (to be shown in REST explorer) - societeaccount.class.php has been slightly modified to include missing $login member ; notnull value of member fk_website is now -1 to put it to NULL when updating the record.	2018-08-26 17:29:04 +02:00
Philippe GRAND	30992f2730	Standardize and update code	2018-08-23 18:52:47 +02:00
Philippe GRAND	0c75c41e7b	Update and standardize code	2018-08-22 19:56:24 +02:00
Philippe GRAND	a36061079b	Update and standardize code	2018-08-22 11:11:59 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration function declaration	2018-08-21 13:41:56 +02:00
Philippe GRAND	da951e61f2	Update and standardize code	2018-08-17 22:29:21 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	3210181a3d	rule for private function is different	2018-08-14 10:21:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	21555a7435	Fix firstname/lastname	2018-08-13 01:10:51 +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	0a1c6e7194	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 Conflicts: htdocs/comm/propal/list.php htdocs/compta/facture/list.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-08-12 20:08:20 +02:00
Laurent Destailleur	2d571acc03	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php	2018-08-12 19:25:44 +02:00
Laurent Destailleur	30b4d88428	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php	2018-08-12 19:23:45 +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
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
Juanjo Menent	948bb47040	Merge pull request #9207 from atm-florian/dev_showadressinthirdpartylistoption NEW: Add option to display thirdparty adress in combolist	2018-08-08 11:14:22 +02:00
florian HENRY	847d5bfb92	add config	2018-08-06 10:55:28 +02:00
florian HENRY	45a52a955e	NEW: Add optoin to display thirdparty adress in combolist	2018-08-06 10:52:10 +02:00
Philippe GRAND	4e3898d357	standardize	2018-08-05 17:21:59 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	61995a3e02	Ajout d'une colonne indispensable dans la requete json	2018-07-30 17:34:43 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	ff8d31925b	ajout du parametre companyBankid	2018-07-30 09:37:41 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
gauthier	c95d6271a9	FIX : missing hook to edit sql	2018-07-25 11:15:13 +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	f672e8bf02	Fix trans	2018-07-24 19:12:35 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	df6ad44261	correction de l'année	2018-07-19 15:15:54 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	d8b212897b	ajout de credits	2018-07-19 15:13:55 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	294f14ab63	Generation of the mandate file from the api	2018-07-19 15:09:32 +02:00
gauthier	80ff7fa86f	FIX : case when we valid form with keyboard	2018-07-11 15:18:30 +02:00
gauthier	103c7e6d06	FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)	2018-07-11 09:51:36 +02:00
Laurent Destailleur	5f52dfa873	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-10 14:02:40 +02:00
Regis Houssin	3e5271967b	FIX missing entity field	2018-07-08 12:11:22 +02:00
Laurent Destailleur	3a593f88f1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/upgrade2.php	2018-07-05 10:28:24 +02:00
Laurent Destailleur	5883899bc7	Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS	2018-07-05 02:33:39 +02:00
Laurent Destailleur	5583600066	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-03 17:37:50 +02:00
Laurent Destailleur	50df452b9e	Fix status "Supplier" not always visible.	2018-07-03 17:37:23 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Laurent Destailleur	8d3fff5568	Merge pull request #8738 from atm-quentin/NEW_triggers_commercial_add NEW triggers add commercial and del commercial	2018-06-30 01:44:10 +02:00
Laurent Destailleur	0f62408700	Remove duplicated code	2018-06-30 01:34:51 +02:00
Laurent Destailleur	1ff8788ff7	Merge pull request #9016 from yolocodefrench/develop ajout de la gestion des comptes bancaires des tiers via l'api	2018-06-30 01:26:08 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	8a780b3910	Code refactorisation	2018-06-27 11:01:20 +02:00
$STAGIAIRE-PC\Pierre$ STAGIAIRE-PC\Pierre	62f2108101	ajout de la gestion des comptes bancaires des tiers via l'api	2018-06-27 10:33:57 +02:00
Laurent Destailleur	5c93fa1bfb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/accountancy/admin/journals_list.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/other.lang	2018-06-26 01:25:03 +02:00
Laurent Destailleur	36402c22ee	FIX SQL Injections reported by mu shcor (ADLab of Venustech)	2018-06-25 14:06:09 +02:00
Laurent Destailleur	5829014218	Merge branch 'develop' into NEW_advance_targer_filter_everywhere	2018-06-24 10:24:26 +02:00
Laurent Destailleur	eb88f1e5c9	Fix look and feel v8	2018-06-23 12:41:03 +02:00
Laurent Destailleur	06342ff80c	FIX contextpage on contact list	2018-06-23 12:06:17 +02:00
Laurent Destailleur	4dcc74d08f	Fix the "back to list" link also restore the contextpage	2018-06-23 11:55:04 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Laurent Destailleur	2d89d9634b	Fix search on extrafields	2018-06-20 23:16:06 +02:00
Laurent Destailleur	a73296e212	Fix reseller not saved	2018-06-19 19:34:23 +02:00
atm-ph	cb3704b67e	Fix can't add an attribute simply	2018-06-15 11:02:46 +02:00
Laurent Destailleur	a15cfd23f0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-13 22:57:51 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	c5887c1ec7	Merge pull request #8399 from ptibogxiv/patch-23 FIX lang for support more type of stripeconnect account	2018-06-13 22:13:43 +02:00
Laurent Destailleur	aaa6565014	Merge pull request #8938 from HackLo/develop FIX: Link does not work when there is spaces in SIREN	2018-06-13 21:39:54 +02:00
Laurent Destailleur	916424943e	Merge pull request #8942 from grandoc/new_branch_10_06_2018 New branch 10 06 2018	2018-06-13 20:48:22 +02:00
Laurent Destailleur	3ec6b88ece	Merge pull request #8958 from frederic34/listfax FIX add fax to thirdparty list	2018-06-13 20:10:10 +02:00
Frédéric FRANCE	345fb1f2af	add fax to thirdparty list	2018-06-13 17:57:15 +02:00
Philippe GRAND	5021c7a556	clean and update code	2018-06-10 18:29:04 +02:00
Loïc Barouty	945b71d6af	FIX: Link does not work when there is spaces in SIREN (like in the main format)	2018-06-08 23:38:44 +02:00
Laurent Destailleur	b6955692b4	Fix autofill of password	2018-06-05 11:22:00 +02:00
Laurent Destailleur	7a8fac4198	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/list.php	2018-06-04 15:14:26 +02:00
Laurent Destailleur	840330deea	Merge pull request #8905 from atm-greg/Add_supplier_proposals_in_suppliers_linkedObjects Add supplier proposal in linkedObjects type select of the suppliers	2018-06-04 13:46:36 +02:00
Laurent Destailleur	eaee252a5d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-06-04 12:56:12 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
atm-greg	0785029fe0	Add supplier proposal in linkedObjects type select of the suppliers	2018-05-31 10:46:50 +02:00
areaeuro	475297b98b	Update card.php Line 714 - conditional to delete thirdparty logos $object->photo does not exits, and should read $object->logo This appears to be an oversight, as it is correct in the rest of the file	2018-05-30 12:29:02 +02:00
Laurent Destailleur	182abfdb5b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/societe/card.php	2018-05-25 15:02:24 +02:00
Laurent Destailleur	8a64ee2297	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/list.php htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/expedition/class/expedition.class.php htdocs/expedition/list.php htdocs/societe/card.php	2018-05-25 13:14:58 +02:00
Laurent Destailleur	fa252d5cbd	Merge branch 'develop' into FIX_6.0_pdf_note_incoterm	2018-05-25 11:59:22 +02:00
Laurent Destailleur	354198b31e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/societe/contact.php	2018-05-22 20:26:09 +02:00
Laurent Destailleur	2a579b707a	FIX javascript showempty error FIX Contact tab not visible when using canvas	2018-05-22 19:43:28 +02:00
Laurent Destailleur	be21405d21	Fix missing error message	2018-05-22 19:24:56 +02:00
areaeuro	11714b9b6b	Update societe.class.php Line 2942 throws an error in php 7 "Warning: A non-numeric value encountered" when doing math sum, as substr() may be empty. Convert to intval(substr()) to fix.	2018-05-18 10:27:54 +02:00
Laurent Destailleur	4f6b0fead6	Fix filter on test/live mode for stripe card	2018-05-17 15:13:16 +02:00
Laurent Destailleur	200af6ea5c	Fix stripe link	2018-05-17 09:45:31 +02:00
Laurent Destailleur	ac97ba9e36	Fix deletion of stripe card Solve validation of recurring invoice	2018-05-16 20:41:01 +02:00
atm-quentin	5802eb63ec	FIX name of trigger and use of context	2018-05-07 11:36:34 +02:00
atm-quentin	04228cca82	NEW triggers add commercial and del commercial	2018-05-04 12:20:29 +02:00
Marc de Lima Lucio	b0d05b4824	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_conf_thirdparty_tag	2018-05-03 09:47:25 +02:00
Marc de Lima Lucio	bc7b05537f	NEW: hidden conf to assign category to thirparty neither customer nor prospect nor supplier	2018-05-03 09:26:48 +02:00
Laurent Destailleur	3cad7c6998	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-01 12:51:46 +02:00
Laurent Destailleur	e79c907ae0	Fix edit of capital	2018-04-30 11:01:33 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not visible.	2018-04-24 11:37:57 +02:00
Laurent Destailleur	fcf91b6c8c	Look and feel v8	2018-04-24 11:12:12 +02:00
Laurent Destailleur	ac89951acd	Merge pull request #8647 from fmarcet/develop New: Add same parameters on 'printFieldListTitle' hooks	2018-04-22 19:35:09 +02:00
Laurent Destailleur	69adf73f4f	Clean code from $var = True	2018-04-22 19:27:37 +02:00
Laurent Destailleur	fec9303d18	Remove useless $var	2018-04-22 18:51:03 +02:00
Laurent Destailleur	411949a6bb	Optimize constructors	2018-04-21 15:08:46 +02:00
Laurent Destailleur	ccd9aa8059	Fight against dolibarr warnings	2018-04-21 12:16:12 +02:00
Laurent Destailleur	22c6b596a7	Remove dead code	2018-04-20 15:56:10 +02:00
Laurent Destailleur	d0efc41983	New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD	2018-04-20 14:50:11 +02:00
Ferran Marcet	6ced1a3264	New: Add same parameters on 'printFieldListTitle' hooks	2018-04-20 10:38:16 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	9e50bbb9b1	standardize code	2018-04-15 16:35:18 +02:00
Laurent Destailleur	c6f57b8ec4	Update societe.php	2018-04-13 23:29:47 +02:00
atm-quentin	ba5ac47602	NEW OnSearchAndListGoOnCustomerOrSupplierCard conf	2018-04-13 15:48:58 +02:00
Laurent Destailleur	be965bdbab	Clean code	2018-04-13 13:28:48 +02:00
Laurent Destailleur	1521b0595b	Clean code	2018-04-13 11:03:03 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
Laurent Destailleur	1feee6378f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-11 14:45:52 +02:00
Laurent Destailleur	f181719769	Can fetch a companypaymentmode of a thirdparty	2018-04-10 18:11:08 +02:00
atm-quentin	6277928b67	FIX issue #8470	2018-04-10 14:01:35 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for action on CRUD events.	2018-04-10 12:03:01 +02:00
Laurent Destailleur	65996c47ff	Fix clean email syntax to remove , to avoid error RFC-5321 address	2018-04-10 11:15:21 +02:00
Laurent Destailleur	24f4d5040a	Move isInEEC from common to thirdparty class.	2018-04-09 14:25:02 +02:00
Laurent Destailleur	d5089f2099	Fix default value of sales tax is used must be set in creation	2018-04-06 20:55:02 +02:00
Laurent Destailleur	6c409b2670	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-05 18:08:19 +02:00
Laurent Destailleur	9d9f3ddf85	Merge pull request #8502 from ATM-Marc/NEW_create_from_list NEW: generalize use of button to create new element from list	2018-04-05 16:40:15 +02:00
Laurent Destailleur	8cf56a5b9c	Fix regression	2018-04-05 16:29:37 +02:00
Laurent Destailleur	5b50b8bd40	Merge pull request #8491 from hregis/develop_multicompany Fix: possibility to change entity for new thirdparty	2018-04-05 16:11:53 +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
Laurent Destailleur	08ab67289b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/societe/class/societe.class.php	2018-04-05 13:10:11 +02:00
Regis Houssin	e09c85cfdb	Fix: possibility to change entity for new thirdparty	2018-04-01 13:45:39 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Laurent Destailleur	96c73a13f6	Clean code	2018-03-31 16:45:36 +02:00
Marc de Lima Lucio	0366e645d5	NEW: generalize button to create object from list, for most of the lists	2018-03-30 16:54:38 +02:00
Laurent Destailleur	b6e9e0e287	Fix missing hooks	2018-03-30 16:44:58 +02:00
Laurent Destailleur	0e986b8f97	Update societe.class.php	2018-03-29 13:48:09 +02:00
atm-ph	a89983ef5c	Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code	2018-03-28 15:41:10 +02:00
Regis Houssin	dec0164ff9	Fix: differentiate "card", "contact" and "agenda	2018-03-27 19:12:01 +02:00
Laurent Destailleur	6ef1dbbe0f	FIX auto open contract if one result found	2018-03-24 18:28:06 +01:00
Laurent Destailleur	d6f3fc9fe7	Fix use the getSalesRepresentative function instead of get_users	2018-03-22 16:05:50 +01:00
Laurent Destailleur	86e496963b	Merge pull request #8081 from atm-maxime/new_salesrep NEW improve way of adding users/sales representative to thirdparty	2018-03-22 14:05:44 +01:00
dolibarr95	4b0eede1dd	Delete getCountry() and select field in sql query Delete getCountry() and select field in sql query	2018-03-21 08:53:38 +01:00
dolibarr95	9887d38589	Add dol_print_phone Add dol_print_phone in thirdparty table list.	2018-03-20 11:13:02 +01:00
Laurent Destailleur	9aa4a90543	NEW Stripe online payments reuse the same stripe customer account	2018-03-19 10:57:19 +01:00
Laurent Destailleur	9c221c10aa	Load trans	2018-03-18 21:04:16 +01:00
Laurent Destailleur	1a70e7a7c4	Triggers for Strips payment modes	2018-03-16 16:42:26 +01:00
Laurent Destailleur	f258d31a98	Triggers for Strips payment modes	2018-03-16 16:10:04 +01:00
Laurent Destailleur	e2cbf903ba	Remove deprecated code	2018-03-16 10:33:23 +01:00
ptibogxiv	a8e5927a6e	FIX lang for support more type of stripeconnect account	2018-03-16 10:07:47 +01:00
Laurent Destailleur	eb5d5d07ec	Remove the old deprecated code of doActions in canvas. The doActions of hooks are already available and are better.	2018-03-16 09:58:46 +01:00
Laurent Destailleur	5a397fff72	Fix scrutinizer bugs	2018-03-16 00:16:32 +01:00
Laurent Destailleur	71c51eb789	NEW Add hook printEmail	2018-03-15 22:22:42 +01:00
Laurent Destailleur	c962b89495	NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull	2018-03-15 20:46:55 +01:00
Laurent Destailleur	618627f137	Merge pull request #8393 from atm-maxime/new_siret_check New rule for FR siret value check	2018-03-15 14:27:59 +01:00
Laurent Destailleur	620ceb54e3	Clean code to avoid confusion	2018-03-15 14:25:09 +01:00
Laurent Destailleur	ff4d60dd96	Removed no more required hidden option	2018-03-15 14:00:46 +01:00
Maxime Kohlhaas	3de6e1a6cb	Simplify SIREN check function	2018-03-15 12:02:49 +01:00
Maxime Kohlhaas	8ae90bebaf	New rule for FR siret value check	2018-03-15 09:50:33 +01:00
Laurent Destailleur	852bf8dab7	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php htdocs/societe/class/societe.class.php	2018-03-15 01:57:35 +01:00
Laurent Destailleur	f0f6f71161	Fix Sqli	2018-03-15 01:55:47 +01:00
Laurent Destailleur	4957ea9178	Fix SQLi reported by op7ica	2018-03-15 01:55:16 +01:00
Laurent Destailleur	c3b9c91200	Fix SQLi reported by op7ica	2018-03-15 01:33:46 +01:00
Laurent Destailleur	6a70d268e0	Fix SQLi reported by op7ica	2018-03-15 01:22:32 +01:00
Laurent Destailleur	c62d68f4be	Fix SQLi reported by op7ica	2018-03-15 01:21:44 +01:00
Laurent Destailleur	821a75cef0	Fix payment modes	2018-03-15 00:53:24 +01:00
Laurent Destailleur	f75334f131	Merge pull request #8386 from ptibogxiv/patch-21 FIX support for stripeconnect mode	2018-03-15 00:40:52 +01:00
Laurent Destailleur	87bbb4ef87	Can create card from dolibarr	2018-03-15 00:40:29 +01:00
Laurent Destailleur	c69f5843da	Update card.php	2018-03-15 00:36:56 +01:00
Laurent Destailleur	bf4a0e46aa	Add a credit card on stripe	2018-03-14 21:07:45 +01:00
Laurent Destailleur	302fed8646	More fa image to replace png picto	2018-03-14 20:08:44 +01:00
Laurent Destailleur	8c535db04c	Use .... before end of card number	2018-03-14 17:15:31 +01:00
Laurent Destailleur	9994b1f133	Work on stripe interface	2018-03-14 17:12:32 +01:00
Laurent Destailleur	b232681318	NEW Add a button to create Stripe customer from the Payment mode tab	2018-03-14 16:53:16 +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
fmarcet	5140c1c5d2	Fix: Merge categories when merging thirds	2018-03-14 13:25:05 +01:00
ptibogxiv	e179161bfa	FIX support for stripeconnect mode	2018-03-14 12:01:15 +01:00
Laurent Destailleur	268b07bcf0	Can add/delete credit card localy	2018-03-14 11:51:13 +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	fe68e8acdd	Trans	2018-03-13 22:54:28 +01:00
Laurent Destailleur	da617f7d32	Can work both with remote and local payment modes	2018-03-13 22:43:50 +01:00
Laurent Destailleur	c78e5d23ea	Work on the customer payment mode tab	2018-03-13 20:23:59 +01:00
Laurent Destailleur	0258d3aeeb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-13 18:04:59 +01:00
Laurent Destailleur	ca809a11af	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/commande/class/commande.class.php	2018-03-13 18:04:18 +01:00
Laurent Destailleur	3f490906f9	Trans	2018-03-13 17:52:15 +01:00
Laurent Destailleur	2566170c68	Use code of societeaccount	2018-03-13 17:47:43 +01:00
Laurent Destailleur	944ba69cd8	Add unique key. Dolibarrize view of stripe card.	2018-03-13 17:32:49 +01:00
atm-quentin	af09a3714b	FIX reverse field to have object loaded in doaction	2018-03-13 17:12:03 +01:00
Laurent Destailleur	a955e74329	Better MVC	2018-03-13 15:19:31 +01:00
Laurent Destailleur	78b0585798	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/admin/taxes.php	2018-03-12 19:09:57 +01:00
Laurent Destailleur	55d3e72463	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/contact/class/contact.class.php htdocs/societe/card.php	2018-03-12 19:02:30 +01:00
Laurent Destailleur	cbbaf4763b	Start to introduce thirdparty website accounts	2018-03-12 16:04:23 +01:00
Laurent Destailleur	7362b3f3d7	Add table to store thirparty account in external web sites	2018-03-12 15:59:03 +01:00
Laurent Destailleur	03f7df88c6	Update card.php	2018-03-11 00:05:32 +01:00
Inovea Conseil	c2397fad60	Fix #8092	2018-03-10 23:49:43 +01:00
Inovea Conseil	5e46813323	Add phone research	2018-03-09 23:45:28 +01:00
Maxime Kohlhaas	ded69bf57d	New : link users to company like a tag	2018-03-09 18:59:06 +01:00
Laurent Destailleur	9f42e1b172	Prepare code to introduce different payment modes than BAN	2018-03-08 22:33:40 +01:00
Laurent Destailleur	489dde4db4	Prepare database to store payment modes of customers	2018-03-08 22:26:42 +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	5b8006a6bb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/payment/paymentok.php htdocs/public/paypal/paymentok.php	2018-03-08 16:37:17 +01:00
ptibogxiv	7774b49beb	Fix paymentmodes.php	2018-03-08 10:03:36 +01:00
ptibogxiv	5c04c2886c	Delete because replace by paymentmodes.php	2018-03-08 02:09:27 +01:00
ptibogxiv	c3e211f3f7	Delete gateway.php	2018-03-08 02:08:43 +01:00
ptibogxiv	197ce2fc3d	Fix set default	2018-03-08 02:08:14 +01:00
ptibogxiv	d791b014a5	update comment and class	2018-03-07 16:17:25 +01:00
Laurent Destailleur	b2f6105ae2	FIX #8277	2018-03-07 15:52:58 +01:00
Laurent Destailleur	d060cf840d	Merge branch 'develop' into develop	2018-03-07 13:19:25 +01:00
ptibogxiv	5e0327329c	NEW convert rib.php to gateways.php do stripe integration be conform to PSD2 rules less tab fo company	2018-03-06 13:23:35 +01:00
Laurent Destailleur	2f9f4d0675	WIP Create payment of member subscription with paypal	2018-03-05 21:46:24 +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	6338328c90	Fix scrutinizer errors	2018-03-04 11:09:53 +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
Rui Strecht	97f7de9d3a	Fixed GB check url	2018-02-28 14:36:49 +00:00
Rui Strecht	9eb9228268	Added idprof url for country PT	2018-02-28 12:51:29 +00:00
Rui Strecht	5ef00d200f	Added idprof1 check to country PT	2018-02-28 12:26:05 +00:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +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
Laurent Destailleur	0cc84ab92f	FIX Missing restore_lastsearch_values	2018-02-26 21:21:28 +01:00
Laurent Destailleur	3c552cec15	FIX Missing restore_lastsearch_values	2018-02-26 21:16:40 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	7dfedbf35c	Merge pull request #8228 from hregis/7.0_bug FIX Use of undefined constant _ROWS_2	2018-02-25 12:55:17 +01:00
Laurent Destailleur	4581d6049c	Update societecontact.php	2018-02-25 12:52:39 +01:00
Regis Houssin	5ecbe2ae81	Fix: Use of undefined constant _ROWS_2	2018-02-24 13:49:30 +01:00
Regis Houssin	4c06384197	Fix: differentiate sharing of "member" and "member_type"	2018-02-24 11:13:14 +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	0a79550f43	Fix oldcopy must be saved before update_extras	2018-02-23 16:11:00 +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	829de06bf6	Fix error management	2018-02-23 11:23:04 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	72c1357c9b	NEW Section of files generated by mass action not visible if empty	2018-02-21 11:02:45 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	809ef1bd00	FIX Trigger _MODIFY must be called when editing a property event extra. Clean duplicate trigggers "_CLONE"	2018-02-20 18:09:38 +01:00
Laurent Destailleur	276f2dce77	FIX #8200	2018-02-20 14:55:23 +01:00
Marc de Lima Lucio	95be155010	FIX: supplier credit notes: harmonize discount filters	2018-02-20 12:26:29 +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	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	f0855da0fb	Fix responsive	2018-02-15 12:57:04 +01:00
Marc de Lima Lucio	daca27b2ed	NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring	2018-02-14 18:02:40 +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	6bdb82cf27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/societe/class/api_thirdparties.class.php	2018-02-12 04:15:47 +01:00
Laurent Destailleur	55779e3b55	Fix confusion between supplier and customer categories	2018-02-12 04:07:45 +01:00
Laurent Destailleur	aaf4db2e03	Fix API on thirdparty categories	2018-02-12 04:05:51 +01:00
Ysandor	b48d369258	add the possibility to remove a category from a thirdparty I don't know if there is a good reason for not proposing to unlink a thirdparty from a category but if it is not the case here is a piece of code allowing to remove a category that works for me and seems general enough to be useful to other people. The new function is inspired from the addCategory function. PS : This is the first time i'm trying to contribute on github so don't hesitate to tell me if I did something wrong.	2018-02-10 20:38:53 +01:00
Laurent Destailleur	26ee7ec5be	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/en_US/errors.lang	2018-02-08 17:27:36 +01:00
Laurent Destailleur	d10d9f0fb2	Fix scrutinizer	2018-02-08 17:22:07 +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	2b2e68c78d	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 Conflicts: htdocs/societe/card.php	2018-02-08 15:18:28 +01:00
Laurent Destailleur	475b89bac1	Merge branch 'develop' into new_order_min_amount	2018-02-08 14:20:53 +01:00
Laurent Destailleur	3f17c92aa3	Update card.php	2018-02-08 13:09:21 +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
atm-quentin	2081aefc84	FIX creer into lire	2018-02-05 16:07:08 +01:00
atm-quentin	ae9c7ad6b6	FIX unset categorie	2018-02-05 10:40:52 +01:00
Laurent Destailleur	fe57cf697f	Fix init category selected	2018-02-04 14:35:38 +01:00
Laurent Destailleur	ec15048964	Fix init category selected	2018-02-04 14:34:31 +01:00
Laurent Destailleur	0cc6654b06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php	2018-02-04 13:25:00 +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	f51d6a2e50	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-02 10:07:16 +01:00
Laurent Destailleur	f6f57aa938	Missing Api for standing proposal/orders/invoices	2018-02-01 02:29:41 +01:00
Laurent Destailleur	8896e0573f	Fix missing name alias	2018-02-01 01:10:54 +01:00
Laurent Destailleur	7f9d6a5458	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/public/paybox/newpayment.php htdocs/public/payment/newpayment.php htdocs/public/paypal/newpayment.php htdocs/public/stripe/newpayment.php	2018-01-31 20:25:24 +01:00
Laurent Destailleur	14ecdce650	Fix merge of thirdparties (pb when merging codes and error management)	2018-01-31 18:01:56 +01:00
Laurent Destailleur	e46e66b1ed	NEW Introduce option THIRDPARTY_QUICKSEARCH_ON_FIELDS to personalize search fields for quick search	2018-01-31 14:34:48 +01:00
Laurent Destailleur	de0a8ba71f	Fix extrafields	2018-01-31 14:01:58 +01: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
Laurent Destailleur	d6317a26d2	Fix for multicompany	2018-01-30 15:48:09 +01:00
Laurent Destailleur	98c7ac9362	Merge pull request #8100 from ruistrecht-alt/label_for_MAIN_SHOW_REGION_IN_STATE NEW: Option MAIN_SHOW_REGION_IN_STATE renamed into MAIN_SHOW_REGION_IN_STATE_SELECT and more complete	2018-01-29 21:08:18 +01:00
Laurent Destailleur	f2a3c83053	Better error messages	2018-01-27 18:46:52 +01:00
Rui Strecht	4483265d5e	Forgot to update societe card.php with the same changes	2018-01-25 18:30:20 +00:00
Maxime Kohlhaas	53e6da8c7c	Missing fetch and translation	2018-01-20 21:57:36 +01:00
Maxime Kohlhaas	6f248a6590	New allow to define order min amount	2018-01-20 20:17:56 +01:00
Laurent Destailleur	81999be027	Fix lose filter type	2018-01-17 17:29:17 +01:00
Laurent Destailleur	756838c3a0	Fix lose filter type	2018-01-17 17:13:50 +01:00
Laurent Destailleur	26ba0a9ec2	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/cashdesk/index.php htdocs/compta/index.php htdocs/core/lib/security.lib.php htdocs/societe/list.php	2018-01-16 20:23:32 +01:00
Laurent Destailleur	4c8af0ff50	Fix name alias on list	2018-01-15 12:24:56 +01:00
Laurent Destailleur	3b9aee7d4c	Update list.php	2018-01-15 12:22:21 +01:00
Laurent Destailleur	c29bfcef31	Merge pull request #8053 from Oeris/develop-api FIX use DB PREFIX instead of llx_	2018-01-15 11:33:09 +01:00
Laurent Destailleur	68f0808d16	Update societe.class.php	2018-01-15 11:30:32 +01:00
Neil Orley	8d710020e9	FIX use DB PREFIX instead of llx_	2018-01-11 12:58:41 +01:00
Regis Houssin	157e118cba	Fix: broken feature	2018-01-11 10:47:40 +01:00
Laurent Destailleur	95312d1944	Fix regression	2018-01-11 10:20:49 +01:00
Laurent Destailleur	a4ab37e990	Remove deprecated field	2018-01-11 01:16:14 +01:00
Laurent Destailleur	4316793638	Merge pull request #8047 from hregis/develop_multicompany Fix: some bugs with multicompany sharing	2018-01-11 01:07:17 +01:00
Laurent Destailleur	a11cb8dcbf	Update card.php	2018-01-11 01:06:50 +01:00
Laurent Destailleur	e41f761157	Fix ident	2018-01-11 00:47:29 +01:00
Laurent Destailleur	f2b8c3c97d	Fix check of customer/supplier code	2018-01-10 18:19:54 +01:00
Regis Houssin	8c3b4f62db	Fix: wrong entity with thirdparty sharing	2018-01-10 13:30:57 +01:00
Regis Houssin	4cc0e889c1	Fix: restore broken feature	2018-01-10 12:38:27 +01:00
Laurent Destailleur	cda078ce26	Fix test on email unique	2018-01-10 12:27:11 +01:00
Laurent Destailleur	ebc76b5f27	Fix tooltips on thirdparty and invoice	2018-01-04 18:29:12 +01:00
Juanjo Menent	b650ba21c4	Merge remote-tracking branch 'upstream/6.0' into 6.0	2017-12-26 10:52:46 +01:00
Laurent Destailleur	aad0da2513	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +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
Juanjo Menent	dc930dd6c5	FIX: Bad name alias showing in name of third column	2017-12-20 16:46:49 +01:00
Laurent Destailleur	016be9139b	Fix sql request	2017-12-19 17:09:47 +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	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	bb7c03906e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/lib/files.lib.php htdocs/societe/list.php	2017-12-11 15:25:09 +01:00
Laurent Destailleur	4017d09613	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-12-10 21:28:36 +01:00
Laurent Destailleur	1d9d8980a9	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-12-10 21:16:49 +01:00
Laurent Destailleur	e4725f4248	FIX #7933	2017-12-10 20:55:51 +01:00
Laurent Destailleur	472d7b591e	Fix hook for formmail and translation	2017-12-10 02:01:36 +01:00
Laurent Destailleur	f22e7ee24a	Fixes	2017-12-09 17:29:19 +01:00
Maxime Kohlhaas	50203cdf01	Fix : link to create action is not a button but a top list link	2017-12-06 23:44:34 +01:00
Laurent Destailleur	78c4b7f912	Fix look and feel v7	2017-12-04 20:17:07 +01:00
Laurent Destailleur	46b281f703	Fix for #7697	2017-12-01 19:29:29 +01:00
Laurent Destailleur	670465fcd8	Fix responsive and search	2017-12-01 12:01:17 +01:00
Laurent Destailleur	9508c3e0b9	Fix trigger was not called	2017-11-29 16:34:44 +01:00
Laurent Destailleur	4245ad6e2a	Return error messages	2017-11-29 16:26:19 +01:00
Laurent Destailleur	2693e5db6d	Fix the trigger COMPANY_MODIFY provide information of thirdparty merged	2017-11-29 16:24:58 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	a0406bc741	Standardize view of events for products	2017-11-26 20:24:20 +01:00
Laurent Destailleur	3d48e509bd	Clean code	2017-11-25 19:16:15 +01:00
Laurent Destailleur	4c8b8dcba5	Fix sort order	2017-11-25 16:53:37 +01:00
Laurent Destailleur	9b8011f75b	Fix class not found	2017-11-25 16:52:04 +01:00
Laurent Destailleur	77509ee37a	Removed deprecated apis	2017-11-25 13:14:28 +01:00
Laurent Destailleur	38ef5890dc	Replace deprecated dol_print_graph with DolGraph	2017-11-23 18:47:24 +01:00
Laurent Destailleur	80bdb45be8	Look and feel v6 - Show status of thirdparty in dol_banner	2017-11-18 01:48:16 +01:00
Laurent Destailleur	742bf29c65	Look and feel v6 - Show status of thirdparty in dol_banner	2017-11-18 01:29:42 +01:00
Laurent Destailleur	c527189088	Standardize page name	2017-11-16 12:18:25 +01:00
Laurent Destailleur	f68b2bdeca	Use the confirmation when deleting from mass action everywhere.	2017-11-15 11:39:11 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	d1860b87f8	NEW Add a confirmation for all mass action 'delete'	2017-11-11 16:34:11 +01:00
Laurent Destailleur	01a41237bf	CSS	2017-11-11 14:20:08 +01:00
Laurent Destailleur	cb03b2f307	NEW Can sort joined files on thirdparty and user card.	2017-11-10 18:14:29 +01:00
Laurent Destailleur	11cc82e6d2	Update doc	2017-11-10 10:15:50 +01:00
Laurent Destailleur	aa7e9e156a	Merge pull request #7762 from atm-maxime/new_socmerge_cat NEW merge categories while merging thirdparties	2017-11-05 18:30:53 +01:00
Laurent Destailleur	a72703d316	Fix deprecated code	2017-11-03 17:29:25 +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
Maxime Kohlhaas	73d3cc7ce3	New : merge categories while merging thirdparties	2017-11-03 15:23:18 +01:00
Laurent Destailleur	4381c35835	Standardize code	2017-11-03 11:42:40 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
Laurent Destailleur	9458c80c48	Work on reminders	2017-10-31 23:10:29 +01:00
Laurent Destailleur	b29f32171c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: ChangeLog htdocs/comm/action/class/actioncomm.class.php htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/filefunc.inc.php	2017-10-30 18:22:26 +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	cd5e43483e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/expedition/card.php htdocs/projet/class/task.class.php	2017-10-28 22:08:16 +02:00
Laurent Destailleur	4feecbeab8	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-10-28 22:03:06 +02:00
Laurent Destailleur	adc4db0f85	Standardize code	2017-10-28 16:55:25 +02:00
Ferran Marcet	bc8127d685	Fix: paid supplier invoices are shown as abandoned on the consumption card.	2017-10-27 11:52:05 +02:00
Laurent Destailleur	e4645cf2c5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/blockedlog/class/blockedlog.class.php htdocs/contrat/card.php htdocs/societe/card.php	2017-10-27 02:12:35 +02:00
Laurent Destailleur	82231b77a2	Fix data for supplier must be not visible if supplier module off	2017-10-27 01:46:54 +02:00
Laurent Destailleur	ee1996ad37	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-27 01:16:51 +02:00
Laurent Destailleur	6a9837528e	Merge pull request #7703 from Oeris/develop-api FIX Data related to customer moved to thirparties api	2017-10-27 00:42:10 +02:00
Laurent Destailleur	a741a6bb3e	Update api_thirdparties.class.php	2017-10-27 00:41:56 +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	ff9a6ca01b	Work on module builder	2017-10-25 22:23:54 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Neil Orley	3e53a2ecff	FIX merging conflict	2017-10-25 14:52:33 +02:00
Neil Orley	ff760eb8d5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api	2017-10-25 14:46:44 +02:00
Neil Orley	0f98572c2b	FIX Filter didn't work for credit note Modify the SQL request to be able to filter on credit note	2017-10-25 14:04:36 +02:00
Neil Orley	cb71e921fd	NEW Get credit notes or deposits of a thirdparty Ability to filter : available or applied Returns a list of credit notes or deposits	2017-10-25 11:39:23 +02:00
Laurent Destailleur	f24204c79a	Error management after extrafield update	2017-10-24 19:04:40 +02:00
Laurent Destailleur	9f0f5eb5e8	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
Laurent Destailleur	d2f723045c	Work on website and modulebuilder	2017-10-24 17:30:05 +02:00
Neil Orley	327f31611c	FIX Data related to customer moved to thirparties api Related to commit : `b6825703b4`	2017-10-24 14:21:22 +02:00
Laurent Destailleur	f4f47c6732	NEW Remove tooltip tipTip library replaced with standatd jquery tooltip	2017-10-22 21:15:08 +02:00
Laurent Destailleur	c6e5115d34	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
Laurent Destailleur	98674f6d82	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/fourn/facture/card.php htdocs/societe/class/api_contacts.class.php htdocs/societe/class/api_thirdparties.class.php	2017-10-22 15:01:35 +02:00
Laurent Destailleur	79279caa2e	FIX #7619	2017-10-22 14:56:00 +02:00
Laurent Destailleur	745c4625a6	FIX #7619	2017-10-22 14:48:42 +02:00
Laurent Destailleur	fb13419de8	Merge pull request #7665 from dolibarr95/patch-26 Fix: missing logo in SQL and $companystatic	2017-10-22 02:43:19 +02:00
Laurent Destailleur	1426737a26	Work on website	2017-10-21 12:26:14 +02:00
Laurent Destailleur	19a5780f7f	Clean code	2017-10-20 23:49:20 +02:00
Laurent Destailleur	3bca0ad07d	More modern picto for switch on/off Work on website module	2017-10-20 21:39:19 +02:00
Laurent Destailleur	0e397b3e81	Work on website module	2017-10-20 18:44:03 +02:00
Laurent Destailleur	ab4f5a3aea	Clean code	2017-10-20 18:15:43 +02:00
dolibarr95	03eb69172e	logo Add logo in sql and in $companystatic in order to load the picture in getNomUrl.	2017-10-20 09:17:18 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
Laurent Destailleur	69b131b919	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/propal/card.php htdocs/societe/class/api_thirdparties.class.php	2017-10-18 11:28:20 +02:00
Laurent Destailleur	235817c581	Fix missing default limit	2017-10-17 12:02:58 +02:00
Laurent Destailleur	8b78b12926	Merge pull request #7642 from BackrndSource/patch-1 Fix #7641 Fix update of note_public and note_private on societe class	2017-10-16 21:39:24 +02:00
BackrndSource	fdcab4c6e1	Update societe.class.php fix error for function update() Now it updates the note_public and note_private.	2017-10-16 17:16:44 +02:00
Rui Strecht	447cc208fe	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/societe/class/societe.class.php	2017-10-16 09:34:24 +01:00
Scrutinizer Auto-Fixer	bd5bffa72c	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	86f7add355	FIX Default value was not set	2017-10-12 19:12:52 +02:00
Laurent Destailleur	8c5cf9ea45	Fix date output	2017-10-12 18:04:47 +02:00
Laurent Destailleur	7c29bb5818	Fix must use differently FRST and SEPA	2017-10-12 01:24:19 +02:00
Laurent Destailleur	15bcbc8b43	FIX Check on bank info for sepa must be done on iban/swift not on ban	2017-10-12 00:38:59 +02:00
Laurent Destailleur	8674867db2	Fix creation/edit rum number	2017-10-11 23:43:42 +02:00
Laurent Destailleur	918738ce46	Set creation date	2017-10-11 23:06:49 +02:00
Regis Houssin	f2d9288db5	NEW add company alias name when create company from member	2017-10-09 12:38:44 +02: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
Laurent Destailleur	85606126a9	Standardize code for events	2017-10-04 12:58:13 +02:00
Regis Houssin	45de1ca21e	Fix: check security	2017-10-03 19:09:46 +02:00
Regis Houssin	4537e5472b	Fix: refactorization of "getListForItem" function	2017-10-03 19:01:54 +02:00

... 11 12 13 14 15 ...

3497 Commits