dolibarr

Author	SHA1	Message	Date
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
Laurent Destailleur	fac28f9589	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php	2016-08-28 02:40:20 +02:00
Laurent Destailleur	fead7967f2	Merge remote-tracking branch 'origin/3.9' into 4.0 Conflicts: htdocs/commande/list.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/resource/class/resource.class.php	2016-08-17 16:55:39 +02:00
florian HENRY	0ac090e959	FIX : #5629 DoliDBPgsql::query SQL Error message: ERROR: 22P02: invalid input syntax for integer: ""	2016-08-16 09:07:08 +02:00
florian HENRY	3932a32399	FIX : #5629 PgSQL Interger string stylish error	2016-08-16 09:00:52 +02:00
Laurent Destailleur	bcd055b378	Move button to link to, in same part of code than code to output links.	2016-08-05 15:30:28 +02:00
Laurent Destailleur	7a7e7b330f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-04 11:58:11 +02:00
Laurent Destailleur	7f6e2a277a	NEW Link between objects can be done on both side and on all objects	2016-08-04 11:57:37 +02:00
Laurent Destailleur	9ca7f2cb66	Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by default).	2016-07-28 19:02:23 +02:00
Laurent Destailleur	aae2086ada	Move notes on dedicated tabs like other elements. Rename also the note available into translation tab into "other" to avoid confusion because it was not the same usage.	2016-07-28 13:53:17 +02:00
Laurent Destailleur	34d1c0af72	Merge pull request #5321 from frederic34/patch-7 Fix quotes not required on int	2016-07-20 19:09:09 +02:00
Laurent Destailleur	6fcd9e8dbf	Merge pull request #4612 from bafbes/abb-1 FIX Target object does not need to have all extrafields of source object.	2016-07-15 17:41:29 +02:00
Bahfir Abbes	5966170a0d	Done, thanks	2016-07-15 10:43:01 +01:00
Laurent Destailleur	62d7303d8f	Add comment	2016-07-01 03:40:48 +02:00
florian HENRY	215f397f33	Cannot reproduce 4793 still fix other bug on PgSQL	2016-06-30 17:28:13 +02:00
Laurent Destailleur	f021a8ca31	FIX Bad error management into trigger of mailmanspip	2016-06-25 18:48:50 +02:00
Laurent Destailleur	227bdb9838	FIX extrafields was not visible on tab "subscription" FIX Link between membership and invoice was not saved	2016-06-24 00:45:35 +02:00
Laurent Destailleur	6317cb53f2	FIX Merge of 2 thirdparties when there is one common tag.	2016-06-20 15:42:16 +02:00
Frédéric FRANCE	262dcbea2c	Update commonobject.class.php	2016-06-07 18:08:33 +02:00
BENKE Charlie	d86f89a8fa	fix : #4853 append if not contact type for the element	2016-06-04 17:55:28 +02:00
Laurent Destailleur	d1d1b824b4	Better coding of #5181 . I removed need of external lib.	2016-05-13 20:20:48 +02:00
Laurent Destailleur	698b93cf1e	FIX #5179	2016-05-08 12:38:30 +02:00
Laurent Destailleur	5cf8612c58	Fix scrutinizer errors	2016-05-08 12:08:23 +02:00
Florian HENRY	fda5e6002f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/websites/index.php	2016-05-02 20:27:34 +02:00
abb	9ba129aa0c	Merge branch 'develop' into abb-1	2016-05-02 01:17:27 +01:00
esprit libre	f5a541d469	Fix problem about unit buy price fetching To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price. Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges	2016-04-29 19:41:47 +02:00
esprit libre	75a9178549	Fix problem about unit buy price fetching To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price. Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges	2016-04-27 16:42:59 +02:00
Florian HENRY	1d75c5f720	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/commonobject.class.php	2016-04-27 09:41:42 +02:00
Laurent Destailleur	78cda5dc07	Fix problem with code of reccuring invoices	2016-04-26 22:00:41 +02:00
Florian HENRY	b82a216879	fix confilct	2016-04-26 14:21:40 +02:00
Laurent Destailleur	c73f4e5d7b	FIX Project was lost when creating invoice from a template Can set project on invoice during creation of invoice from a template Replace duplicated code to show lines with mutualized code	2016-04-24 20:00:00 +02:00
Laurent Destailleur	284622edbd	Merge pull request #5062 from bafbes/abb-18 fix:missing quote in query in commonobject updatefield function	2016-04-22 19:51:11 +02:00
Laurent Destailleur	a99b7ddee6	Fix PHPCS	2016-04-22 18:12:31 +02:00
abb	a0f57e6a91	fix:add escape function to query in updatefield function	2016-04-21 14:49:46 +01:00
abb	4406cfcbb8	fix:missing quote in query in updatefield function	2016-04-21 14:32:51 +01:00
Laurent Destailleur	7adf3a4789	Merge pull request #5043 from bafbes/abb-15 new function updateExtraField to update one particular extrafield	2016-04-21 02:58:39 +02:00
abb	62aa628524	fixmycommit:new function updateExtraField to update one particular extrafield	2016-04-19 07:49:05 +01:00
abb	f0f4933905	new function updateExtraField to update one particular extrafield Conflicts: htdocs/core/class/commonobject.class.php	2016-04-19 07:47:29 +01:00
Marcos García de La Fuente	e2c86d3fd8	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00
Scrutinizer Auto-Fixer	051ccf30a1	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2016-04-09 17:32:05 +00:00
Laurent Destailleur	83644dcb93	Fix errors reported by scrutinizer	2016-04-09 15:38:15 +02:00
Laurent Destailleur	724610ba5b	Quality fixes reported by scrutinizer	2016-04-09 15:07:55 +02:00
Laurent Destailleur	5b55af4d66	NEW Mutualize code: Use one call of function "addThumbs", when possible, to generate thumbs files instead of several call of "vignette" function.	2016-04-09 14:12:21 +02:00
Laurent Destailleur	92f1092f5c	Fix remove warnings	2016-04-08 19:46:56 +02:00
Laurent Destailleur	b1c2198154	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/ajax/selectsearchbox.php htdocs/core/lib/price.lib.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/modCommande.class.php htdocs/core/modules/modFacture.class.php htdocs/projet/list.php htdocs/societe/list.php	2016-04-07 20:01:52 +02:00
Laurent Destailleur	39b61d6924	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/core/boxes/box_task.php htdocs/core/lib/files.lib.php	2016-04-07 19:27:53 +02:00
Laurent Destailleur	7f129d14d7	Better responsive design	2016-04-07 14:08:38 +02:00
Laurent Destailleur	281b06a2d3	NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.	2016-04-01 18:44:23 +02:00
Laurent Destailleur	00bf8caa8c	FIX #4870	2016-03-25 17:55:58 +01:00
Laurent Destailleur	8ecfca5a9e	Revert change that break compatiblity with 100% of modules	2016-03-25 15:26:46 +01:00
Marcos García de La Fuente	ff6b187ef3	NEW Converted Form::showLinkedObjectBlock to a static function	2016-03-20 14:15:21 +01:00
Laurent Destailleur	40144eee8d	NEW linked object can show now the recurring invoices with other linked objects.	2016-03-03 13:38:16 +01:00
Laurent Destailleur	1fa94e4d6a	NEW Introduce position of records into dictionnary of type of contacts	2016-02-26 15:03:07 +01:00
Laurent Destailleur	b072b5a181	Fix remove some warnings Conflicts: htdocs/core/lib/pdf.lib.php	2016-02-26 10:45:25 +01:00
Laurent Destailleur	61edda61e1	Fix remove some warnings	2016-02-26 10:38:42 +01:00
Laurent Destailleur	2747259fbd	Fix: missing payment term and condition into update method	2016-02-24 12:01:50 +01:00
Laurent Destailleur	ff9a82c96f	Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment New add multicurrency supplier invoice payment	2016-02-22 16:26:31 +01:00
Laurent Destailleur	f6d1913bb7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-02-22 13:35:46 +01:00
Laurent Destailleur	355f091246	FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE	2016-02-22 13:28:08 +01:00
Laurent Destailleur	7ff8c2c3db	FIX Missing carriage return when phone is into property ->phone	2016-02-20 02:31:42 +01:00
Laurent Destailleur	266fb14a2c	FIX Missing carriage return when phone is into property ->phone	2016-02-20 02:19:18 +01:00
phf	b7d99271f8	New add multicurrency on supplier order	2016-02-19 22:25:59 +01:00
phf	e24a35b904	New add multicurrency on supplier proposal/order	2016-02-16 23:58:21 +01:00
Laurent Destailleur	c78997ed23	Tons of fixes and enhancement on recurring invoice generation	2016-02-16 00:31:05 +01:00
Laurent Destailleur	7aaae143fc	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/expedition/card.php	2016-02-15 02:01:58 +01:00
Laurent Destailleur	3bcc7b0f8f	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/comm/remise.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/filefunc.inc.php htdocs/societe/price.php	2016-02-15 01:37:23 +01:00
Laurent Destailleur	fdea892e3b	Merge pull request #4220 from bafbes/patch-11 NEW Can change customer on orders when hidden option COMMANDE_CHANGE_THIRDPARTY is on	2016-02-15 01:14:08 +01:00
abb	7ecb263a04	Merge branch 'develop' of https://github.com/bafbes/dolibarr into dev	2016-02-15 00:20:19 +01:00
abb	e1cf107096	Target object does not need to have all source object extrafields	2016-02-13 00:18:42 +01:00
phf	875e01aeee	New add recurrence fields on create form of invoice model Fix missing fields in database about multicurrency	2016-02-11 09:50:35 +01:00
Laurent Destailleur	d2708a4225	Merge pull request #4475 from atm-ph/new_multicurrency_module New multicurrency module	2016-02-08 14:44:49 +01:00
Laurent Destailleur	7044e62afa	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-02-05 18:37:13 +01:00
Laurent Destailleur	bf7181a064	All messages separated with , into errorsToString	2016-02-05 18:37:01 +01:00
Laurent Destailleur	02c54f4ea6	Merge pull request #4573 from altatof/fix_ttc FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7	2016-02-05 18:34:45 +01:00
Christophe Battarel	f0aef88589	better fix	2016-02-05 13:49:19 +01:00
phf	32c0b2a9b1	NEW add html id/class to locate value in the DOM html	2016-02-04 21:05:19 +01:00
phf	75c4888364	NEW feature hidden extrafields	2016-02-03 22:49:43 +01:00
abb	2f40233e01	fix : handle case of non existing third party field in object in fecth_thirdparty function	2016-01-31 10:35:56 +01:00
phf	83f90e2b1f	Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module Conflicts: htdocs/commande/card.php	2016-01-25 21:50:43 +01:00
phf	8e933ebb2d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module	2016-01-25 19:31:35 +01:00
Laurent Destailleur	467dc12a7b	NEW Module "Supplier commercial proposal" (price request) is set to stable status.	2016-01-25 12:33:38 +01:00
phf	963d0c396b	FIX change rate on order/invoice do not update lines NEW if we change the currency on already existing propal/order/invoice the current rate is update too then update lines	2016-01-23 21:36:07 +01:00
phf	e86ebd6799	NEW add multicurency on customer order	2016-01-23 00:38:17 +01:00
phf	21db62d645	FIX multicurrency price always display and update line price if rate is update	2016-01-22 22:35:32 +01:00
Laurent Destailleur	93b2013aa7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/compta/bank/card.php htdocs/projet/tasks/list.php	2016-01-22 03:29:55 +01:00
Laurent Destailleur	cceeefb7c2	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/societe/index.php	2016-01-22 03:25:30 +01:00
phf	f7afbcff68	NEW integration of multicurrency module (creation fields in database and admin) NEW add multicurrency_code on create, update and fetch company object NEW add multicurrency on propal FIX travis FIX back quote into sql file	2016-01-21 21:38:52 +01:00
Laurent Destailleur	7f4386f739	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-15 01:53:21 +01:00
Laurent Destailleur	6acd31f8ad	Fix: style required in create or edit mode only	2016-01-15 00:44:38 +01:00
Laurent Destailleur	13f10d55fc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-01-13 20:42:32 +01:00
phf	d213fbae08	FIX invoice situation	2016-01-13 13:42:58 +01:00
Laurent Destailleur	d396612a7c	NEW: Add a new method for margin calculation. Added margin on "cost price" to margin on WAP price and margin on "best supplier price".	2016-01-13 12:48:59 +01:00
Laurent Destailleur	6685502d5c	Fix add Croatia into list of country in EEC	2016-01-10 13:05:22 +01:00
Laurent Destailleur	2cbcbb8f85	Merge pull request #4319 from ParisLiakos/develop FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden	2015-12-31 15:04:16 +01:00
Paris Liakos	b6b422042c	MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden	2015-12-29 03:43:49 +02:00
Laurent Léonard	05234390f2	Fix uniqueness of objects reference	2015-12-07 02:02:03 +01:00
aspangaro	d12e3ca91f	Finish work on better integration of skype	2015-11-28 14:43:16 +01:00
aspangaro	3457a732f5	New: Better integration of skype	2015-11-25 20:19:18 +01:00
fappels	ecd3114683	Fix defineBuyPrice no min price is not error No min buy price is not error, return 0 if no buyprice set	2015-11-21 12:35:45 +01:00
Florian HENRY	b8af7625ff	fix new extrafields feature	2015-11-20 15:29:31 +01:00
Florian HENRY	1566be35a1	NEW : add $ID$ into extrafields management to allow use current object id on filter for select list from table and checkbox list from table	2015-11-20 11:59:28 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
frederic34	01d4bd6cf5	bad invert	2015-11-11 17:19:53 +01:00
frederic34	b8a84d68ec	add messages	2015-11-09 18:19:10 +01:00
Frédéric FRANCE	7b8a33adfe	Update commonobject.class.php	2015-11-02 13:20:51 +01:00
Laurent Destailleur	200e4638f4	Merge pull request #3812 from fappels/develop-best-pmp-pos-margin Fix: #2591 Margin is incorrect used with POS	2015-11-02 11:06:20 +01:00
fappels	8992cfaeb4	move require_once	2015-10-27 15:50:55 +01:00
fappels	4d839eea60	Fix #2591 Margin is incorrect used with POS if buy price not defined, define buyprice as configured in margin admin. If 'Force buying price if null' is off, marge will be equal to suggested default.(min supplier price or pmp) Updated all classes reading 'Force buying price if null' setting.	2015-10-26 20:33:42 +01:00
Sergio Sanchis Climent	990fbf3ef4	hooks correctly implemented , printObjectLine, printObjectSubLine In hook can change correctly label and ref (for my module need if is posible)	2015-10-26 14:00:43 +01:00
frederic34	865e9d9738	Merge remote branch 'upstream/develop' into patch-15 Conflicts: htdocs/langs/en_US/admin.lang	2015-10-22 10:28:06 +02:00
Laurent Destailleur	8306d93286	NEW Add css on column of detail lines to allow module to easily manipulate fields.	2015-10-20 16:08:25 +02:00
Laurent Destailleur	0c6441df74	FIX Using extrafield with type "Link to object" works correctly.	2015-10-20 12:40:37 +02:00
Laurent Destailleur	22979523db	Try a fix for #3742	2015-10-20 02:34:53 +02:00
Frédéric FRANCE	affe067ff1	Update commonobject.class.php	2015-10-19 21:09:02 +02:00
Laurent Destailleur	df0c6aa5cf	Use the new card banner for members	2015-10-16 16:14:33 +02:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00
Laurent Destailleur	bd48ad265d	The new banner tab is also on user card now	2015-10-11 15:21:21 +02:00
Laurent Destailleur	db9d09c7a3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-11 12:28:03 +02:00
Laurent Destailleur	6ec77e2ca0	New banner card on contact card.	2015-10-11 12:27:04 +02:00
Laurent Destailleur	7b7d27920d	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/adherents/type.php htdocs/categories/class/categorie.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/tax.lib.php htdocs/product/composition/card.php	2015-10-10 18:56:28 +02:00
Laurent Destailleur	525f9841fa	Fix doxygen	2015-10-10 18:38:22 +02:00
Laurent Destailleur	effba68511	Start to work on a common banner for tabs (goal is to have a nicer and generic part for all element)	2015-10-10 01:51:12 +02:00
Raphaël Doursenaud	3fdd59bf0a	Fix #3666 checkbox extrafields on edit	2015-10-05 20:39:14 +02:00
Raphaël Doursenaud	41354ca00d	Added type hinting to extrafields object	2015-10-05 20:30:55 +02:00
Laurent Destailleur	c0c0cc2415	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/list.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/interventions.lang htdocs/theme/md_exp/style.css.php	2015-10-03 14:28:31 +02:00
fmarcet	a585698b69	FIX: Only are showing one object linked	2015-09-29 08:49:11 +02:00
Laurent Destailleur	3f506552e3	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/filefunc.inc.php htdocs/theme/md_exp/style.css.php	2015-09-27 21:29:16 +02:00
Laurent Destailleur	62792c08eb	Merge pull request #3591 from GPCsolutions/inherited [Qual] Cleanup of inherited class properties	2015-09-26 11:23:59 +02:00
Raphaël Doursenaud	57f05e850a	[Qual] Fixed typo and added hinting	2015-09-24 20:56:50 +02:00
Raphaël Doursenaud	67ddb6c94e	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
Florian HENRY	206d6d0f7e	FIX : avoid SQL error in getValueFrom common object when all params are not send	2015-09-23 13:17:58 +02:00
Laurent Destailleur	da6a1d6629	NEW Introduce a method getDefaultCreateValueForField for developers to get a default value to use for a form in create mode. Implement it for public and private notes.	2015-09-22 13:55:31 +02:00
Laurent Destailleur	58a734cb17	Firstname only on login	2015-09-21 17:28:11 +02:00
Laurent Destailleur	9cbd236c8c	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/filefunc.inc.php	2015-09-16 22:09:21 +02:00
Laurent Destailleur	313d9ddacd	FIX #3534	2015-09-16 22:04:03 +02:00
Laurent Destailleur	24f7100562	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/core/lib/memory.lib.php	2015-09-08 10:33:33 +02:00
Laurent Destailleur	9cd5e7cafa	Fix some errors into code generator.	2015-09-07 15:03:38 +02:00
Laurent Destailleur	77ef046af4	Start to mutualize the builddoc and remove_file action.	2015-09-06 14:02:21 +02:00
Laurent Destailleur	5fd6c44640	Fix error management	2015-08-31 13:00:24 +02:00
Laurent Destailleur	00b9f98c1c	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-31 12:15:20 +02:00
Laurent Destailleur	fb70fbdc06	Merge pull request #3428 from marcosgdf/bug-3426 FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields	2015-08-31 00:53:04 +02:00
Laurent Destailleur	c06abac49e	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/salaries/index.php htdocs/contact/class/contact.class.php htdocs/core/class/commonobject.class.php htdocs/core/lib/geturl.lib.php htdocs/core/lib/pdf.lib.php	2015-08-30 21:20:50 +02:00
Marcos García de La Fuente	b953d2c466	FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields Close #3426	2015-08-29 19:42:51 +02:00
philippe grand	6952084be3	it's a mess	2015-08-27 17:23:23 +02:00
philippe grand	e9f631d2e3	fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'	2015-08-27 14:49:12 +02:00
philippe grand	db7defb7c3	Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'" This reverts commit `2527ae263b`.	2015-08-27 14:43:48 +02:00
philippe grand	2527ae263b	fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'	2015-08-27 14:28:12 +02:00
fmarcet	d6b84233ed	NEW: Translate extrafield's labels	2015-08-18 16:40:03 +02:00
Laurent Destailleur	2abb90713e	Fix list of resource not visible	2015-08-14 17:35:05 +02:00
Laurent Destailleur	5ca6593a57	Fix serious deadlock feature. It was possible to link with no way to unlink. What if user make a bad click ? I complete feature with reverse action to be sure to not have users with a corrupted situation.	2015-07-28 14:13:16 +02:00
Laurent Destailleur	4f5e8e2480	Fix: missing context before calling trigger. Clean demo file with list of triggers.	2015-07-19 15:24:54 +02:00
Laurent Destailleur	2f2b0df6f8	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/contact/exportimport.php htdocs/contact/info.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/modules/DolibarrModules.class.php htdocs/core/modules/modSociete.class.php htdocs/core/tpl/document_actions_pre_headers.tpl.php htdocs/langs/fr_FR/categories.lang htdocs/main.inc.php htdocs/product/reassort.php htdocs/projet/list.php htdocs/societe/info.php	2015-07-19 12:26:31 +02:00
Laurent Destailleur	2bb1945a2f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/prelevement/class/rejetprelevement.class.php htdocs/compta/sociales/class/paymentsocialcontribution.class.php htdocs/contact/exportimport.php htdocs/contact/ldap.php htdocs/contact/perso.php htdocs/contact/vcard.php htdocs/core/class/commonobject.class.php htdocs/product/reassort.php htdocs/projet/liste.php htdocs/societe/consumption.php htdocs/societe/info.php	2015-07-19 12:04:30 +02:00
Regis Houssin	9e7cb70d63	Fix: missing shared parameters	2015-07-08 16:03:15 +02:00
Raphaël Doursenaud	5ebc84e999	[Qual] Reviewed commonobject Added missing fields Removed unused variables Documented methods parameters Checked return points	2015-07-06 17:03:25 +02:00
Laurent Destailleur	dc050d39eb	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/makepack-dolibarr.pl htdocs/adherents/type.php htdocs/core/boxes/box_task.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php htdocs/core/js/lib_batch.js htdocs/core/modules/modUser.class.php htdocs/fichinter/card.php htdocs/fourn/commande/card.php htdocs/societe/consumption.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php htdocs/user/perms.php	2015-06-29 00:09:28 +02:00
Laurent Destailleur	ce6039f7f6	NEW Replace category edition page on members with new select2 component.	2015-06-27 23:01:05 +02:00
Florian HENRY	9505d3a528	fix multicompny bug with getEntites without shared test	2015-06-25 17:22:37 +02:00
Laurent Destailleur	1652f80300	Memory optimizing. Save 2.3 Mb of memory for all forms that can show margin informations. Save 300 Kb of memory for all other pages.	2015-06-06 15:19:25 +02:00
Laurent Destailleur	f42065146a	Start to clean html.form class.	2015-06-06 12:26:47 +02:00
Laurent Destailleur	43ed48896a	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/debian/changelog htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-06-05 18:31:53 +02:00
Laurent Destailleur	1252a500ce	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/fourn/class/fournisseur.product.class.php	2015-06-05 16:50:46 +02:00
Laurent Destailleur	df60754e52	Merge pull request #2708 from GPCsolutions/deprecated Deprecated	2015-06-05 15:44:08 +02:00
Laurent Destailleur	a33241f487	Maxi debug of 3.8. Nearly ready for freeze.	2015-06-05 14:46:30 +02:00
Laurent Destailleur	995645800e	Fix loading of project	2015-06-03 18:24:09 +02:00
Raphaël Doursenaud	3f9270ea78	Qual: added deprecation hinting Added deprecation hinting for class properties Added syslog warning events for deprecated functions, methods and/or their parameters Added hinting for some constants	2015-06-01 11:00:11 +02:00
Alexis Algoud	dd7febe2b9	replace test by getEntity()	2015-05-29 15:10:59 +02:00
Laurent Destailleur	c8949d0532	Some doxygen fixes	2015-05-25 18:43:46 +02:00
Alexis Algoud	91885c9d6f	FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)	2015-05-22 17:22:57 +02:00
Laurent Destailleur	6f5a30638c	NEW On page to see/edit contact of an ojbect, the status of contact is visible (for both external and internal users).	2015-05-22 12:21:36 +02:00
Laurent Destailleur	afc487ef9d	Fix phpcs	2015-05-07 13:28:03 +02:00
Laurent Destailleur	4ce4529cd5	Revert "Remove useless variables for common object" This reverts commit `82682dfc66`.	2015-05-05 22:09:58 +02:00
jfefe	82682dfc66	Remove useless variables for common object Fields name / civility / ... are nonsense for a lot of objects into Dolibarr. They could be defined for each object instead of into the common object class. This for the API which exposes a property civility for a category :\	2015-05-05 01:13:49 +02:00
Laurent Destailleur	c485b1fe30	Fix When generation of doc is required and generator not provided, we take first entry found.	2015-05-03 20:07:16 +02:00
Laurent Destailleur	414404e854	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/core/class/commonobject.class.php	2015-04-26 16:30:33 +02:00
Juanjo Menent	f7ab53be8e	Fix test for es. Dumps 3.5 et 3.6	2015-04-22 23:40:43 +02:00
Juanjo Menent	1ed573f98b	Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in commande.class.php on line 852	2015-04-22 23:31:24 +02:00
Laurent Destailleur	96a33bbe8a	First clean of code after devcamp	2015-04-21 15:49:58 +02:00
Laurent Destailleur	9d1c609c4f	Merge pull request #2538 from marcosgdf/units NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-04-21 11:14:50 +02:00
Laurent Destailleur	94589b9935	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-19 23:15:39 +02:00
Laurent Destailleur	65dafeee55	Uniformize feature between invoice and merging tool	2015-04-19 23:15:24 +02:00
Marcos García de La Fuente	87f97ed545	Merge branch 'develop' into units Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php	2015-04-18 23:38:14 +02:00
Marcos García de La Fuente	e2e6049c7f	Copyright	2015-04-18 20:50:03 +02:00
Marcos García de La Fuente	c07e26dcac	Merge branch 'develop' into fr-2613 Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:42:57 +02:00
Marcos García de La Fuente	dc790ff586	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
jfefe	f2e19f2326	Fix: error when deleting resource	2015-04-18 18:07:59 +02:00
Laurent Destailleur	56a14da5d4	FIXME that are not bug are replaced with TODO Add control on batch movement (lot/serial is mandatory, and control eatby and sellby are same for each lot/serial)	2015-04-12 04:01:28 +02:00
Laurent Destailleur	c4daca2bac	Fix #1682	2015-04-08 21:34:04 +02:00
aspangaro	03b1db138e	Debug	2015-04-06 08:20:23 +02:00
Marcos García de La Fuente	7075ac74c4	Merge branch 'develop' into units Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/class/product.class.php	2015-04-03 15:45:54 +02:00
Marcos García de La Fuente	3d50b41b8e	Reverted $rowid instead of $id property	2015-03-23 01:40:33 +01:00
Marcos García de La Fuente	4349f27299	Revert "Revert "Refactor 1""	2015-03-23 01:39:12 +01:00
Laurent Destailleur	2d90256640	Revert "Refactor 1"	2015-03-22 12:51:29 +01:00
Laurent Destailleur	a79a779b04	Merge pull request #2456 from marcosgdf/refactor-1 Refactor 1	2015-03-22 12:47:05 +01:00
Laurent Destailleur	84bea6166e	Doxygen	2015-03-17 10:55:45 +01:00
Laurent Destailleur	4fffeb3a89	Clean code	2015-03-17 10:52:27 +01:00
Laurent Destailleur	689d270552	Doxygen	2015-03-17 10:47:20 +01:00
Marcos García de La Fuente	6ba3b900b7	PHPCS Fix	2015-03-15 23:42:11 +01:00
Marcos García de La Fuente	086e439543	Merge branch 'develop' into refactor-1 Conflicts: htdocs/core/tpl/objectline_view.tpl.php	2015-03-15 18:16:55 +01:00
Marcos García de La Fuente	efb9f7f4fd	Merge branch 'develop' into refactor-1 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/includes/tcpdi/fpdf_tpl.php	2015-03-15 18:07:30 +01:00
Laurent Destailleur	10bbf463e7	Several bug fixes from scrutinizer	2015-03-14 14:55:41 +01:00
BENKE Charles	df9f822a70	Update commonobject.class.php new extafields type	2015-03-14 12:25:17 +01:00
Laurent Destailleur	e8e2f65ae5	Debug virtual product interface	2015-03-11 14:55:45 +01:00
aspangaro	69dc3cdd61	Correct fk_statut & work en list	2015-03-08 08:21:49 +01:00
Laurent Destailleur	56b5bfd25b	NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status into each dispathing line of supplier order to "verify" a reception is ok. Status of order can be set to "total/done" only if line is verified.	2015-03-08 02:08:26 +01:00
Laurent Destailleur	049174b76f	Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/	2015-03-06 01:53:02 +01:00
Laurent Destailleur	7b7b5090c7	Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into atm-ph-incoterm Conflicts: htdocs/comm/propal.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 23:03:29 +01:00
Laurent Destailleur	96de912661	NEW: Add module "Supplier commercial proposals" to requests quotation/price to suppliers. Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into atm-ph-new_ask_price Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/html.formfile.class.php htdocs/core/tpl/document_actions_post_headers.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 17:54:43 +01:00
Marcos García de La Fuente	f94f9d1e57	Removed $permtoedit variable	2015-03-04 11:19:45 +01:00
Marcos García de La Fuente	174f1cb5f7	Refactored supplier invoice line view to fit commonobjectline view	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	4c08d34bb5	Standardized $rowid as property	2015-03-04 10:37:46 +01:00
Laurent Destailleur	4c1d51bd39	phpcs	2015-03-04 02:28:16 +01:00
Marcos García de La Fuente	b4c84fac9d	NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-03-01 12:42:38 +01:00
Laurent Destailleur	4d226885cb	Rewrite code for supplier order and invoice to use shared code of customer supplier and invoice. Work on extrafield for supplier order and invoice.	2015-02-28 18:10:31 +01:00
Laurent Destailleur	ef14e4e7ed	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/fourn/class/fournisseur.product.class.php	2015-02-28 03:11:15 +01:00
Laurent Destailleur	5d1545ad1f	Work on supplier order and customer extrafields Use templates to show/edit supplier order and invoice lines	2015-02-27 18:05:12 +01:00
Laurent Destailleur	828716420b	Comment of function was not correct	2015-02-26 16:19:45 +01:00
Laurent Destailleur	daabc113a5	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: README.md htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php	2015-02-26 13:36:07 +01:00
Laurent Destailleur	41a74c62e2	Fix trigger to insert lines where called when inserting line but also when cloning parent object, making no way to know when to use them or not. I introduced a context to allow code to know that and do not triggers twice.	2015-02-26 13:03:17 +01:00
phf	11a0624e39	[CORE] FIX Travis phpcs (#incoterm).	2015-02-23 11:19:00 +01:00
phf	127868899d	Merge branch 'develop' into incoterm Conflicts: htdocs/commande/class/commande.class.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-02-23 10:42:01 +01:00
phf	c459794999	[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).	2015-02-23 10:36:44 +01:00
Laurent Destailleur	5dffe4b440	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-02-21 12:58:14 +01:00
Laurent Destailleur	070accd1e0	Work on new module expense report	2015-02-21 12:57:17 +01:00
Laurent Destailleur	e3713c8b6d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/admin/tools/eaccelerator.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php	2015-02-19 00:01:26 +01:00
Laurent Destailleur	1e1543403b	New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set user approving as contact following supplier order.	2015-02-17 19:49:17 +01:00
Laurent Destailleur	213c818204	Debug serial/lot management	2015-02-16 20:14:16 +01:00
Laurent Destailleur	2e0b2fb012	Work on expensereport module	2015-02-15 22:49:23 +01:00
Laurent Destailleur	448655ea45	First work on a new module for expense report matching dolibarr standard to replace current one.	2015-02-14 18:39:45 +01:00
Marcos García de La Fuente	530186c59d	PHPDoc and misc fixes for several folders	2015-02-10 13:32:00 +01:00
Marcos García de La Fuente	0d6d98b395	PHPDoc and misc fixes for several folders	2015-02-10 13:17:37 +01:00
phf	2a1a5e74c6	[CORE] mise à jour de l'objet pour l'info bulle après modification de l'incoterm (#incoterm).	2015-02-10 11:46:09 +01:00
phf	1701ecfd89	[CORE] fonction setIncoterms générique pour mettre à jour les valeurs de incotermsdes différentes tables (#incoterm).	2015-02-10 10:23:38 +01:00
phf	34bc1dbc15	Merge branch 'develop' into new_ask_price	2015-02-09 09:07:50 +01:00
phf	c22bbb23d8	[CORE] ré-indentation d'une ligne (#new_ask_price).	2015-02-03 10:09:25 +01:00
Laurent Destailleur	7b209fa0be	New: Add hidden option PDF_SHOW_PROJECT to show project ref onto supplier orders and invoices.	2015-02-02 18:36:49 +01:00
phf	5266542bc9	[CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price).	2015-02-02 17:50:33 +01:00
frederic34	736bee565c	Tooltip everywhere	2015-01-30 16:40:33 +01:00
phf	ec621244f3	[CORE] ajouts des conditions spécifiques pour les appels depuis l'objet AskPriceSupplier (#new_ask_price).	2015-01-28 14:34:27 +01:00
Laurent Destailleur	1664b89cef	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-01-17 19:26:19 +01:00
Laurent Destailleur	007f18bcf7	Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into GPCsolutions-review Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/comm/action/peruser.php htdocs/core/class/html.form.class.php htdocs/core/lib/accounting.lib.php htdocs/core/lib/report.lib.php	2015-01-17 15:11:12 +01:00
Laurent Destailleur	eeeb6de8d9	Merge pull request #2020 from GPCsolutions/situationsinvoices Situations invoices support	2015-01-17 14:44:05 +01:00
Laurent Destailleur	8cd46e4830	Introduce option MAIN_HTML_TITLE to start to control format of html title content.	2015-01-17 14:34:16 +01:00
Laurent Destailleur	fc78d632d3	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/main.inc.php	2015-01-09 23:09:10 +01:00
Raphaël Doursenaud	50c2b75ef8	Invoices: added situation (or interim) invoices support	2015-01-06 17:12:13 +01:00
Laurent Destailleur	443c9d245e	Merge pull request #2212 from marcosgdf/misc-doc Miscellaneous corrections	2015-01-06 00:21:05 +01:00
Marcos García de La Fuente	86100758ff	Miscellaneous corrections	2014-12-28 20:13:15 +01:00
Marcos García de La Fuente	ef4d710f78	Improving CommonObject and Contrat documentation	2014-12-28 19:16:14 +01:00
Laurent Destailleur	5d80061caf	Mark property error as deprecated	2014-12-26 22:04:16 +01:00
Laurent Destailleur	5ead994955	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog	2014-12-26 04:57:55 +01:00
Marcos García de La Fuente	2616deb58d	Copyright info	2014-12-25 22:52:11 +01:00
Marcos García de La Fuente	1f00794c98	Fixed bug which didn't show documents in auto GED when an object had '/' in its ref	2014-12-25 21:47:39 +01:00
Laurent Destailleur	bd7f6339ce	Because this is a legal issue (OPCA), i added the hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button "Classified Billed" is visible on proposal even if there is no invoice linked to proposal. Fixed: Also fix get list of invoice that report too many data.	2014-12-25 12:08:35 +01:00
Laurent Destailleur	acf7b9f130	Because this is a legal issue (OPCA), i added the hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button "Classified Billed" is visible on proposal even if there is no invoice linked to proposal. Fixed: Also fix get list of invoice that report too many data.	2014-12-23 12:59:34 +01:00
Laurent Destailleur	2c01a46774	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/paypal/lib/paypal.lib.php	2014-12-18 10:13:25 +01:00
Laurent Destailleur	f5da9b5e33	Merge pull request #2149 from altatof/3.5 FIX: dont put a mess with date and datetime extrafield value if already in right format	2014-12-18 10:04:03 +01:00
Christophe Battarel	27b47a4f48	FIX: dont put a mess with date and datetime extrafield value if already in right format (the bug was in propale/order/invoice extrafields, mainly visible with 2 datetime extrafields)	2014-12-12 14:31:36 +01:00
Laurent Destailleur	6729544782	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/projet/tasks/task.php	2014-12-04 14:52:34 +01:00
Laurent Destailleur	b5d74372de	Bad var	2014-12-04 01:36:53 +01:00
Frédéric FRANCE	a3d843f698	Update commonobject.class.php	2014-11-30 22:06:58 +01:00
Laurent Destailleur	20e76aa4e6	Fixed: Use constant to hide a feature that will probably be broken. Also it is a superfluous feature.	2014-11-30 02:05:45 +01:00
Laurent Destailleur	671243e8f6	Fixed: Bugs reported by scrutinizer Fixed: Solve conflict between ->iban and ->iban_prefix.	2014-11-22 16:57:08 +01:00
Laurent Destailleur	d8767bfbae	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/class/commonobject.class.php htdocs/product/class/product.class.php	2014-11-22 16:10:14 +01:00
Laurent Destailleur	9aab62ab36	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-11-22 16:03:09 +01:00
Laurent Destailleur	2f4de2ef75	Merge pull request #2016 from altatof/3.5 FIX: copy extrafields when creating order from propale and creating	2014-11-22 16:02:13 +01:00
Laurent Destailleur	d462facf6d	Fixed: [ bug #1653 ] Can't access task notes	2014-11-20 14:44:49 +01:00
Juanjo Menent	9e28452379	Fix: remove duplicate code	2014-11-19 10:02:01 +01:00
Juanjo Menent	3dacdf4e4a	Fix: Conflicts and remove duplicate code	2014-11-19 09:41:21 +01:00
Christophe Battarel	d0dc792b3c	check extrafields before inserting in DB	2014-11-17 11:17:45 +01:00
Laurent Destailleur	e3a8041b0d	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/facture.php htdocs/user/fiche.php	2014-11-16 15:46:08 +01:00
Laurent Destailleur	64a2cce7c0	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-11-16 14:11:19 +01:00
Laurent Destailleur	ad661256c0	Fix: Bugs reported by scrutinizer	2014-11-15 16:20:03 +01:00
Laurent Destailleur	2aeb0f4f5b	Merge pull request #1941 from jfefe/patch-3 Avoid missing class error for fetch_thirdparty method	2014-11-15 12:36:41 +01:00
Laurent Destailleur	1dcca6e553	Avoid error	2014-11-08 00:49:52 +01:00
Christophe Battarel	44882f4035	improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option	2014-11-05 17:03:53 +01:00
Laurent Destailleur	5e0946bdc2	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: htdocs/adherents/class/adherent.class.php htdocs/adherents/fiche.php htdocs/core/lib/date.lib.php htdocs/langs/fr_FR/bills.lang htdocs/resource/class/resource.class.php	2014-11-05 16:37:07 +01:00
Laurent Destailleur	4f08408065	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: ChangeLog htdocs/core/class/commonobject.class.php	2014-11-05 16:28:44 +01:00
Laurent Destailleur	cf6a0df3e4	A lot of fix in missing intervention trigger. Align key to use same name to avoid future bugs.	2014-11-03 17:23:02 +01:00
Laurent Destailleur	82812aa679	Merge pull request #1970 from FHenry/develop Add hook method to simply display child lines in order/invoice/propal	2014-10-30 18:11:41 +01:00
Philippe GRAND	463904706b	better display margin infos	2014-10-23 15:02:49 +02:00
jfefe	29db45c763	Avoid missing class error for fetch_thirdparty method	2014-10-23 01:15:05 +02:00
Florian HENRY	1eba744e8b	Add hook method to simply display child lines in order/invoice/propal	2014-10-20 13:15:48 +02:00
Laurent Destailleur	8581e953f9	Doxygen	2014-10-17 14:45:12 +02:00
Laurent Destailleur	536b579b35	Clean code	2014-10-14 00:27:23 +02:00
jfefe	6a4468d94e	Not need to test if class exists with require_once	2014-10-06 14:18:28 +02:00
jfefe	87fc27c7e6	Avoid missing class error for fetch_thirdparty method	2014-10-06 13:31:01 +02:00
Laurent Destailleur	c69565fd69	Fix: column name should not be an numeric	2014-10-03 03:12:39 +02:00
Laurent Destailleur	8ccb581185	Fix: Change for php 5.6 New: Management of color into type of events dictionnary (visible into peruser view). New: Can disable predefined type of events.	2014-09-29 13:21:03 +02:00
Laurent Destailleur	74cba062b4	Add a TODO to explain why we keep some extends into class. Should be removed once php min will be 5.4.	2014-09-23 19:37:59 +02:00
Laurent Destailleur	dc96e10215	Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into marcosgdf-oop-pdf Conflicts: htdocs/projet/class/project.class.php	2014-09-23 00:02:19 +02:00
Laurent Destailleur	f7f0059767	Missing hook to add button on intervention Prepare to move location into resource Can select which king of contact show into contact tab.	2014-09-22 20:16:58 +02:00
Marcos García de La Fuente	8f492a6677	Documented commonObject::commonGenerateDocument	2014-09-22 00:18:36 +02:00
Marcos García de La Fuente	bf7f4c1cab	Refactored generateDocument functions	2014-09-21 18:16:14 +02:00
Raphaël Doursenaud	332caa2b71	FIX: missing global declaration	2014-09-19 03:05:20 +02:00
Laurent Destailleur	83447243ae	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: build/debian/get-orig-source.sh htdocs/product/class/product.class.php htdocs/societe/soc.php	2014-09-15 22:58:39 +02:00
Laurent Destailleur	05f3a47018	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: build/debian/control htdocs/compta/bank/account.php htdocs/fourn/paiement/fiche.php htdocs/product/class/product.class.php htdocs/product/fiche.php	2014-09-15 22:52:59 +02:00
Laurent Destailleur	2dbbc76645	Fix: Trigger error not reported	2014-09-15 11:48:50 +02:00
Marcos García de La Fuente	7a28f8e4aa	[ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger	2014-09-14 13:59:06 +02:00
Laurent Destailleur	f264e25514	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/adherents/liste.php htdocs/compta/bank/bankid_fr.php htdocs/holiday/index.php htdocs/opensurvey/list.php	2014-09-13 19:10:05 +02:00
Laurent Destailleur	8dd9358214	Fix: SQL injection	2014-09-13 19:04:25 +02:00
Laurent Destailleur	154d1520fb	Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1	2014-08-30 20:36:53 +02:00
aspangaro	f774ff487b	Merge branch 'Upstream/develop'	2014-08-18 11:56:49 +02:00
Laurent Destailleur	c17f5e7f00	Accept property fk_thirdparty instead of fk_soc	2014-08-14 16:04:42 +02:00
Laurent Destailleur	6b26ae6f1f	Fix: Header of tables must use th and not td	2014-08-14 13:30:44 +02:00
aspangaro	1a87d98357	Qual: Renamed table llx_c_civilite into llx_c_civility field civilite into label in the same table and field civilite into civility in other table	2014-08-12 06:03:27 +02:00
Laurent Destailleur	1f2cc71975	New: Supervisor is now visible into user list.	2014-08-03 11:36:00 +02:00
frederic34	2df2c12cfd	The delivery method is transmited in shipment	2014-07-25 21:50:21 +02:00
frederic34	f0a7cc3268	Select Shipping Method in Propal	2014-07-24 18:08:08 +02:00
Laurent Destailleur	728ca22183	Merge pull request #1730 from GPCsolutions/accessibility Accessibility	2014-07-11 14:57:02 +02:00
Raphaël Doursenaud	55d062784d	Added labels on objectline form elements	2014-07-11 13:25:44 +02:00
frederic34	c8e6387e52	Merge remote branch 'upstream/develop' into selectbank Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2014-07-08 22:46:38 +02:00
frederic34	9949713d20	Some cleaning	2014-07-07 18:40:18 +02:00
KreizIT	4e08e2b5d5	Fix rollback and test errno	2014-07-07 11:32:56 +02:00
frederic34	f29eeceb1a	Select bank account for propal and order	2014-07-06 20:49:34 +02:00
Laurent Destailleur	fa82cbceb9	Qual: Removed useless function	2014-07-05 08:59:41 +02:00
Marcos García de La Fuente	7e1cf124b8	Merge branch 'develop' into syslog Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/product/class/product.class.php htdocs/product/stock/lib/replenishment.lib.php htdocs/societe/soc.php	2014-07-02 21:20:02 +02:00
Laurent Destailleur	6f0250cb94	Fix: typo	2014-06-29 04:25:42 +02:00
Laurent Destailleur	29dfb71bbd	Merge branch 'patch-11' of github.com:defrance69/dolibarr into defrance69-patch-11 Conflicts: htdocs/core/class/commonobject.class.php	2014-06-26 23:04:26 +02:00
BENKE Charles	8acd702cd1	Using hidden constant to use the feature MARGININFO_HIDE_SHOW = 0 feature not used MARGININFO_HIDE_SHOW = 1 feature used, displayed on open MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open	2014-06-26 22:34:40 +02:00
KreizIT	92f1778c9d	Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error Start refactoring trigger call from within object	2014-06-25 16:51:26 +02:00
Marcos García de La Fuente	56abf1cd72	Removed duplicated SQL error logging	2014-06-13 02:28:30 +02:00
Marcos García de La Fuente	ca0a6cb307	Removed SQL string from call debug log	2014-06-13 01:34:39 +02:00
Marcos García de La Fuente	7e7958cf73	Removed SQL errors as they are logged by the database handler	2014-06-12 13:49:05 +02:00
Marcos García de La Fuente	9fbd7806f0	More substitutions	2014-06-12 11:31:53 +02:00
Laurent Destailleur	b124007c8c	Merge remote-tracking branch 'origin/3.5' into develop	2014-06-09 15:30:41 +02:00
Laurent Destailleur	4c3c62515d	Fix: Confusion between is_int and is_numeric.	2014-06-09 15:21:20 +02:00
Laurent Destailleur	82a2a723c3	Fix: [ bug #1419 ] Margins module shows margin of sold services even if services module is disabled	2014-05-29 21:01:00 +02:00
Laurent Destailleur	4b9d1b901b	Fix: [ bug #1401 ] Problème avec la génération des codes barres	2014-05-25 17:14:33 +02:00
Laurent Destailleur	8e7b310fb6	Fix: [ bug #1400 ] Silent Warning create a draft invoice	2014-05-25 05:01:14 +02:00
BENKE Charles	3d7b6e9a26	Update commonobject.class.php	2014-05-24 19:51:05 +02:00
guerinaxel	1dbcd215b8	Correcting log use for commonobject.class.php Correcting dol_syslog use which had 3 parameters instead of 2.	2014-05-19 15:54:43 +02:00
BENKE Charles	c8067931e3	Update commonobject.class.php	2014-05-19 09:32:42 +02:00
BENKE Charles	b210d7a00f	Update commonobject.class.php Hide the margintable if click at the top of it (usefull when customer are just in front of you), reappear when you click again	2014-05-18 14:59:20 +02:00
Laurent Destailleur	15796ec592	Fix: checkstyle errors	2014-05-14 12:19:45 +02:00
Laurent Destailleur	757d92a318	Merge pull request #1589 from aternatik/resource_core Core integration of resource module	2014-05-14 11:25:25 +02:00
Laurent Destailleur	f621f7eb32	Fix: The rounding mode is now forced when provided explicitly and no more by default (we keep data intact when no mode provided).	2014-05-13 13:22:29 +02:00
Laurent Destailleur	69eaefc459	Fix: The way we tested if a ref/id already exists was wrong. Introduce a common static method for this. Removed verifNumRef method. Fix: Add missing logs	2014-05-13 10:12:45 +02:00
Laurent Destailleur	18848eaf74	Clean forms	2014-05-12 13:25:36 +02:00
Laurent Destailleur	5fa05ee29d	Start to clean code of templates to input lines	2014-05-12 12:53:10 +02:00
BENKE Charles	8c8c641411	Update commonobject.class.php $objecttype == 'order_supplier' already tested on the previous else if	2014-05-11 23:19:18 +02:00
jfefe	04161084cf	Fix : missing method to delete linked resource	2014-05-11 12:26:57 +02:00
jfefe	225c7ae07b	New : link resource with any element With tpl system, external modules can declare resource with hook getElementResources	2014-05-10 22:07:54 +02:00
Jean-François Ferry	fdb50ab116	Move generic function from commonobject.class to functions2.lib.php (work on resource module)	2014-05-10 22:06:22 +02:00
Jean-François Ferry	bb58bed930	In commonoobject add method for adding resource to an element	2014-05-10 22:03:05 +02:00
Jean-François Ferry	71c44d82ab	Move resource module functions into commonobject : - new method to get an array with object properties - new method to fetch an object only with id and element_type	2014-05-10 22:03:05 +02:00
Laurent Destailleur	d224128c46	New: Merge free product and predefined product area to enter new product.	2014-05-05 14:30:08 +02:00
Raphaël Doursenaud	f8f502d013	Removed closing php tag http://php.net/manual/en/language.basic-syntax.phptags.php	2014-05-03 18:18:44 +02:00
Laurent Destailleur	e1d30837e9	Try to remove a warning	2014-05-03 03:10:58 +02:00
Laurent Destailleur	d97c45a9b8	Add version of phpunit into travis script. Fix: strict mode.	2014-05-01 19:17:45 +02:00
Laurent Destailleur	4cb671f4db	Qual: Clean deprecated code.	2014-04-28 11:55:08 +02:00
Laurent Destailleur	97fce71218	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/core/lib/functions2.lib.php htdocs/install/mysql/migration/repair.sql htdocs/langs/en_US/errors.lang htdocs/product/fiche.php htdocs/projet/tasks/task.php	2014-04-26 22:35:35 +02:00
Laurent Destailleur	6968304641	Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.	2014-04-26 17:27:59 +02:00
Raphaël Doursenaud	9960e5aa8f	Qual: Removed unused variable	2014-04-23 18:24:05 +02:00
Raphaël Doursenaud	d57b4192b6	Qual: Wrong variable name	2014-04-23 18:23:55 +02:00
Raphaël Doursenaud	670e861d7b	Qual: Missing global declaration	2014-04-23 18:23:55 +02:00
Raphaël Doursenaud	6cfcdbfe56	Qual: Wrong type in method documentation	2014-04-23 18:23:55 +02:00
Raphaël Doursenaud	84c9a390eb	Qual: Mistyped class property	2014-04-23 18:23:55 +02:00
Laurent Destailleur	13929bc46f	New: showrefnav can be used with tables without prefix.	2014-04-09 13:19:31 +02:00
philippe	e2b29bb108	fix english misspelling	2014-03-05 09:57:36 +01:00
Laurent Destailleur	5780f14a65	Qual: Removed TODO and add test to report bug.	2014-02-17 18:27:45 +01:00
Laurent Destailleur	867c83680b	Merge remote-tracking branch 'origin/3.5' into develop	2014-02-17 18:22:49 +01:00
Laurent Destailleur	342ee2e6f6	Qual: Add a TODO to warn to remove this bug.	2014-02-17 18:22:15 +01:00
Laurent Destailleur	860ca15cfc	Merge remote-tracking branch 'origin/3.5' into develop Conflicts: htdocs/core/class/extrafields.class.php	2014-02-17 15:27:30 +01:00
Laurent Destailleur	abc96b51fa	Enable extrafields for customer order, proposal and invoice lines. This feature was developed for 3.5 but was disabled (hidden) because of a bug not possible to fix enough quickly for 3.5.0 release.	2014-02-16 23:51:29 +01:00

... 16 17 18 19 20 ...

2160 Commits