78410 Commits

Author	SHA1	Message	Date
Laurent Destailleur	829ef1ae0b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-27 19:52:21 +02:00
Laurent Destailleur	741489fdc0	FIX #14564	2020-08-27 19:52:05 +02:00
Laurent Destailleur	84a096e234	Merge pull request #14555 from aspangaro/12.0p8 ... Fix Accountancy Listbyaccount Error missing class on formfile->getDocumentsLink	2020-08-27 19:45:55 +02:00
Laurent Destailleur	8a9244d1d6	Merge pull request #14567 from TobiasSekan/ShowRefInContractFormOnInterventions ... NEW - Show references in contract form on interventions	2020-08-27 19:44:51 +02:00
Laurent Destailleur	6715eaee09	Update html.formcontract.class.php	2020-08-27 19:44:17 +02:00
Laurent Destailleur	57c8835fcc	Merge pull request #14565 from atm-john/develop_fix_14562 ... Fix #14562 Unable to create table `llx_product_attribute_combination_price_level` upon clean install	2020-08-27 19:42:50 +02:00
Laurent Destailleur	a80950dfa4	Fix regression	2020-08-27 19:41:32 +02:00
Laurent Destailleur	8b95aa63eb	Trans	2020-08-27 18:59:36 +02:00
Laurent Destailleur	0309510ab8	Fix avoid duplicate event recorded from email collector	2020-08-27 18:50:08 +02:00
Laurent Destailleur	2abdfe08d7	FIX Email collector decode subject ... FIX Cloning email collector clone also rules and operations	2020-08-27 18:27:05 +02:00
atm-lena	c0f254d10c	Translation + decode	2020-08-27 16:03:25 +02:00
atm-lena	e3ce3cbb7c	Function sendEmailsReminder()	2020-08-27 15:49:56 +02:00
atm-lena	f57325237a	WIP : sendEmailsReminder()	2020-08-27 12:30:59 +02:00
atm-lena	acb50950a4	Add a default message to "actioncomm_send" template	2020-08-27 11:31:48 +02:00
atm-lena	5856033892	Replace "agenda_send" and "event_push" to "actioncomm_send"	2020-08-27 11:15:08 +02:00
atm-lena	69459e3429	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind	2020-08-27 11:13:21 +02:00
Laurent Destailleur	180a49601b	Use CSS to define size of logo on public pages.	2020-08-27 11:01:41 +02:00
stickler-ci	b0fe7bc2e0	Fixing style errors.	2020-08-27 08:47:57 +00:00
atm-lena	4ef2644300	Use date.lib.php functions	2020-08-27 10:29:23 +02:00
stickler-ci	8ff24282d9	Fixing style errors.	2020-08-27 08:16:32 +00:00
Sekan, Tobias	c2590433fe	Show ref in contract form on interventions	2020-08-27 10:11:18 +02:00
atm-lena	9d1fc28eba	Fix type reminder "push" to "browser"	2020-08-27 09:35:02 +02:00
atm-lena	bbc554070c	Fix	2020-08-27 09:33:40 +02:00
Sekan, Tobias	aa8ec1cd9c	Fix empty ref in contract list tool tip	2020-08-27 09:32:00 +02:00
Laurent Destailleur	4127fded2a	WIP	2020-08-27 03:14:55 +02:00
ATM john	236d2862af	Fix install table	2020-08-26 21:56:50 +02:00
atm-lena	6a60228bc3	Translation	2020-08-26 17:11:32 +02:00
Laurent Destailleur	243f59b9e9	FIX Missing transaction on PO actions	2020-08-26 17:09:45 +02:00
atm-lena	efe60ebc58	Error management	2020-08-26 17:02:34 +02:00
atm-lena	cc29654f47	WIP : rename fk_project to fk_actioncomm + add line to sql file to install	2020-08-26 16:48:09 +02:00
atm-lena	a01d1b58c7	Add fk_email_template	2020-08-26 16:06:20 +02:00
Florian Mortgat	9b3f13458f	FIX: missing entity check	2020-08-26 16:02:31 +02:00
atm-lena	cf9337b644	Add fk_project to actioncommreminder object	2020-08-26 15:58:14 +02:00
atm-lena	c10556473f	Clean	2020-08-26 15:35:12 +02:00
atm-lena	552e655668	Add field "entity" in actioncommrminder object and table	2020-08-26 15:22:32 +02:00
atm-lena	1267e914dc	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind	2020-08-26 15:16:53 +02:00
atm-lena	d4e6a9871c	Update select_type_duration() function	2020-08-26 15:14:07 +02:00
atm-lena	2fb5824836	Calcul date of reminder for event create	2020-08-26 15:12:08 +02:00
atm-lena	d3ac39589a	WIP	2020-08-26 12:48:12 +02:00
stickler-ci	eecab28203	Fixing style errors.	2020-08-26 10:22:33 +00:00
ptibogxiv	989130c0ad	Update invoice.php	2020-08-26 12:20:49 +02:00
ptibogxiv	76e276e8e8	Update invoice.php	2020-08-26 12:00:45 +02:00
stickler-ci	32ecf4dd9a	Fixing style errors.	2020-08-26 09:46:49 +00:00
ptibogxiv	66cdb1dad0	NEW display resiliate status in takepos for member	2020-08-26 11:44:35 +02:00
atm-lena	42f492877e	WIP	2020-08-26 11:36:32 +02:00
atm-lena	3046556d7b	Add checkbox "AddReminder"	2020-08-26 11:19:14 +02:00
atm-lena	a4018f41f7	WIP	2020-08-26 10:52:36 +02:00
lvessiller	9268955256	FIX set sales representatives on create company card	2020-08-26 09:40:20 +02:00
Alexandre SPANGARO	0adf267f66	Fix Accountancy Listbyaccount Error missing formfile->getDocumentsLink	2020-08-25 21:31:04 +02:00
Laurent Destailleur	23bb67873f	NEW Can edit the list of sending email profiles.	2020-08-25 19:40:17 +02:00
atm-lena	7df993c7ed	Add "select_model_mail" function + add select to create event	2020-08-25 17:26:32 +02:00
Anthony Berton	458bc66327	Update list.php	2020-08-25 17:25:34 +02:00
atm-lena	6a94c0f52f	Add model type mail	2020-08-25 16:43:57 +02:00
atm-lena	94b2f3c5e1	Add $conf conditions	2020-08-25 12:57:36 +02:00
Laurent Destailleur	6f1a51139c	Fix load lang	2020-08-25 12:48:56 +02:00
Laurent Destailleur	7c39543c72	Support trigger in module recruitment ... Enhance generic code of automatic recording events	2020-08-25 12:47:38 +02:00
atm-lena	25840c2b3d	Create Event - Add fields	2020-08-25 12:40:29 +02:00
stickler-ci	2cbb4081fe	Fixing style errors.	2020-08-25 10:20:48 +00:00
Sekan, Tobias	a7895f3496	Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents	2020-08-25 12:20:10 +02:00
Sekan, Tobias	4c851884e5	Address feedback	2020-08-25 12:16:44 +02:00
Laurent Destailleur	c2e98c7c90	tooltip	2020-08-25 03:31:31 +02:00
Laurent Destailleur	7b5b3cf8a2	Add br	2020-08-25 02:28:08 +02:00
Laurent Destailleur	8c9f6db856	Label in popup	2020-08-25 02:27:32 +02:00
Laurent Destailleur	f9eccce26c	Fix phpcs	2020-08-24 20:43:38 +02:00
Laurent Destailleur	3dfda2ae60	FIX Emailcollector - decode extracted ... NEW Rule "email to" accept wildcard *	2020-08-24 20:41:27 +02:00
Laurent Destailleur	60d76000d7	Fix bad column name	2020-08-24 17:23:33 +02:00
Laurent Destailleur	21633e3d39	css	2020-08-24 17:10:27 +02:00
Laurent Destailleur	05d82a0684	FIX Error management. Do no try to approve PO if validation fails.	2020-08-24 17:07:30 +02:00
stickler-ci	a60968e95b	Fixing style errors.	2020-08-24 14:17:15 +00:00
Christian Foellmann	0e9677fd34	allow default settings for "cond_reglement_id" and "mode_reglement_id" ... (cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)	2020-08-24 16:08:44 +02:00
Sekan, Tobias	6d2aa6b654	Fix non-numeric value	2020-08-24 15:26:06 +02:00
Sekan, Tobias	4c887d6110	Fix for non-numeric value in payment	2020-08-24 14:53:34 +02:00
ptibogxiv	ff621cb146	Update pay.php	2020-08-24 12:27:19 +02:00
ptibogxiv	9da4946955	Fix for better code	2020-08-24 12:26:40 +02:00
Alexandre SPANGARO	335f57f9be	Fix language	2020-08-24 11:41:00 +02:00
Alexandre SPANGARO	eebe888377	Some fix on assets	2020-08-24 09:47:37 +02:00
Christian Foellmann	b1849aed5c	fix for mistakenly uncommented code	2020-08-24 07:53:25 +02:00
stickler-ci	721b1275ff	Fixing style errors.	2020-08-23 23:20:07 +00:00
StephaneLesage	5aac080e61	NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms	2020-08-24 01:01:35 +02:00
Laurent Destailleur	14a4cae95b	Fix	2020-08-24 00:31:25 +02:00
Laurent Destailleur	689fa752bf	Implement action "Decline"	2020-08-24 00:23:18 +02:00
Laurent Destailleur	633f03e853	Add extrafields for recruitment	2020-08-24 00:09:04 +02:00
andreubisquerra	915aa56a95	Change variable to pos_change	2020-08-23 22:29:55 +02:00
andreubisquerra	8f933c324a	Change variable to pos_change	2020-08-23 22:28:26 +02:00
andreubisquerra	e032ddc035	Change variable to pos_change	2020-08-23 22:27:18 +02:00
andreubisquerra	ec2479a41a	Update 12.0.0-13.0.0.sql	2020-08-23 22:26:22 +02:00
andreubisquerra	f9913be719	Change variable to pos_change	2020-08-23 22:24:46 +02:00
andreubisquerra	a5ab711b27	Change variable to pos_change	2020-08-23 22:22:05 +02:00
Laurent Destailleur	f010e44a71	WIP	2020-08-23 22:13:06 +02:00
Laurent Destailleur	80ccb84fb2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-23 22:11:33 +02:00
Laurent Destailleur	b600478a5a	Work on recruitment module	2020-08-23 22:11:16 +02:00
Laurent Destailleur	5aaf567f22	Merge pull request #14364 from bafbes/abb120130 ... fix: restore autofill lost functionality on expeditions	2020-08-23 19:52:21 +02:00
Laurent Destailleur	a6f838a6e0	Update card.php	2020-08-23 19:51:13 +02:00
Laurent Destailleur	0944e8b156	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-23 19:25:13 +02:00
Laurent Destailleur	8115acbf82	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-23 19:25:05 +02:00
Laurent Destailleur	f819509442	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-08-23 19:22:27 +02:00
Laurent Destailleur	74eac1d06a	Fix include regression	2020-08-23 19:22:01 +02:00
Laurent Destailleur	38d53cc03d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/lib/pdf.lib.php	2020-08-23 19:20:50 +02:00
Laurent Destailleur	49f8a6e733	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-08-23 19:17:12 +02:00
Laurent Destailleur	4fa6d86127	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-08-23 19:17:01 +02:00
Laurent Destailleur	7a183ea026	Update pdf.lib.php	2020-08-23 19:13:30 +02:00
Laurent Destailleur	b44d6744f9	Update pdf.lib.php	2020-08-23 19:11:40 +02:00
Laurent Destailleur	7eb003c684	Update pdf.lib.php	2020-08-23 19:11:19 +02:00
Laurent Destailleur	815269db9c	FIX #14443	2020-08-23 18:49:19 +02:00
Laurent Destailleur	477c3e719d	Fix phpcs	2020-08-23 18:26:42 +02:00
Laurent Destailleur	90e01888d4	Merge pull request #14507 from pstructures/PSdevelop ... Projects added as type in Categories API	2020-08-23 18:25:08 +02:00
Laurent Destailleur	55c0c1d734	Merge pull request #14514 from FHenry/develop ... fix php warning : count parameters must be countable	2020-08-23 18:22:35 +02:00
Laurent Destailleur	d23e83779f	Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar	2020-08-23 18:21:18 +02:00
Laurent Destailleur	2b8a1570f9	Merge pull request #14512 from StephaneLesage/import-product-warehouse-usebatch ... NEW: Products Import/Export 'default warehouse' and 'use batch' fields	2020-08-23 18:19:59 +02:00
Laurent Destailleur	053aa1b750	Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents ... NEW Show place from events on import calender	2020-08-23 18:11:02 +02:00
Laurent Destailleur	e32b99fb21	Merge pull request #14515 from ptibogxiv/patch-346 ... Fix Stripe icon in balance list	2020-08-23 18:10:11 +02:00
Laurent Destailleur	9c74211873	Merge pull request #14508 from b92/develop ... NEW Add __TYPE__ substitution key	2020-08-23 18:09:49 +02:00
Laurent Destailleur	c784c002fd	Merge pull request #14517 from aspangaro/13.0_a5 ... Some fix on complete_head_from_modules	2020-08-23 18:09:15 +02:00
Laurent Destailleur	6685cc5bc8	Update admin.lang	2020-08-23 18:07:18 +02:00
Laurent Destailleur	bd7261a449	Debug recruitment module	2020-08-23 18:04:52 +02:00
Laurent Destailleur	9b7691c8d2	Update admin.lang	2020-08-23 18:04:02 +02:00
Laurent Destailleur	a4c34c2bc5	NEW Add Manufacturing Orders into the automatic ECM	2020-08-23 15:19:03 +02:00
Laurent Destailleur	3fe0ffe7e2	Add unique index on email_msgid of candidatures	2020-08-23 15:18:31 +02:00
Laurent Destailleur	34d2d9a7c6	Look and feel v13	2020-08-23 15:17:22 +02:00
Laurent Destailleur	ca2a34a4c9	Standardize code: Rename fields date_m into tms. All timestamp fields ... are now name "tms".	2020-08-23 15:15:47 +02:00
Laurent Destailleur	46a6161323	Trans	2020-08-23 13:30:05 +02:00
Alexandre SPANGARO	bf28201685	Fix Missing language key	2020-08-23 07:13:43 +02:00
Alexandre SPANGARO	015e1a8dab	Merge branch '12.0' into 12.0_p7	2020-08-23 07:07:47 +02:00
Laurent Destailleur	f56b7c5330	Removed one useless column	2020-08-23 02:45:19 +02:00
Laurent Destailleur	a265bec7ca	NEW Events in agenda for contact ... FIX Saving contacts of an events	2020-08-23 02:38:56 +02:00
andreubisquerra	e36eb42568	Fix travis	2020-08-22 18:46:39 +02:00
andreubisquerra	e8c8cb53cb	Fix travis	2020-08-22 18:45:54 +02:00
jove@bisquerra.com	d9cbd8f998	NEW: Print payment method and change in TakePOS	2020-08-22 18:28:15 +02:00
Laurent Destailleur	e9346298b2	trans	2020-08-22 15:48:42 +02:00
Laurent Destailleur	03af14294a	Standardize code. Debug module HRM	2020-08-22 15:29:19 +02:00
Laurent Destailleur	23cda5f464	Enhance recruitment module	2020-08-22 14:37:09 +02:00
Laurent Destailleur	ac1ae7a0d2	Debug	2020-08-22 04:05:31 +02:00
Laurent Destailleur	dabe804299	Add numbering modules for candidatures. Mass action Validate.	2020-08-22 03:49:46 +02:00
Laurent Destailleur	f07a09bc80	Fix missing include	2020-08-22 02:19:58 +02:00
Laurent Destailleur	f4ed84f27d	Trans	2020-08-21 22:18:02 +02:00
Laurent Destailleur	a508e7ae08	Migration	2020-08-21 22:17:20 +02:00
Laurent Destailleur	e6616563d2	Fix size of field	2020-08-21 22:01:28 +02:00
Laurent Destailleur	6ad18ceef0	Remove useless code	2020-08-21 19:48:31 +02:00
stickler-ci	183013e9ed	Fixing style errors.	2020-08-21 12:02:03 +00:00
Sekan, Tobias	9af5354dfe	Parse priority and transparency from external calender events	2020-08-21 13:57:03 +02:00
Laurent Destailleur	1b22de5652	Fix phpcs	2020-08-21 13:22:49 +02:00
Laurent Destailleur	b80ba1179f	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/lines.php htdocs/accountancy/expensereport/lines.php htdocs/accountancy/supplier/lines.php	2020-08-21 13:19:28 +02:00
Laurent Destailleur	b6af947042	Fix phpcs	2020-08-21 13:06:54 +02:00
Laurent Destailleur	220fc6db98	Work on recruitment module	2020-08-21 13:00:12 +02:00
stickler-ci	61cce2e700	Fixing style errors.	2020-08-21 06:46:00 +00:00
Sekan, Tobias	22ff5a320f	fix not working external calender on/off	2020-08-21 08:40:23 +02:00
Sekan, Tobias	bb1452917b	fix wrong event percentage	2020-08-21 08:33:19 +02:00
Sekan, Tobias	ba98db934d	Show user on external calender events	2020-08-21 08:18:26 +02:00
Alexandre SPANGARO	065ace5301	Fix Missing language key on rights	2020-08-21 05:26:07 +02:00
Alexandre SPANGARO	76315fa6ac	Fix Missing language key on rights	2020-08-21 05:22:31 +02:00
Alexandre SPANGARO	dd87362ce3	Fix Missing language key on rights	2020-08-21 05:20:53 +02:00
Alexandre SPANGARO	646d5cc9c8	Fix Missing language key on rights	2020-08-21 05:19:57 +02:00
Alexandre SPANGARO	881a9b7c04	Fix Missing language key on rights	2020-08-21 05:10:19 +02:00
Alexandre SPANGARO	bd5e35c15f	Fix Missing language key	2020-08-21 05:00:38 +02:00
Alexandre SPANGARO	142ce7c03f	Fix Missing language key	2020-08-21 04:58:21 +02:00
Laurent Destailleur	461c37c4a8	Clean code	2020-08-21 01:28:40 +02:00
Laurent Destailleur	b2ed69100b	Trans	2020-08-21 01:18:06 +02:00
Laurent Destailleur	ad0625b6ec	Debug posting message from ticket page	2020-08-21 01:11:22 +02:00
Laurent Destailleur	0390111132	Add column bomtype	2020-08-20 23:32:35 +02:00
Laurent Destailleur	eb15a8e4db	Enhance email collector module	2020-08-20 23:03:57 +02:00
Alexandre SPANGARO	f1f579ad67	Some fix on complete_head_from_modules	2020-08-20 22:17:34 +02:00
ptibogxiv	eba4d44c81	Fix Stripe icon in balance list	2020-08-20 20:24:00 +02:00
Laurent Destailleur	3ebcd191bd	NEW Add filter rules "is answer" and "is not answer" in email collector	2020-08-20 20:16:38 +02:00
Laurent Destailleur	605642d96a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-20 19:01:03 +02:00
Laurent Destailleur	66f9f37f41	Minor code and doc enhancement	2020-08-20 19:00:43 +02:00
florian HENRY	0453dd8f09	fix php warning : count parameters must be countable	2020-08-20 16:39:14 +02:00
stickler-ci	3c108e8bbf	Fixing style errors.	2020-08-20 13:31:48 +00:00
Christian Foellmann	179fc2e70a	hide other eatby sellby dates	2020-08-20 15:27:34 +02:00
StephaneLesage	ad6fe8c6b6	NEW: Products Import/Export 'default warehouse' and 'use batch number' fields	2020-08-20 13:51:17 +02:00
Christian Foellmann	a5b4fcedb7	hide eatby sellby in reception	2020-08-20 12:48:23 +02:00
Laurent Destailleur	95c25bc1b7	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-20 12:21:55 +02:00
Laurent Destailleur	fbb162aa9b	Trans	2020-08-20 12:21:40 +02:00
Frédéric FRANCE	b4d2bf98fa	Use of undefined constant state - assumed 'state'	2020-08-20 12:14:40 +02:00
Christian Foellmann	b74113e2eb	hide eatby sellby on expedition	2020-08-20 12:13:27 +02:00
Christian Foellmann	b777c62557	hide eatby sellby on product/stock/product	2020-08-20 12:13:05 +02:00
Sekan, Tobias	546571a6f8	Show place from events on import calender	2020-08-20 08:20:00 +02:00
Bernard Saulme	d947ade7db	Update adherent.class.php ... NEW Add _TYPE__ substitution key	2020-08-19 21:19:56 +02:00
Mr Matthew Sidnell	c2a81341ad	Updated Lint Issies	2020-08-19 16:27:00 +01:00
Matt Sidnell	b3f078a687	Updated the categories API to allow projects as type	2020-08-19 16:20:16 +01:00
Christian Foellmann	df3fcec6c6	hide dates on erassortlot.php	2020-08-19 16:44:45 +02:00
Christian Foellmann	2873e6bdca	hide dates in productlot_list	2020-08-19 16:33:41 +02:00
stickler-ci	8191447007	Fixing style errors.	2020-08-19 16:33:41 +02:00
Christian Foellmann	b6af4014de	hide eatby, sellby dates	2020-08-19 16:33:41 +02:00
Laurent Destailleur	3281d5ec17	Merge pull request #14451 from josemariagomezroncero/patch-7 ... Bug, this option disable topic input.	2020-08-19 14:38:51 +02:00
Laurent Destailleur	4edf190264	Update mails_templates.php	2020-08-19 14:38:02 +02:00
Laurent Destailleur	25dfd32e0b	Merge pull request #14456 from andreubisquerra/master ... NEW: Delayed payment in TakePOS	2020-08-19 14:36:34 +02:00
Laurent Destailleur	ea478721e7	Update invoice.php	2020-08-19 14:36:03 +02:00
Laurent Destailleur	f57f729d40	Update invoice.php	2020-08-19 14:35:15 +02:00
Laurent Destailleur	cfc6ee4f67	Merge pull request #14497 from megalogi/patch-2 ... Passing $totalarray as parameter to printFieldListFooter Hook's	2020-08-19 14:16:26 +02:00
Laurent Destailleur	8057ccb223	Update task.class.php	2020-08-19 14:13:30 +02:00
abichotte	1c6a062486	FIX|fix #14502 fix to create a task for a project with api	2020-08-19 11:24:32 +02:00
Alexandre SPANGARO	fbd4323dd8	Fix Accountancy - Show label account in page already bind	2020-08-19 06:01:10 +02:00
Laurent Destailleur	90545ac443	css	2020-08-19 01:59:03 +02:00
Laurent Destailleur	7217dc3114	Better perf for phpunit on very large databases	2020-08-19 01:43:48 +02:00
Abdessalam@MEGALOGI	7f540ac6f0	Passing $totalarray as a parameter to printFieldListFooter Hook's ... Sometimes, we need $totalarray to know nbfield or to display some vars in the footer of list.	2020-08-18 23:27:36 +01:00
Laurent Destailleur	53522fb8dd	Fix popup on objects in modulebuilder	2020-08-18 18:41:36 +02:00
Laurent Destailleur	3e91d77920	FIX Update extrafields on warehouse	2020-08-18 18:35:40 +02:00
Laurent Destailleur	afe8f76a4a	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/stock.php	2020-08-18 15:41:57 +02:00
Laurent Destailleur	3556004f02	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-18 15:35:43 +02:00
Laurent Destailleur	d4a502629e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/admin/stock.php htdocs/core/lib/ajax.lib.php	2020-08-18 15:35:34 +02:00
Laurent Destailleur	d21bda604d	FIX Setup of stock increase/decrease	2020-08-18 15:27:17 +02:00
Laurent Destailleur	2f18ab0ea9	Debug generation of document for warehouse	2020-08-18 14:55:56 +02:00
Laurent Destailleur	964c4ef0d2	Standardize code. Use model_pdf.	2020-08-18 14:48:38 +02:00
Laurent Destailleur	6ce9d573e2	Trans	2020-08-18 14:13:36 +02:00
Laurent Destailleur	0172b76ea3	Add class reposition on some buttons	2020-08-18 14:05:35 +02:00
Laurent Destailleur	58e25768a7	NEW Add PDF document templates for warehouses (list of stock)	2020-08-18 14:02:36 +02:00
Juanjo Menent	e685a96716	FIX: Intervention lose html tags when updating	2020-08-18 13:44:50 +02:00
Laurent Destailleur	e65e4a6d47	Beautify for of member module	2020-08-18 11:52:00 +02:00
Laurent Destailleur	2ca0d67072	Removed section of files to download into POS	2020-08-18 11:20:02 +02:00
Alexandre SPANGARO	3e80c71713	NEW Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules	2020-08-18 07:38:46 +02:00
Alexandre SPANGARO	8e0dfc8621	Fix oddeven	2020-08-18 06:28:16 +02:00
Alexandre SPANGARO	c3a23b0415	Remove admin access on option	2020-08-18 06:23:35 +02:00
Laurent Destailleur	79802be58b	Fix phpcs	2020-08-18 00:29:13 +02:00
Laurent Destailleur	e3145d4195	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-17 23:31:07 +02:00
Laurent Destailleur	4f93de6d0b	Fix phpcs	2020-08-17 23:30:53 +02:00
Laurent Destailleur	b623d79525	Merge pull request #14488 from egils-consulting/patch-10 ... Update admin.lang	2020-08-17 22:21:09 +02:00
Laurent Destailleur	24703b8fe7	Merge pull request #14487 from aspangaro/13a4 ... NEW Add a start date to begin binding in accountancy	2020-08-17 22:20:46 +02:00
Laurent Destailleur	6662e216f7	Fix phpcs	2020-08-17 21:59:50 +02:00
Laurent Destailleur	e3beec3e1f	Fix css	2020-08-17 20:57:44 +02:00
Laurent Destailleur	9f1e4a6da8	css	2020-08-17 20:55:02 +02:00
Laurent Destailleur	bd65e5612f	Fix duplicate id	2020-08-17 20:06:01 +02:00
Laurent Destailleur	c63d54631c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/categories/class/categorie.class.php	2020-08-17 19:59:17 +02:00
Laurent Destailleur	5952ae28b8	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-17 19:54:32 +02:00
Laurent Destailleur	487d26c7db	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php	2020-08-17 19:54:23 +02:00
Laurent Destailleur	68b6fdb508	Fix missing tags	2020-08-17 19:48:05 +02:00
Laurent Destailleur	0245eb102c	Fix css on fields that are not mandatory	2020-08-17 19:44:06 +02:00
Laurent Destailleur	e891250fb3	Reduce log	2020-08-17 17:40:08 +02:00
Laurent Destailleur	e69e165bae	css	2020-08-17 17:37:44 +02:00
Laurent Destailleur	69d73ac528	FIX Compatibility with modules without document generation ... Conflicts: htdocs/core/actions_addupdatedelete.inc.php	2020-08-17 16:08:38 +02:00
Laurent Destailleur	8bfa6df1a6	FIX Update extrafields on line only if it is supported ... Conflicts: htdocs/modulebuilder/template/class/myobject.class.php	2020-08-17 16:06:36 +02:00
Laurent Destailleur	bdcb945dda	Work on inventory	2020-08-17 16:04:12 +02:00
Laurent Destailleur	c3e3baaca0	FIX Compatibility with modules without document generation	2020-08-17 15:54:07 +02:00
Laurent Destailleur	8e00c9c304	FIX Update extrafields on line only if it is supported	2020-08-17 15:53:33 +02:00
Egil Priskorn	bf18f56056	Update admin.lang ... Small typo	2020-08-17 15:33:36 +02:00
Alexandre SPANGARO	498431fa6f	NEW Add a start date to begin binding in accountancy	2020-08-17 15:27:05 +02:00
John Botella	6e1702c1a5	Fix infinite fetch object linked loop	2020-08-17 15:00:31 +02:00
Laurent Destailleur	d1323f55bb	NEW: Module Reception (for a more accurate management of your ... receptions) moved from experimental to stable	2020-08-17 14:10:43 +02:00
Laurent Destailleur	75d368b706	Better translation of option	2020-08-17 14:08:52 +02:00
Laurent Destailleur	5be10f133c	Fix several regressions with variants creation	2020-08-17 13:55:18 +02:00
Laurent Destailleur	96d4eeb8be	Fix syntax error	2020-08-17 12:24:32 +02:00
Laurent Destailleur	15e7cd0fb3	Fix doxygen	2020-08-17 05:54:22 +02:00
Laurent Destailleur	cf73c2d8e1	Fix travis	2020-08-17 05:26:32 +02:00
Laurent Destailleur	9712e3d28f	Fix travis	2020-08-17 05:09:27 +02:00
Laurent Destailleur	f6c444c235	css	2020-08-17 05:03:44 +02:00
Laurent Destailleur	86a31d17a5	Better test	2020-08-17 04:34:53 +02:00
Laurent Destailleur	5987504fa5	Better test	2020-08-17 04:34:03 +02:00
asolslk	5a6f459db5	Update accounting.lib.php	2020-08-17 04:09:12 +02:00
Laurent Destailleur	75f8fe8276	Merge pull request #14427 from asolslk/patch-2 ... FIX Visible 0 on accounting account	2020-08-17 01:34:57 +02:00
Laurent Destailleur	4043e4ed3b	Merge pull request #14429 from grandoc/new_branch_08_08_2020 ... New branch 08 08 2020	2020-08-17 00:04:08 +02:00
Laurent Destailleur	f758a8345e	Merge branch 'develop' into translate-variable-name-and-add-hints	2020-08-16 23:52:48 +02:00
Laurent Destailleur	f26a287d10	Update api_supplier_invoices.class.php	2020-08-16 23:50:01 +02:00
Laurent Destailleur	b7c38f4617	Merge pull request #14433 from c3do/patch-1 ... NEW Triggers Attributes and Attributes values	2020-08-16 23:45:32 +02:00
Laurent Destailleur	a76d4daff8	Merge pull request #14444 from fmarcet/11.0 ... FIX: Visualization rights correction on last modified contacts box	2020-08-16 23:37:23 +02:00
Laurent Destailleur	99809b487e	Standardize code	2020-08-16 23:33:50 +02:00
Laurent Destailleur	816aeadcba	Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge ... NEW : Declinaison price level compatibility	2020-08-16 23:18:49 +02:00
Laurent Destailleur	657e6a2037	No warning	2020-08-16 23:14:53 +02:00
Laurent Destailleur	4c0785e996	FIX #14469	2020-08-16 23:13:27 +02:00
Laurent Destailleur	c407a19563	Remove type= from script tags	2020-08-16 22:03:11 +02:00
Laurent Destailleur	8992d38bea	Merge pull request #14482 from b92/develop ... NEW Add __MEMBER_TYPE__ substitution key	2020-08-16 21:17:09 +02:00
Laurent Destailleur	03e8a0737c	Merge pull request #14481 from OPEN-DSI/v10-html-formfile-add-param-entity ... FIX param entity in html form file	2020-08-16 21:16:28 +02:00
Laurent Destailleur	f6c1a14d50	CSS	2020-08-14 21:22:45 +02:00
josemariagomezroncero	134bd11f47	Update mails_templates.php	2020-08-14 21:19:51 +02:00
Laurent Destailleur	695420eb8b	CSS	2020-08-14 21:18:06 +02:00
Laurent Destailleur	2adac8e233	CSS	2020-08-14 21:11:55 +02:00
Bernard Saulme	52b84a3ea2	Update functions.lib.php	2020-08-14 18:08:59 +02:00
Laurent Destailleur	73c1184195	Fix phpcs	2020-08-14 13:23:41 +02:00
Laurent Destailleur	65ceaac42e	Better message	2020-08-14 12:56:17 +02:00
lvessiller	d5acc85ef0	FIX param entity in html form file	2020-08-14 12:18:28 +02:00
Laurent Destailleur	6851e24c3b	Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0	2020-08-14 12:02:40 +02:00
Laurent Destailleur	d8c6e17efd	Fix travis	2020-08-14 11:59:51 +02:00
Laurent Destailleur	fe0b1c5ee4	Fix travis	2020-08-14 11:53:54 +02:00
Laurent Destailleur	52f20a1047	Fix travis	2020-08-14 11:52:21 +02:00
Laurent Destailleur	a916f6af59	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2020-08-14 11:09:06 +02:00
Laurent Destailleur	0381cf5665	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop ... Conflicts: htdocs/core/modules/modPaymentByBankTransfer.class.php htdocs/filefunc.inc.php	2020-08-14 11:08:53 +02:00
Laurent Destailleur	056a503200	Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 ... Conflicts: htdocs/product/composition/card.php	2020-08-14 11:06:39 +02:00
Laurent Destailleur	2b393d04e1	Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0	2020-08-14 11:03:48 +02:00
Laurent Destailleur	d35c7ed49b	Fix trans	2020-08-14 11:03:12 +02:00
Laurent Destailleur	9e8ed3bf54	Merge pull request #14445 from atm-john/11.0_fix_lang ... Fix lang fr	2020-08-14 03:28:42 +02:00
Laurent Destailleur	74da63c0e4	Merge pull request #14448 from 418sec/develop ... Security Fix for Cross-site Scripting (XSS) - huntr.dev	2020-08-14 03:17:35 +02:00
Laurent Destailleur	a2f50770f8	Merge pull request #14449 from cfoellmann/default-unit ... set default unit to `PRODUCT_USE_UNITS` value	2020-08-14 03:04:09 +02:00
Laurent Destailleur	f0046672fc	Merge pull request #14461 from atm-john/NEW_fill_service_dates ... NEW: new line template: hidden conf to fill service dates from the last service line	2020-08-14 02:50:24 +02:00
Laurent Destailleur	1d18c83439	Merge pull request #14463 from andreubisquerra/develop ... Avoid empty sales and orders when all lines are removed.	2020-08-14 02:48:48 +02:00
Laurent Destailleur	aeb11344c6	Merge pull request #14464 from atm-thibaultf/FIX_allow_float_on_stock_alert ... Allow float for stock limit alert and desired stock	2020-08-14 02:46:08 +02:00
lvessiller	f385e02c53	FIX title button attribute id empty	2020-08-13 17:43:18 +02:00
stickler-ci	d784c621c9	Fixing style errors.	2020-08-13 15:07:06 +00:00
Adrien Raze	990217fcb0	FIX : task leftmenu	2020-08-13 16:59:27 +02:00
Laurent Destailleur	7ce1d36b59	FIX Category for suplements not saved	2020-08-13 13:51:08 +02:00
Laurent Destailleur	88c07e86ad	Organization of setup for Takepos bar features	2020-08-13 13:46:53 +02:00
stickler-ci	959ccce777	Fixing style errors.	2020-08-13 09:48:28 +00:00
John Botella	2405082bb1	Merge branch 'develop_declinaison_price_multiple_merge' of github.com:atm-john/dolibarr into develop_declinaison_price_multiple_merge	2020-08-13 11:46:07 +02:00
John Botella	4e1f554c15	Fix - add variation price fallback behavior	2020-08-13 11:43:33 +02:00
Laurent Destailleur	f22398a9d3	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0	2020-08-12 20:26:01 +02:00
Laurent Destailleur	355d62e7db	FIX Update line of BOM	2020-08-12 20:24:44 +02:00
stickler-ci	1cc673a9c6	Fixing style errors.	2020-08-12 08:53:24 +00:00
John Botella	41cbe6db12	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge	2020-08-12 10:39:21 +02:00
John Botella	f0268b4aaf	Add declinaison price level	2020-08-12 10:14:29 +02:00
atm-thibaultf	10810bc5bb	Modify int to float for stock limit alert and desired stock	2020-08-12 09:09:59 +02:00
andreubisquerra	8c5a86cb72	Avoid empty sales and orders when all lines are removed.	2020-08-12 07:07:18 +02:00
stickler-ci	ef78b85062	Fixing style errors.	2020-08-11 10:42:27 +00:00
John Botella	47e664df8d	Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates	2020-08-11 12:28:40 +02:00
Juanjo Menent	3eb23d3325	FIX: MySql Strict mode	2020-08-11 10:12:19 +02:00
Juanjo Menent	4e6b7289f2	FIX: MySql Strict mode	2020-08-11 10:07:38 +02:00
Juanjo Menent	b1735b0f80	FIX: MySql Strict mode	2020-08-11 10:02:46 +02:00
jove@bisquerra.com	3be723f3a1	NEW: Delayed payment in TakePOS	2020-08-11 07:49:54 +02:00
josemariagomezroncero	308dea92b3	Bug, this option disable topic input. ... Bug, MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES disable topic input. We need the subject for email for save.	2020-08-10 20:40:11 +02:00
stickler-ci	3e168f9495	Fixing style errors.	2020-08-10 14:06:22 +00:00
Christian Foellmann	821e7e2894	set default unit to PRODUCT_USE_UNITS value	2020-08-10 15:39:05 +02:00
John Botella	f014365b65	Fix lang fr	2020-08-10 10:35:50 +02:00
Ferran Marcet	10df9777b5	FIX: Visualization rights correction on last modified contacts box	2020-08-10 09:53:20 +02:00
Cédric	3f233a3200	Fix comment params	2020-08-08 23:01:41 +02:00
stickler-ci	d7a65a540e	Fixing style errors.	2020-08-08 20:58:51 +00:00
Cédric	9b00a1f61a	Some updates for attributes triggers	2020-08-08 22:48:21 +02:00
Cédric	ed1a2cd917	Update 1	2020-08-08 22:45:51 +02:00
Cédric	ef57bb7e84	pass $user to delete functions	2020-08-08 22:14:53 +02:00
Cédric	e73a7c78f7	NEW triggers create, modify, delete	2020-08-08 22:10:50 +02:00
Cédric	bb16564b98	NEW triggers create, modify, delete ... Also modified deleteByFkAttribute() to use the function delete()	2020-08-08 22:08:46 +02:00
Philippe Grand	e7bea7c5ce	Update pdf_cyan.modules.php	2020-08-08 15:34:38 +02:00
Philippe GRAND	fe24c2f8b8	fix undefined variable	2020-08-08 15:29:53 +02:00
Philippe GRAND	f35893ceb4	fix deprecated	2020-08-08 15:12:29 +02:00
Philippe GRAND	0603a3ef60	fix conflict	2020-08-08 15:00:13 +02:00
Philippe GRAND	d811934962	fix conflict	2020-08-08 14:57:43 +02:00
Laurent Destailleur	a53f7ff9c9	Merge pull request #14428 from asolslk/patch-3 ... Fix group by finance account error #14221	2020-08-08 13:33:10 +02:00
Laurent Destailleur	cab9f6daae	Comment must be in english	2020-08-08 13:22:55 +02:00
Laurent Destailleur	a32587d993	Merge pull request #14420 from egils-consulting/patch-5 ... New function count_all_categories	2020-08-08 13:16:12 +02:00
Laurent Destailleur	f8557879fb	Update listbyaccount.php	2020-08-08 13:15:29 +02:00
asolslk	41bb83f107	Update listbyaccount.php ... fixed #14221	2020-08-08 19:10:50 +08:00
asolslk	ea829913b0	Update accounting.lib.php	2020-08-08 19:07:55 +08:00
stickler-ci	d3cb704a0e	Fixing style errors.	2020-08-08 11:05:19 +00:00
asolslk	5291746252	Update listbyaccount.php ... fixed #14408	2020-08-08 19:04:38 +08:00
Laurent Destailleur	6e01ffd5ac	Prepare for 12.0.3	2020-08-08 13:00:57 +02:00
Laurent Destailleur	4e6158d23c	Work on recruitment module	2020-08-08 02:54:14 +02:00
Laurent Destailleur	deabfcf403	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-08 02:34:36 +02:00
Laurent Destailleur	537b58b446	Introduce workaround to allow integrator to suggest list of modules in ... old style by default instead of kanban style #14075	2020-08-08 02:34:22 +02:00
Laurent Destailleur	b5749af5b4	Merge pull request #14379 from fappels/12_fix_search_stock_list ... FIX filter warehouse list on status	2020-08-08 02:25:54 +02:00
Laurent Destailleur	8f8f7ecf5d	Update categorie.class.php	2020-08-08 02:24:01 +02:00
stickler-ci	fc58d92db4	Fixing style errors.	2020-08-07 21:20:55 +00:00
Egils Consulting	9f130aa2af	New function count_all_categories ... This is useful to count the total number of categories e.g. to decide whether to load the full tree or not. It might make most sense to wait with merging until there is code in viewcat.php or index.php using it.	2020-08-07 23:17:43 +02:00
Laurent Destailleur	6f7b65d9f2	css	2020-08-07 20:44:49 +02:00
Laurent Destailleur	aa699bacc6	css	2020-08-07 20:10:31 +02:00
Laurent Destailleur	4855b49698	css	2020-08-07 19:44:49 +02:00
Laurent Destailleur	030df58fea	Fix regression in sending emails	2020-08-07 17:11:23 +02:00
Laurent Destailleur	795754273e	Fix regression in sending emails	2020-08-07 17:06:57 +02:00
Laurent Destailleur	bd5c4603e3	Fix regression in sending emails	2020-08-07 17:06:12 +02:00
Laurent Destailleur	e69616110d	Fix permission on page	2020-08-07 16:59:27 +02:00
Laurent Destailleur	0dda5ca4d6	Fix experimental	2020-08-07 16:27:09 +02:00
Laurent Destailleur	9876e37309	A little perf and memory enhancement when building category tree	2020-08-07 15:47:02 +02:00
Laurent Destailleur	00804c1020	Complete fix for #14146	2020-08-07 15:19:26 +02:00
Francis Appels	dec0e418e3	Convert search key status to class key statut. ... Add comment to refactor class statut to class status	2020-08-07 15:11:36 +02:00
Laurent Destailleur	dd773d33fd	Fix phpcs	2020-08-07 14:57:52 +02:00
Laurent Destailleur	ada7b74ba1	Fix phpcs	2020-08-07 14:56:30 +02:00