6602 Commits

Author	SHA1	Message	Date
jove@bisquerra.com	712e1c4e7c	NEW Edit sales lines rights in TakePOS	2021-04-17 01:06:30 +02:00
Laurent Destailleur	70abc04bf5	Merge pull request #17103 from Givriz/dev ... Fix compatibility phpv8	2021-04-16 20:51:00 +02:00
Laurent Destailleur	1a3e9cae68	Comment	2021-04-16 20:44:30 +02:00
Givriz	86bfcd9510	Easy way to use conf->global	2021-04-16 17:10:11 +02:00
NextGestion	0d4a1d061a	Merge branch 'develop' into dolibarr_partnership	2021-04-16 11:01:08 +01:00
Florian HENRY	99b7deba14	Merge branch '13.0' of github.com:Dolibarr/dolibarr into fix_13_toomanytestmenu	2021-04-16 10:37:50 +02:00
Florian HENRY	0cd567f256	fix double test	2021-04-16 10:37:42 +02:00
Laurent Destailleur	38f54d0582	FIX Missing extrafields into export of agenda record	2021-04-16 10:26:35 +02:00
Givriz	47cdfee1d2	Compatibility pvpv8	2021-04-14 22:03:04 +02:00
Givriz	598156de04	Update modDataPolicy.class.php ... There was useless condition	2021-04-14 17:58:46 +02:00
NextGestion	4e45011e45	Manage Partnership for third-party	2021-04-14 13:59:38 +01:00
stickler-ci	bcab8d5164	Fixing style errors.	2021-04-14 07:49:18 +00:00
Adrien Raze	c83819bd90	NEW : Add possibility to exports userGroups fields on user exports	2021-04-14 09:44:01 +02:00
Alexandre SPANGARO	2f31720896	Maxi debug of societe/product per entity	2021-04-14 04:45:17 +02:00
Laurent Destailleur	033a243372	Merge pull request #17166 from altairisfr/product_masks ... Product masks	2021-04-13 23:06:09 +02:00
Laurent Destailleur	161baa672a	Fix phpcs	2021-04-13 21:11:02 +02:00
Laurent Destailleur	358bb87ae2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/index.php htdocs/core/class/html.form.class.php htdocs/core/lib/payments.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/projet/card.php htdocs/public/payment/newpayment.php htdocs/societe/list.php htdocs/ticket/document.php	2021-04-13 20:19:05 +02:00
Laurent Destailleur	192fcb89d2	Merge pull request #17097 from NextGestion/dolibarr_partnership ... Create Partnership Module	2021-04-13 16:33:54 +02:00
Frédéric FRANCE	d007e75a8e	Update pdf_eratosthene.modules.php	2021-04-13 09:55:04 +02:00
Frédéric FRANCE	8085f10995	Update pdf_einstein.modules.php	2021-04-13 09:53:51 +02:00
Frédéric FRANCE	8953c0ac3a	Update pdf_cyan.modules.php	2021-04-13 09:49:30 +02:00
Frédéric FRANCE	ee4f846eb9	Update pdf_azur.modules.php	2021-04-13 09:49:03 +02:00
Frédéric FRANCE	fcca5d7d5c	Update pdf_sponge.modules.php	2021-04-13 09:47:15 +02:00
Frédéric FRANCE	9ce6d841cc	Update pdf_crabe.modules.php	2021-04-13 09:40:16 +02:00
Alexandre SPANGARO	44133166de	Merge remote-tracking branch 'upstream/develop' into 14a36	2021-04-12 21:35:03 +02:00
Damien BENOIT	9abc7a5b0d	Update modDataPolicy.class.php	2021-04-12 16:16:48 +02:00
Givriz	7a54e5d346	Using empty instead of isset ... I used empty instead of isset, and I fixed some problems of my previous pull request	2021-04-12 16:03:56 +02:00
Laurent Destailleur	8a62d97b89	Remove one thousand of useless files	2021-04-12 15:57:16 +02:00
altairis-noe	ab39cfdf09	oops, better if we test the right const	2021-04-12 14:32:05 +02:00
altairis-noe	beecc6f935	Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks	2021-04-12 14:13:37 +02:00
altairis-noe	a61c1f8807	checkboxes for custom masks	2021-04-12 14:01:36 +02:00
Alexandre SPANGARO	f749111148	Work on split module fournisseur	2021-04-12 06:27:46 +02:00
Alexandre SPANGARO	ab35b6b4f2	Work on split module fournisseur	2021-04-12 06:21:25 +02:00
Alexandre SPANGARO	77d751b03e	Work on split module fournisseur	2021-04-12 05:41:37 +02:00
Alexandre SPANGARO	ce7c5a0c7b	Work on split module fournisseur	2021-04-11 04:24:21 +02:00
Laurent Destailleur	3895142772	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/menus/standard/eldy.lib.php	2021-04-10 12:06:11 +02:00
Laurent Destailleur	52213d0ac7	Fix duplicate permissions	2021-04-09 21:15:43 +02:00
NextGestion	d6e4cb7d0b	Merge branch 'develop' into dolibarr_partnership	2021-04-09 12:01:44 +01:00
Laurent Destailleur	d098bf412d	Move directory to match the one of composer package for phpspreadsheet	2021-04-08 17:35:52 +02:00
Laurent Destailleur	244e83e18d	Merge pull request #17164 from draceo/art261-7 ... Add bill tax code article for non profit organization VAT (fixes #17163)	2021-04-08 13:46:22 +02:00
Laurent Destailleur	1e1b963ca7	Restriction on name of files	2021-04-07 19:38:54 +02:00
Florent Peyraud	7be9a98ef0	Add bill tax code article for non profit organization VAT	2021-04-07 13:51:08 +02:00
NextGestion	ace958240d	Merge branch 'develop' into dolibarr_partnership	2021-04-07 12:30:37 +01:00
stickler-ci	c9aed75837	Fixing style errors.	2021-04-07 11:24:31 +00:00
NextGestion	5f5f0eb3f3	Add menu entries into thirdparty menu or member menu & Allow extrafields	2021-04-07 12:21:59 +01:00
Laurent Destailleur	fcc6431896	Merge pull request #17136 from aspangaro/14a35 ... NEW: Add deposit on supplier invoice (& somes ajustments)	2021-04-07 02:51:32 +02:00
NextGestion	78b4aa61fa	Add a new tab "Partnership" on the record of a thirdparty or a member (depending on setup)	2021-04-06 18:57:45 +01:00
NextGestion	debef2fb6d	initial Batch to cancel partnership for expired members	2021-04-06 15:53:51 +01:00
Alexandre SPANGARO	36e4f5aa22	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-04-06 10:29:44 +02:00
Alexandre SPANGARO	82b652df8a	NEW: Add deposit on supplier invoice (& somes ajustments)	2021-04-06 09:15:34 +02:00
Laurent Destailleur	685c880e6c	Debug module workstation	2021-04-05 14:56:47 +02:00
Laurent Destailleur	6c521073ea	Fix perm id and sort of modules by id.	2021-04-05 13:52:19 +02:00
Alexandre SPANGARO	f64d0377c5	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-04-04 06:03:41 +02:00
Givriz	5ed01f6733	Fix errors phpv8	2021-04-03 17:09:14 +02:00
NextGestion	6cac5f2212	Create Partnership Module	2021-04-03 09:24:07 +01:00
Laurent Destailleur	06078f231b	NEW Can show the project ref or label into PDF documents	2021-04-01 13:02:44 +02:00
Laurent Destailleur	6fc70fba8c	Merge pull request #16981 from FHenry/dev_EventOrganisation ... new: working on conference or booth object and event type #FoundationFunding	2021-03-31 22:29:39 +02:00
Laurent Destailleur	55741506c8	Merge pull request #17053 from aspangaro/14a30 ... NEW: Accountancy - Add FEC import	2021-03-31 22:15:26 +02:00
Alexandre SPANGARO	dd913b2385	Update	2021-03-31 20:40:26 +02:00
Florian HENRY	73d7eefdcf	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-31 20:09:44 +02:00
Laurent Destailleur	b695c4a1c8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-31 13:59:35 +02:00
Laurent Destailleur	14c7ce7492	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/reception/card.php	2021-03-31 13:59:21 +02:00
Laurent Destailleur	89dbd745bf	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/modules/modAccounting.class.php	2021-03-31 13:53:36 +02:00
Alexandre SPANGARO	14a62442c4	FIX: Accountancy - Import in general ledger	2021-03-31 05:07:05 +02:00
Alexandre SPANGARO	9b65529fc7	NEW: Accountancy - Add FEC import	2021-03-31 04:59:12 +02:00
Alexandre SPANGARO	5723dbb836	FIX: Add a sub table to manage accountancy on product/company	2021-03-31 04:52:24 +02:00
Alexandre SPANGARO	38d47c184e	FIX: Add a sub table to manage accountancy on product/company	2021-03-30 22:12:57 +02:00
Alexandre SPANGARO	4e30481fa2	Merge remote-tracking branch 'upstream/develop' into 14a27	2021-03-30 22:05:03 +02:00
Laurent Destailleur	38f1710b43	Merge pull request #17020 from Hystepik/develop#1 ... Close #4951 : New module Inventory	2021-03-30 20:43:52 +02:00
Frédéric FRANCE	4c874ddf15	Update mod_facture_terre.php	2021-03-30 18:35:46 +02:00
Frédéric FRANCE	a9e720eec3	Update mod_facture_mars.php	2021-03-30 18:33:52 +02:00
Laurent Destailleur	3744bc6a7a	FIX #yogosha5746 - next step (work in progress)	2021-03-30 18:17:13 +02:00
Laurent Destailleur	9ad3ba1572	Fix regression in export	2021-03-30 17:28:58 +02:00
Laurent Destailleur	6e422d26f3	FIX #yogosha5746 - next step (wip)	2021-03-30 16:20:18 +02:00
lmarcouiller	55560b7d38	Inventory module working	2021-03-30 12:35:20 +02:00
Laurent Destailleur	fb84608586	Clean sql	2021-03-30 03:37:54 +02:00
Alexandre SPANGARO	ea6b22f06e	FIX: Add a sub table to manage accountancy on product/company	2021-03-30 03:27:46 +02:00
Laurent Destailleur	b863b2a3f3	Look and feel v14	2021-03-30 02:01:08 +02:00
Laurent Destailleur	843e0a2c39	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/core/class/html.formother.class.php htdocs/core/modules/societe/doc/doc_generic_odt.modules.php htdocs/projet/tasks/time.php htdocs/webservices/server_thirdparty.php	2021-03-29 21:47:31 +02:00
Laurent Destailleur	f4ae8af9ea	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/accountancy/bookkeeping/listbyaccount.php htdocs/core/modules/societe/doc/doc_generic_odt.modules.php	2021-03-29 21:39:53 +02:00
Laurent Destailleur	a4987c6e4f	Merge branch 'develop' into 14a22	2021-03-29 20:35:35 +02:00
Florian HENRY	11dcf656c6	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-29 20:30:31 +02:00
Laurent Destailleur	5bbfe7ed19	Merge pull request #16930 from aspangaro/14a27 ... NEW: Add a sub table to manage accountancy on product/company	2021-03-29 20:11:02 +02:00
Laurent Destailleur	96363b3913	Merge pull request #16974 from ksar-ksar/develop ... FIX #16940	2021-03-29 17:07:19 +02:00
Florian HENRY	f25360cc4c	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-29 15:49:43 +02:00
Laurent Destailleur	e382d49299	Fix bad permission	2021-03-29 13:49:24 +02:00
Florian HENRY	2def98809c	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-29 11:55:26 +02:00
Laurent Destailleur	ad6f5e5a64	Fix permission export of services	2021-03-29 10:26:17 +02:00
Alexandre SPANGARO	2a1cc04b66	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-03-28 06:16:33 +02:00
Alexandre SPANGARO	22f809c517	Move to _PERENTITY	2021-03-27 05:23:20 +01:00
Alexandre SPANGARO	6422b0a6c0	Merge remote-tracking branch 'upstream/develop' into 14a27	2021-03-27 05:02:55 +01:00
Florian HENRY	f87711bf2f	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation	2021-03-26 18:30:08 +01:00
stickler-ci	c3d8df3ab2	Fixing style errors.	2021-03-25 13:53:41 +00:00
ksar	288d8d97cc	FIX #16940 ... Update nblines after hook	2021-03-25 14:52:17 +01:00
Laurent Destailleur	172b615d6c	Debug auto numbering of lot/serial.	2021-03-25 11:51:29 +01:00
Laurent Destailleur	5ddd98cd39	Move module intracomm as experimental	2021-03-25 11:24:46 +01:00
Laurent Destailleur	ff52b1ee41	Merge pull request #16620 from altairisfr/pr_batch_masks ... Define Masks for Batch Products Equipments	2021-03-25 08:36:36 +01:00
Laurent Destailleur	dce3b3e7af	Rename page to avoid to have an index.html page	2021-03-25 03:47:45 +01:00
Laurent Destailleur	52625325ff	Merge pull request #16922 from dolibit-ut/patch-155 ... Create index.html	2021-03-25 01:39:12 +01:00
Laurent Destailleur	6eac8ee25d	Merge pull request #16921 from dolibit-ut/patch-154 ... Create index.html	2021-03-25 01:39:03 +01:00
Laurent Destailleur	e994fbf093	Merge pull request #16923 from dolibit-ut/patch-156 ... Create index.html	2021-03-25 01:30:53 +01:00
Laurent Destailleur	36a49aacee	Merge pull request #16924 from dolibit-ut/patch-157 ... Create index.html	2021-03-25 01:30:45 +01:00
Laurent Destailleur	a5034d44f7	$_POST war	2021-03-24 19:53:31 +01:00
Laurent Destailleur	37c04b794f	Add property "ticket group is public" in dicitonary of ticket groups.	2021-03-24 12:13:23 +01:00
Florian HENRY	ebe0b503f6	working on attendees	2021-03-23 22:12:20 +01:00
Laurent Destailleur	053fe4831a	Fix translations	2021-03-23 16:59:12 +01:00
Laurent Destailleur	a1366da130	FIX #yogosha5715	2021-03-23 03:45:17 +01:00
Laurent Destailleur	e3b019f923	Clean code	2021-03-23 01:32:17 +01:00
Laurent Destailleur	af593099df	Clean string	2021-03-22 23:52:14 +01:00
Laurent Destailleur	6063b02bf4	Fix #ygosha5698	2021-03-22 12:47:23 +01:00
Laurent Destailleur	6a0e0f4c06	Fix #ygosha5698	2021-03-22 12:10:51 +01:00
Laurent Destailleur	15440917b1	Fix #ygosha5698	2021-03-22 11:30:18 +01:00
stickler-ci	5af4b4673c	Fixing style errors.	2021-03-21 22:12:36 +00:00
Alexandre SPANGARO	0c2ada4299	Merge remote-tracking branch 'upstream/develop' into 14a27	2021-03-21 23:08:01 +01:00
UT from dolibit	32cf5240f8	Create index.html	2021-03-21 22:17:50 +01:00
UT from dolibit	e6a2243627	Create index.html	2021-03-21 22:15:33 +01:00
UT from dolibit	6dc0d8202b	Create index.html	2021-03-21 22:14:13 +01:00
UT from dolibit	34b1b18a89	Create index.html	2021-03-21 22:12:19 +01:00
Laurent Destailleur	2a7b687fbf	Merge pull request #16918 from dolibit-ut/patch-151 ... Create index.html	2021-03-21 21:47:04 +01:00
Laurent Destailleur	4806d2f40b	Merge pull request #16916 from dolibit-ut/patch-149 ... Create index.html	2021-03-21 21:46:56 +01:00
Laurent Destailleur	ffb81d5acc	Merge pull request #16905 from dolibit-ut/patch-138 ... Create index.html	2021-03-21 21:46:49 +01:00
Laurent Destailleur	7f9199691a	Merge pull request #16908 from dolibit-ut/patch-141 ... Create index.html	2021-03-21 21:46:36 +01:00
Laurent Destailleur	4f025e419e	Merge pull request #16901 from dolibit-ut/patch-134 ... Create index.html	2021-03-21 21:46:29 +01:00
Laurent Destailleur	92b5d12574	Merge pull request #16903 from dolibit-ut/patch-136 ... Create index.html	2021-03-21 21:46:21 +01:00
Laurent Destailleur	2a25f3096c	Merge pull request #16902 from dolibit-ut/patch-135 ... Create index.html	2021-03-21 21:46:14 +01:00
Laurent Destailleur	449315c225	Merge pull request #16904 from dolibit-ut/patch-137 ... Create index.html	2021-03-21 21:46:07 +01:00
Laurent Destailleur	5ccbd62fc8	Merge pull request #16906 from dolibit-ut/patch-139 ... Create index.html	2021-03-21 21:45:59 +01:00
Laurent Destailleur	b798321f09	Merge pull request #16913 from dolibit-ut/patch-146 ... Create index.html	2021-03-21 21:45:53 +01:00
Laurent Destailleur	84487e4ef8	Merge pull request #16907 from dolibit-ut/patch-140 ... Create index.html	2021-03-21 21:45:46 +01:00
Laurent Destailleur	472fe901a7	Merge pull request #16909 from dolibit-ut/patch-142 ... Create index.html	2021-03-21 21:45:39 +01:00
Laurent Destailleur	ddea352092	Merge pull request #16910 from dolibit-ut/patch-143 ... Create index.html	2021-03-21 21:45:32 +01:00
Laurent Destailleur	d9ec217210	Merge pull request #16912 from dolibit-ut/patch-145 ... Create index.html	2021-03-21 21:45:25 +01:00
Laurent Destailleur	a78e62a16e	Merge pull request #16914 from dolibit-ut/patch-147 ... Create index.html	2021-03-21 21:45:18 +01:00
UT from dolibit	9eb50eee00	Create index.html	2021-03-21 21:40:37 +01:00
UT from dolibit	0241e2d449	Create index.html	2021-03-21 21:38:53 +01:00
UT from dolibit	98c2c59486	Create index.html	2021-03-21 21:36:41 +01:00
UT from dolibit	5b028d192d	Create index.html	2021-03-21 21:33:39 +01:00
UT from dolibit	9925cdcbee	Create index.html	2021-03-21 21:32:35 +01:00
UT from dolibit	d0cace4f2c	Create index.html	2021-03-21 21:32:05 +01:00
UT from dolibit	50672bfe31	Create index.html	2021-03-21 21:19:54 +01:00
UT from dolibit	2a069a0a2c	Create index.html	2021-03-21 21:19:12 +01:00
UT from dolibit	4b3b4d072a	Create index.html	2021-03-21 21:17:12 +01:00
UT from dolibit	2f957667ed	Create index.html	2021-03-21 21:16:32 +01:00
UT from dolibit	163b960da9	Create index.html	2021-03-21 21:15:40 +01:00
UT from dolibit	8ec3c4a5b5	Create index.html	2021-03-21 21:14:52 +01:00
UT from dolibit	21a2b4e222	Create index.html	2021-03-21 21:13:33 +01:00
UT from dolibit	e4921fa843	Create index.html	2021-03-21 21:11:01 +01:00
UT from dolibit	c0e7800251	Create index.html	2021-03-21 21:10:13 +01:00
UT from dolibit	ae91f3be63	Create index.html	2021-03-21 21:07:25 +01:00
Laurent Destailleur	800eeef868	Clean code	2021-03-21 18:20:37 +01:00
Laurent Destailleur	3c8bf2167b	Debug permissions	2021-03-21 18:01:43 +01:00
Laurent Destailleur	9900429fd0	Merge pull request #16889 from frederic34/adherent_to_member ... rename files from adherent to member	2021-03-20 20:37:44 +01:00
Laurent Destailleur	e330c0f91a	Merge pull request #16883 from aspangaro/14a28 ... Uniformize information on modules	2021-03-20 19:49:33 +01:00
Laurent Destailleur	a2b3afb511	Merge branch 'develop' into 14a22	2021-03-20 19:48:43 +01:00
Laurent Destailleur	46aa01aea0	Fix permission on export of BOM and website	2021-03-20 19:15:15 +01:00
Frédéric FRANCE	f6e7285949	rename files from adherent to member	2021-03-20 19:06:15 +01:00
Alexandre SPANGARO	3669c374c2	Uniformize information on modules	2021-03-20 13:55:43 +01:00
Laurent Destailleur	e334e83a64	Merge branch 'develop' into 14a22	2021-03-20 13:42:54 +01:00
Laurent Destailleur	d8aa5f5eab	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-20 12:43:07 +01:00
Laurent Destailleur	3d3a7bfd37	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php htdocs/projet/card.php htdocs/projet/contact.php htdocs/projet/element.php htdocs/projet/tasks.php htdocs/projet/tasks/comment.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/document.php htdocs/projet/tasks/note.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php	2021-03-20 12:42:46 +01:00
Laurent Destailleur	ee84bef3b2	Merge pull request #16828 from frederic34/membersboxfix ... fix new boxes add	2021-03-20 11:52:19 +01:00
Laurent Destailleur	25f1b82c34	Merge pull request #16859 from frederic34/patch-11 ... fix doxygen	2021-03-20 11:24:50 +01:00
Laurent Destailleur	5f0a2e648b	Merge pull request #16871 from frederic34/patch-19 ... fix doxygen	2021-03-20 11:15:48 +01:00
Laurent Destailleur	3ce4762710	Merge pull request #16873 from frederic34/patch-23 ... fix doxygen	2021-03-20 11:15:22 +01:00
Frédéric FRANCE	a8d8775328	fix doxygen	2021-03-20 10:30:26 +01:00
Frédéric FRANCE	dad7038a0d	fix doxygen	2021-03-20 10:22:34 +01:00
Frédéric FRANCE	8af1f278ae	fix doxygen	2021-03-20 10:19:03 +01:00
Frédéric FRANCE	1a2b22def4	fix doxygen	2021-03-20 09:14:52 +01:00
Alexandre SPANGARO	17d3b85ec4	Merge remote-tracking branch 'upstream/develop' into 14a27	2021-03-20 07:47:54 +01:00
Alexandre SPANGARO	00e21caa42	NEW: Add a sub table to manage accountancy on product/company	2021-03-20 07:42:16 +01:00
Laurent Destailleur	be90f5f2de	Fix id of advanced perm	2021-03-19 15:00:22 +01:00
Frédéric FRANCE	7183bfeb94	fix new boxes add	2021-03-19 09:15:35 +01:00
Florian HENRY	df4a243f18	fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature	2021-03-18 17:13:34 +01:00
Alexandre SPANGARO	18d247026d	NEW: Add a sub table to manage product/societe	2021-03-18 17:08:55 +01:00
Frédéric FRANCE	1b4b48a634	fix php8 warning when upgrade reloads modules	2021-03-18 13:18:50 +01:00
Laurent Destailleur	e366d2c379	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/admin/tools/export_files.php htdocs/compta/paiement_charge.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/cron/list.php htdocs/filefunc.inc.php test/phpunit/FilesLibTest.php	2021-03-16 14:57:04 +01:00
Laurent Destailleur	f514dec6ab	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/compta/paiement_charge.php htdocs/compta/sociales/card.php	2021-03-16 14:50:06 +01:00
Alexandre SPANGARO	6e17a588bb	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-03-16 03:26:28 +01:00
Florian HENRY	177a6bfe4f	conference or booth card and list ok	2021-03-15 20:20:53 +01:00
Florian HENRY	17c49e6ce9	ongoinf card and list	2021-03-15 18:06:23 +01:00
Laurent Destailleur	2129adf129	Add more fields to llx_oauth_token	2021-03-15 13:25:08 +01:00
Christophe Battarel	090dc4f28a	Merge branch 'develop' into pr_batch_masks	2021-03-15 11:42:33 +01:00
Laurent Destailleur	382b810ba1	Fix phpcs	2021-03-15 00:18:26 +01:00
Laurent Destailleur	5faecef0e1	Look and feel v14	2021-03-13 18:56:02 +01:00
Christophe Battarel	c339af533d	fix conflict	2021-03-12 14:15:55 +01:00
Martin Neubauer	0db65597fd	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2021-03-12 13:58:00 +01:00
Martin Neubauer	5aaeb6742c	Add UPC support to built-in barcode generator	2021-03-12 13:54:27 +01:00
Frédéric FRANCE	7a2e28497d	fix number is already used doesn't propose new code with elephant	2021-03-12 13:14:53 +01:00
Laurent Destailleur	f9918dd51f	Code comment	2021-03-12 11:50:48 +01:00
Laurent Destailleur	b7a66769bb	Merge pull request #16603 from FHenry/dev_EventOrganisation ... new: working on conference or booth object and event type #FoundationFunding	2021-03-11 21:35:39 +01:00
Christophe Battarel	229c581a25	try to fix sticker	2021-03-11 11:30:12 +01:00
Christophe Battarel	e8aacc7acf	try to fix sticker	2021-03-11 11:12:03 +01:00
Christophe Battarel	ba51c5dc70	differentiate masks for lot management and serial numbers management	2021-03-11 10:44:55 +01:00
Christophe Battarel	2c711f1a2d	add masks for batch	2021-03-11 10:02:31 +01:00
Laurent Destailleur	3007141b2b	Fix phpcs	2021-03-10 20:40:34 +01:00
Laurent Destailleur	514a9fb96a	Merge pull request #16561 from Hystepik/develop#1 ... Close #15917 : Improvement to ticket module	2021-03-10 15:49:20 +01:00
Laurent Destailleur	9ed128c6fa	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/core/class/html.formaccounting.class.php htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php htdocs/langs/en_US/errors.lang htdocs/product/card.php	2021-03-10 15:35:09 +01:00
Florian HENRY	7aec2fc02b	create task	2021-03-09 18:52:52 +01:00
Laurent Destailleur	9cb4dce485	Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing	2021-03-09 16:12:30 +01:00
Laurent Destailleur	a79a4e876d	Merge branch 'develop' into boxindex	2021-03-08 16:34:05 +01:00
lmarcouiller	b71a8c5d6f	Close #15917 : boxes on ticket index	2021-03-08 15:26:35 +01:00
lmarcouiller	8c7764ed5d	Move of 2 graph in boxes	2021-03-08 12:18:55 +01:00
Laurent Destailleur	315e66aa5a	Merge pull request #16537 from altairisfr/pr_sn_unicity ... Unique serial number management	2021-03-06 11:22:44 +01:00
Laurent Destailleur	cbd6357f45	Merge pull request #16556 from marc-dll/NEW_ldap_group_filter ... NEW: LDAP: usergroup search can be filtered	2021-03-06 11:08:24 +01:00
Laurent Destailleur	0816cb9c04	Merge pull request #16560 from code-chicken/patch-12 ... Don't discard previously collected data	2021-03-06 10:57:18 +01:00
Laurent Destailleur	3cbced439a	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/tools/listevents.php htdocs/compta/bank/line.php htdocs/compta/facture/class/facture-rec.class.php htdocs/compta/facture/class/facture.class.php htdocs/compta/paiement/cheque/card.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/date.lib.php htdocs/core/lib/ticket.lib.php htdocs/core/modules/mailings/modules_mailings.php htdocs/core/tpl/extrafields_view.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/cron/list.php htdocs/expedition/card.php htdocs/mrp/mo_list.php htdocs/product/stock/productlot_card.php htdocs/public/emailing/mailing-read.php htdocs/public/emailing/mailing-unsubscribe.php htdocs/ticket/list.php test/phpunit/FactureRecTest.php	2021-03-05 19:29:09 +01:00
Laurent Destailleur	1cd822bd75	Fix DOS attack on emailings wrappers	2021-03-05 14:54:17 +01:00
Rüdiger Hahn	18fc169cd0	Don't discard previously collected data ... For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one.	2021-03-05 11:32:03 +01:00
Marc de Lima Lucio	f731545af4	NEW: ldap: filter search on usergroups	2021-03-05 11:14:21 +01:00
Laurent Destailleur	83df996bc2	Fix english translation	2021-03-05 09:52:25 +01:00
Christophe Battarel	53cf042a57	adapt tobatch import/export	2021-03-04 15:35:53 +01:00
Frédéric FRANCE	d68de8617b	new box replace	2021-03-02 22:00:09 +01:00
Frédéric FRANCE	742c12f9d6	rename new boxes	2021-03-02 20:58:21 +01:00
Frédéric FRANCE	6cf8a46095	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-03-02 20:41:01 +01:00
Laurent Destailleur	a5bcc47d0d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-03-02 15:29:54 +01:00
Laurent Destailleur	a82ad6a02c	Fix phpcs	2021-03-02 15:29:27 +01:00
Laurent Destailleur	42329b10c9	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: build/generate_filelist_xml.php htdocs/comm/propal/card.php htdocs/commande/card.php htdocs/compta/facture/card.php htdocs/core/class/commonobject.class.php htdocs/core/lib/modulebuilder.lib.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/supplier_proposal/card.php htdocs/ticket/list.php	2021-03-02 15:27:20 +01:00
Laurent Destailleur	495c61c231	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php	2021-03-02 15:12:41 +01:00
Laurent Destailleur	5fd341bbd3	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php	2021-03-02 15:11:18 +01:00
Frédéric FRANCE	a4e25359e7	add missing rule	2021-03-01 20:37:16 +01:00
stickler-ci	d20ba5a665	Fixing style errors.	2021-03-01 15:38:15 +00:00
Gauthier PC portable 024	861b583668	FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice	2021-03-01 16:34:42 +01:00
Frédéric FRANCE	8c45137b37	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-03-01 12:55:45 +01:00
Alexandre SPANGARO	94a861c1c8	Code enhanced - Standardize field name	2021-03-01 04:07:31 +01:00
Alexandre SPANGARO	ca7958f273	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-28 07:32:23 +01:00
Laurent Destailleur	5c0ea476e1	Look and feel v14	2021-02-27 12:45:07 +01:00
Laurent Destailleur	dd72a52e8f	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balancebymonth.php htdocs/accountancy/class/accountancyexport.class.php	2021-02-26 19:23:23 +01:00
Laurent Destailleur	d5566dbf8f	FIX #16431	2021-02-26 19:18:03 +01:00
Frédéric FRANCE	96b0f3a25c	code syntax directory	2021-02-26 16:19:52 +01:00
Laurent Destailleur	5d0a0fe341	Clean code	2021-02-26 14:53:16 +01:00
Frédéric FRANCE	554e449e40	code syntax core directory	2021-02-23 22:03:23 +01:00
Florian HENRY	fa65956801	Merge branch 'develop' into dev_EventOrganisation_draft	2021-02-22 21:02:22 +01:00
Alexandre SPANGARO	7f4040e464	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-22 11:59:13 +01:00
Alexandre SPANGARO	22c936ba19	Merge remote-tracking branch 'upstream/develop' into 14a22	2021-02-22 11:28:36 +01:00
Laurent Destailleur	f99232e66e	Merge branch 'develop' into 14a21	2021-02-22 11:18:07 +01:00
Alexandre SPANGARO	267b095786	Fix import/export	2021-02-22 06:09:33 +01:00
Alexandre SPANGARO	d7993253e7	Export	2021-02-22 05:33:40 +01:00
Alexandre SPANGARO	dfb6490bb4	Fix export	2021-02-22 05:24:39 +01:00
Alexandre SPANGARO	116a491ae1	Revert "Fix export" ... This reverts commit 01e351e87e.	2021-02-22 05:23:02 +01:00
Alexandre SPANGARO	01e351e87e	Fix export	2021-02-22 05:19:48 +01:00
Florian HENRY	556ba2b369	statart card	2021-02-20 23:17:48 +01:00
Alexandre SPANGARO	3dcfe40e71	Code enhanced - Standardize field name #14697	2021-02-20 08:00:27 +01:00
Laurent Destailleur	3a073c75e7	Too verbose	2021-02-19 18:01:47 +01:00
Florian HENRY	e46d4ee75d	fix sample product import files	2021-02-19 18:01:36 +01:00
Florian HENRY	f111302a25	fix column count	2021-02-19 18:01:25 +01:00
Florian HENRY	32a360dd2a	fix sample xls file	2021-02-19 18:01:16 +01:00
Florian HENRY	527c32d79e	with new phpoffice col start at 1 not 0	2021-02-19 18:01:04 +01:00
Laurent Destailleur	db34481cf6	Merge pull request #16345 from FHenry/13_fix_column_excelfiles ... FIX : Import Excel Failed and sample import file excel missing 1st column	2021-02-19 17:56:58 +01:00
Laurent Destailleur	fd0615b3fc	Too verbose	2021-02-19 17:56:04 +01:00
Laurent Destailleur	3ab80469ae	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-19 16:11:36 +01:00
Laurent Destailleur	574c0df427	Merge pull request #16338 from aspangaro/13p5 ... Fix module asset in development	2021-02-19 16:05:35 +01:00
Florian HENRY	6fe9b589ed	fix sample product import files	2021-02-18 12:50:15 +01:00
Florian HENRY	58a1904c15	fix column count	2021-02-18 12:48:06 +01:00
Florian HENRY	de2d5c7188	fix sample xls file	2021-02-18 12:24:24 +01:00
Florian HENRY	35dc1e7d4f	with new phpoffice col start at 1 not 0	2021-02-18 11:04:37 +01:00
stickler-ci	8673f7625f	Fixing style errors.	2021-02-17 17:36:29 +00:00
Florian HENRY	fc3cc915ee	new_add_field_product_export	2021-02-17 18:29:56 +01:00
Laurent Destailleur	32370bf63d	Look and feel v14	2021-02-15 20:13:38 +01:00
Laurent Destailleur	0bac454f25	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-15 16:40:45 +01:00
Laurent Destailleur	7b383b58c6	Trans	2021-02-15 16:35:51 +01:00
Laurent Destailleur	d183a7eedf	Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage ... wip : Event Organization module - PR-1 - setup page #FoundationFunding	2021-02-15 15:59:19 +01:00
Laurent Destailleur	026259ebd7	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/ajax.lib.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/fournisseurs.php	2021-02-15 13:12:27 +01:00
Florian HENRY	02b698c128	move files to real diredtory	2021-02-14 17:09:23 +01:00
Laurent Destailleur	cd4d790d2b	Add parameters of batch into comment description	2021-02-12 17:15:23 +01:00
Laurent Destailleur	4a2cd0d509	Merge pull request #16253 from AlexisLaurier/13.0 ... contract - uses of multidir_output for file path	2021-02-11 19:00:20 +01:00
Laurent Destailleur	1b11d9d0e9	FIX payment term label on PDF	2021-02-11 17:48:53 +01:00
Alexis LAURIER	468f40743d	contract - use multidir_output	2021-02-10 13:18:55 +01:00
Philippe GRAND	66b06405d9	standardization, internationalisation	2021-02-09 14:20:10 +01:00
Philippe GRAND	44f2269764	standardization, internationalisation	2021-02-09 14:19:17 +01:00
Philippe GRAND	8fd7d3e586	standardization, internationalisation	2021-02-09 14:18:27 +01:00
Philippe GRAND	182563329f	standardization, internationalisation	2021-02-09 14:17:38 +01:00
Philippe GRAND	635260e59f	standardization, internationalisation	2021-02-09 14:16:47 +01:00
Philippe GRAND	663108d239	standardization, internationalisation	2021-02-09 14:16:17 +01:00
Philippe GRAND	8d9ae906c8	standardization, internationalisation	2021-02-09 14:15:45 +01:00
Philippe GRAND	e1bf624e45	standardization, internationalisation	2021-02-09 14:15:14 +01:00
Philippe GRAND	a2b5a3190d	standardization, internationalisation	2021-02-09 14:14:40 +01:00
Philippe GRAND	c1bbd076df	standardization, internationalisation	2021-02-09 14:13:49 +01:00
Philippe GRAND	1317b5cfac	standardization, internationalisation	2021-02-09 14:13:12 +01:00
Philippe GRAND	3e9a6818f2	standardization, internationalisation	2021-02-09 14:12:27 +01:00
Philippe GRAND	f47d5e6a69	standardization, internationalisation	2021-02-09 14:10:07 +01:00
Philippe GRAND	ef3e7fa65a	standardization, internationalisation	2021-02-09 14:09:35 +01:00
Philippe GRAND	2fc6d76029	standardization, internationalisation	2021-02-09 14:09:02 +01:00
Philippe GRAND	ee50cee862	standardization, internationalisation	2021-02-09 14:07:58 +01:00
Philippe GRAND	a50ecdd1aa	standardization, internationalisation	2021-02-09 14:06:55 +01:00
Philippe GRAND	fff2c1fbac	standardization, internationalisation	2021-02-09 14:06:22 +01:00
Philippe GRAND	4840fa8214	standardization, internationalisation	2021-02-09 14:05:19 +01:00
Philippe GRAND	858ebf5aaf	standardization, internationalisation	2021-02-09 14:04:38 +01:00
Philippe GRAND	a8b72c98a2	standardization, internationalisation	2021-02-09 14:03:13 +01:00
Philippe GRAND	ff0c105207	standardization, internationalisation	2021-02-09 14:01:50 +01:00
Philippe GRAND	55dd15cbf6	standardization, internationalisation	2021-02-09 14:01:10 +01:00
Philippe GRAND	11053fe0ed	standardization, internationalisation	2021-02-09 14:00:26 +01:00
Philippe GRAND	39c3bcd265	standardization, internationalisation	2021-02-09 13:58:26 +01:00
Laurent Destailleur	3b0268424b	Merge pull request #16227 from grandoc/new_branch_08_02_2021 ... Save the name of generated file as the main doc when generating a doc…	2021-02-09 13:24:02 +01:00
Laurent Destailleur	401b4f641d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php	2021-02-08 22:13:50 +01:00
Philippe GRAND	f27dd77cb6	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:47:31 +01:00
Philippe GRAND	62d6666927	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:46:09 +01:00
Philippe GRAND	d9eb727c0f	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:44:46 +01:00
Philippe GRAND	f80da203e0	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:43:36 +01:00
Philippe GRAND	6b0bb90ab2	Save the name of generated file as the main doc when generating a doc with this template	2021-02-08 19:40:27 +01:00
Laurent Destailleur	c33fb4badc	Merge pull request #16219 from FHenry/dev_fix_continue ... Add extrafileld value into return ajax	2021-02-08 16:57:03 +01:00
Florian HENRY	cb152b22df	fix ajax	2021-02-08 15:47:37 +01:00
Laurent Destailleur	5c64173bfa	Merge pull request #16209 from frederic34/barcodepicto ... add barcode picto in left menu	2021-02-08 15:04:56 +01:00
Laurent Destailleur	026e454825	Merge pull request #16208 from frederic34/ecmpicto ... add ecm picto in left menu	2021-02-08 15:04:42 +01:00
Alexandre SPANGARO	b8ea96ba57	Fix module asset in development	2021-02-08 05:39:07 +01:00
Frédéric FRANCE	e1a22b7209	add blockedlog picto in left menu	2021-02-07 22:18:34 +01:00
Frédéric FRANCE	3c8ddf917f	add barcode picto in left menu	2021-02-07 22:15:20 +01:00
Frédéric FRANCE	b43dfe1139	add ecm picto in left menu	2021-02-07 22:04:46 +01:00
Laurent Destailleur	fc30b91960	Fix warning	2021-02-07 21:56:57 +01:00
Laurent Destailleur	92e67b2c54	Merge pull request #16195 from frederic34/morepictomodule ... add more picto for module	2021-02-07 20:01:36 +01:00
Laurent Destailleur	ec394a93f6	Merge pull request #16191 from grandoc/develop ... fix typo	2021-02-07 19:59:54 +01:00
Frédéric FRANCE	b96e405717	add picto member	2021-02-06 17:18:00 +01:00
Frédéric FRANCE	3bcf795d55	add more picto for module	2021-02-06 14:44:08 +01:00
Frédéric FRANCE	eaaefe1382	5.5 to 5.6	2021-02-06 14:12:22 +01:00
Frédéric FRANCE	7860ffa28e	update phpmin version	2021-02-06 13:48:31 +01:00
Philippe GRAND	ce7a3ae2f0	fix typo	2021-02-06 13:11:58 +01:00
Philippe GRAND	04373fb531	fix typo	2021-02-06 13:11:08 +01:00
Philippe GRAND	bf211c6423	fix typo	2021-02-06 13:10:00 +01:00
Florian HENRY	fcb5b3900d	FIX: #16189, fix download/see check deposit PDF	2021-02-06 12:39:40 +01:00
Laurent Destailleur	3dedd81f37	Same width for all picto of menu	2021-02-06 11:56:27 +01:00
Laurent Destailleur	c1eba5a885	Merge pull request #16188 from frederic34/menuprefix ... modules can add prefix for menu	2021-02-06 11:41:46 +01:00
Frédéric FRANCE	b487644cb7	sample use for margin module	2021-02-06 10:52:03 +01:00
Frédéric FRANCE	df67de08b1	modules can add prefix for menu	2021-02-06 10:16:07 +01:00
Laurent Destailleur	a2a2127953	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-06 01:17:16 +01:00
Laurent Destailleur	fd3354142b	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/viewcat.php	2021-02-06 01:17:05 +01:00
Philippe GRAND	47ca631193	Save the name of generated file as the main doc when generating a doc with this template and missing declarations	2021-02-05 18:09:36 +01:00
Philippe GRAND	5b5ea075e7	Save the name of generated file as the main doc when generating a doc with this template and missing declarations	2021-02-05 18:07:02 +01:00
Philippe GRAND	5856f9e5cb	Save the name of generated file as the main doc when generating a doc with this template and missing declarations	2021-02-05 18:04:46 +01:00
Philippe GRAND	4170332aee	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:58:54 +01:00
Philippe GRAND	0f196d7f19	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:56:57 +01:00
Philippe GRAND	e638c238c6	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:54:51 +01:00
Philippe GRAND	7c13428456	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:53:34 +01:00
Philippe GRAND	c03da95acb	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:52:12 +01:00
Philippe GRAND	d85c8c44fc	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:49:43 +01:00
Philippe GRAND	998c5b2ec3	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:42:33 +01:00
Philippe GRAND	c96d36cad3	Save the name of generated file as the main doc when generating a doc with this template	2021-02-05 17:39:22 +01:00
Laurent Destailleur	482ad20a4d	Log debug before archive logs	2021-02-05 16:14:42 +01:00
Laurent Destailleur	ac83cea83a	Fix avoid to run import twice by clicking on tab step6 ... Fix timeout for real import step	2021-02-05 14:34:04 +01:00
Laurent Destailleur	f301635681	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formmail.class.php	2021-02-03 21:02:32 +01:00
Laurent Destailleur	348fd0fcb5	FIX #16160	2021-02-03 19:36:10 +01:00
Laurent Destailleur	217989d0e2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-02 15:37:40 +01:00
Laurent Destailleur	6b32fd33fd	Fix export with excell	2021-02-02 13:33:44 +01:00
Laurent Destailleur	2e9656a5b2	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formactions.class.php htdocs/filefunc.inc.php	2021-02-02 03:26:20 +01:00
Laurent Destailleur	f5df3b1d69	Clean code to try to fix #16123	2021-02-02 01:30:23 +01:00
Laurent Destailleur	daf88944f8	FIX #16118 Timezone problem on some fields	2021-02-02 00:19:41 +01:00
Laurent Destailleur	6fe5c2f599	Merge pull request #16109 from grandoc/new_branch_30_01_2021 ... missing declaration	2021-01-30 13:08:56 +01:00
Philippe GRAND	e584792382	missing declaration	2021-01-30 12:57:06 +01:00
Laurent Destailleur	1063b97c22	Close #16099 Close #16098	2021-01-30 12:55:38 +01:00
Philippe GRAND	0f19a11ebe	missing declaration	2021-01-30 12:54:10 +01:00
Laurent Destailleur	06b0b0ac66	Merge pull request #16102 from bb2a/bug_PROPOSALS_WITH_PICTURE ... Bug Photo in propal	2021-01-30 12:51:33 +01:00
Anthony Berton	e48fc6c3d0	Update pdf_cyan.modules.php	2021-01-29 13:51:06 +01:00
Anthony Berton	77b0075d71	Update pdf_azur.modules.php	2021-01-29 10:50:11 +01:00
Anthony Berton	720a11877d	Update pdf_azur.modules.php	2021-01-29 10:48:58 +01:00
stickler-ci	400243a157	Fixing style errors.	2021-01-29 09:41:05 +00:00
Anthony Berton	fcf72d5e50	Update pdf_azur.modules.php	2021-01-29 10:35:48 +01:00
Laurent Destailleur	a4c0459c1e	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/list.php	2021-01-27 21:09:01 +01:00
Frédéric FRANCE	7cd698aff9	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-26 20:19:49 +01:00
Alexandre SPANGARO	94d4f2da8e	Missing language key & error translation	2021-01-26 05:14:01 +01:00
Laurent Destailleur	b4be97ec15	Draft code	2021-01-25 18:59:04 +01:00
Laurent Destailleur	599d69b07c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-22 13:40:08 +01:00
Laurent Destailleur	e1b6f33894	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/card.php htdocs/contact/class/contact.class.php htdocs/langs/fr_FR/stocks.lang htdocs/modulebuilder/template/myobject_list.php	2021-01-22 13:40:00 +01:00
Laurent Destailleur	7982cab526	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/modules/contract/doc/pdf_strato.modules.php htdocs/ticket/card.php	2021-01-21 18:34:55 +01:00
Laurent Destailleur	8e5b971c49	Merge pull request #15918 from zuiko/patch-1 ... Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.	2021-01-21 13:33:47 +01:00
BlackMirror	640cf50b7f	[FM] Fix 12.0 - duplicate label, probably mistaken for ref	2021-01-20 15:20:50 +01:00
Laurent Destailleur	0917b37bb9	FIX #15966 #15967	2021-01-19 15:20:35 +01:00
stickler-ci	0cdd9f8640	Fixing style errors.	2021-01-19 10:43:03 +00:00
zuiko	21fac1ff7a	Update mod_barcode_product_standard.php ... Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function. #15918 ok with @eldy Avoid sql call if no joker at the end of mask Treat EAN13 in a more evolutive code form to prepare needs for other barcodes with key	2021-01-19 11:40:53 +01:00
Frédéric FRANCE	c8d1410e33	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-16 21:06:12 +01:00
Frédéric FRANCE	871f762546	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-16 13:58:27 +01:00
Laurent Destailleur	7f04307adf	Merge branch 'develop' into develop#2	2021-01-13 17:40:21 +01:00
Laurent Destailleur	93a2edd8d9	Fix property not used	2021-01-13 12:21:26 +01:00
Laurent Destailleur	3bed2c91c7	Fix version	2021-01-13 12:20:32 +01:00
stickler-ci	432d45b289	Fixing style errors.	2021-01-13 11:19:39 +00:00
Laurent Destailleur	1499998a99	Debug	2021-01-13 12:17:45 +01:00
Frédéric FRANCE	e2c57584b7	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-12 23:47:24 +01:00
zuiko	f718a396d5	Update mod_barcode_product_standard.php ... $out .= $obj->libelle; //take the libelle corresponding to the type rowid in the database Take the libelle instead the code for the litteral value of the barcode type rowid.	2021-01-12 21:59:09 +01:00
zuiko	364158c35b	Update mod_barcode_product_standard.php ... Blank line after comment removed...	2021-01-12 21:24:55 +01:00
stickler-ci	14e3be630c	Fixing style errors.	2021-01-12 20:16:34 +00:00
zuiko	ff06798660	Update mod_barcode_product_standard.php ... More evolving coding by testing the type of barcode in literal form. Does not change deeply the #15918 correction principle in order to fix bug #15633.	2021-01-12 21:14:43 +01:00
Laurent Destailleur	c2187b2ff1	Merge branch 'develop' into develop_new_workstation	2021-01-11 17:59:13 +01:00
Laurent Destailleur	df3034d13a	Merge branch 'develop' into patch-1	2021-01-11 17:15:46 +01:00
stickler-ci	f5fa7928ca	Fixing style errors.	2021-01-11 15:29:33 +00:00
Laurent Destailleur	5ee97dfd4a	Update mod_barcode_product_standard.php	2021-01-11 16:27:37 +01:00
Gauthier PC portable 024	8dfb088fc5	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation	2021-01-11 10:34:38 +01:00
zuiko	bcff65c3d3	Update mod_barcode_product_standard.php ... get barcode type configuration for products only if $type not set	2021-01-09 01:01:14 +01:00
Florian HENRY	8adfe54949	bulk email management	2021-01-07 17:33:57 +01:00
Laurent Destailleur	73e69f8389	Update mod_barcode_product_standard.php	2021-01-07 10:23:38 +01:00
stickler-ci	07ddb1fd2b	Fixing style errors.	2021-01-06 23:17:16 +00:00
zuiko	4e95108eb0	Update mod_barcode_product_standard.php ... Fix #15633	2021-01-06 23:33:04 +01:00
Frédéric FRANCE	1e8362575a	Merge remote-tracking branch 'upstream/develop' into boxindex	2021-01-06 21:05:59 +01:00
Laurent Destailleur	07ca12b26d	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-01-06 20:48:23 +01:00
Laurent Destailleur	71278b173e	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-06 20:28:33 +01:00
Laurent Destailleur	654cf2d990	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/functions.lib.php	2021-01-06 20:27:46 +01:00
stickler-ci	ca557cfacd	Fixing style errors.	2021-01-06 13:22:35 +00:00
quentin	e44b14364a	FIX useless tracking number displayed on pdf if empty	2021-01-06 14:17:06 +01:00
lmarcouiller	6aa2241617	Merge remote-tracking branch 'doligithub/develop' into develop#2	2021-01-05 18:07:34 +01:00
Frédéric FRANCE	dc6c1b8d3b	boxes	2021-01-02 22:12:19 +01:00
Frédéric FRANCE	96fbee5eaf	transform into box	2021-01-02 21:01:47 +01:00
Regis Houssin	acabb045fb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0	2020-12-29 17:12:18 +01:00
Regis Houssin	325c2b03f8	FIX step by step	2020-12-29 17:02:35 +01:00
Regis Houssin	20cd9cbbc7	FIX avoid warning php 8.0	2020-12-29 16:25:29 +01:00
Laurent Destailleur	af41c06822	Fix warnings	2020-12-29 04:27:16 +01:00
Laurent Destailleur	7b93c34c0f	Fix phpunits	2020-12-29 03:48:11 +01:00
Laurent Destailleur	4ec78d029b	Fix warning	2020-12-27 19:21:37 +01:00
Laurent Destailleur	9007e7be2a	Fix sql for postgresql	2020-12-23 16:13:45 +01:00
Laurent Destailleur	70df6130b5	Fix SQL to export categories of contact ... Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 Conflicts: htdocs/product/class/product.class.php	2020-12-23 15:45:33 +01:00
Gauthier PC portable 024	5116337e0b	FIX : stickler feedbacks	2020-12-21 13:29:44 +01:00
Gauthier PC portable 024	7b739920a2	NEW : Workstations management	2020-12-21 12:28:45 +01:00
Laurent Destailleur	361f13154b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions2.lib.php htdocs/fourn/card.php htdocs/margin/tabs/thirdpartyMargins.php htdocs/societe/card.php htdocs/societe/note.php htdocs/societe/notify/card.php htdocs/societe/societecontact.php htdocs/ticket/list.php	2020-12-20 14:31:54 +01:00
Laurent Destailleur	8c87050703	FIX Check of customer/vendor code fails in some cases	2020-12-20 13:54:02 +01:00
Laurent Destailleur	832db82fce	Fix warnings	2020-12-18 14:40:45 +01:00
Alexandre SPANGARO	440c9e4840	Fix module Intracomm	2020-12-17 06:02:28 +01:00
Laurent Destailleur	9c759e91f0	Fix debug management of docs in ticket module	2020-12-16 19:01:26 +01:00
Laurent Destailleur	82710e54a8	Fix get custom odt templates	2020-12-16 18:10:40 +01:00
Laurent Destailleur	e7dda7bb4f	Move help into tooltip help section	2020-12-16 15:46:54 +01:00
Stephane Lesage	7853e77d3f	Export/Import categories missing fields and clean	2020-12-15 19:53:47 +01:00
Laurent Destailleur	812fd22629	Merge branch 'develop' into develop#2	2020-12-15 14:09:29 +01:00
Laurent Destailleur	a2bd920371	Fix translation of units	2020-12-15 11:39:18 +01:00
Laurent Destailleur	55deccf364	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-12-14 23:20:21 +01:00
Laurent Destailleur	098f51413f	Fix translation	2020-12-14 20:33:27 +01:00
Laurent Destailleur	5f9b53004b	Fix warning	2020-12-14 17:40:40 +01:00
Laurent Destailleur	acb73966f7	Clean code. Removed phpexcel library.	2020-12-13 16:27:44 +01:00
Laurent Destailleur	3521a736fc	Fix warnings	2020-12-12 19:49:13 +01:00
Laurent Destailleur	33bb1919f0	Merge branch 'develop' into develop#3	2020-12-12 12:23:33 +01:00
Laurent Destailleur	11eb48b60a	Merge pull request #15737 from frederic34/pdfBuildThirdpartyName ... thirdparty need to be object	2020-12-12 12:16:31 +01:00
Frédéric FRANCE	479d709a96	fix warning	2020-12-12 09:39:54 +01:00
stickler-ci	87038f953a	Fixing style errors.	2020-12-11 19:58:05 +00:00
Frédéric FRANCE	9b2c989906	thirdparty need to be object	2020-12-11 20:57:02 +01:00
lmarcouiller	a5cf177025	Close #15729 : first push	2020-12-11 15:22:29 +01:00
Stephane Lesage	bcf4f65cc9	Fix & sync import/export entity icons/labels translation	2020-12-10 14:15:33 +01:00
Hystepik	3d674abfae	Merge branch 'develop' into develop#2	2020-12-08 09:01:20 +01:00
Stephane Lesage	08ccc11f9e	Export warehouses	2020-12-08 00:50:27 +01:00
Laurent Destailleur	86e1082138	Merge pull request #15644 from Hystepik/develop#1 ... New #8172 : PHPExcel replaced by PHPSpreadSheet	2020-12-07 23:06:21 +01:00
Laurent Destailleur	f21a4e8aed	Merge branch 'develop' into develop#3	2020-12-07 22:46:36 +01:00
Laurent Destailleur	4f826fae26	Fix warnings	2020-12-07 12:18:53 +01:00
Laurent Destailleur	0361d3afde	Debug v13	2020-12-07 11:42:35 +01:00
Hystepik	2ac98d06f5	Merge branch 'develop' into develop#3	2020-12-07 09:03:59 +01:00
Laurent Destailleur	d1c66059cd	Add missing tag order_ref and order_ref_customer on shipments for ODT ... generation. Conflicts: htdocs/core/class/commondocgenerator.class.php	2020-12-06 19:03:46 +01:00
Laurent Destailleur	025cbe8557	Add missing tag order_ref and order_ref_customer on shipments for ODT ... generation.	2020-12-06 19:01:09 +01:00
Laurent Destailleur	c31cf08431	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modCategorie.class.php	2020-12-04 21:55:57 +01:00
Laurent Destailleur	2b267cf8e4	Fix warnings	2020-12-04 20:06:55 +01:00
Laurent Destailleur	3770eef8dc	Fix can import all categories	2020-12-04 19:51:14 +01:00
stickler-ci	6a2d842d3e	Fixing style errors.	2020-12-04 13:47:55 +00:00
lmarcouiller	9c191cda43	New #8172 : PHPExcel replace by PHPSpreadSheet	2020-12-04 14:28:09 +01:00
Laurent Destailleur	1ec3d4cfdf	CSS	2020-12-03 13:19:35 +01:00
Hystepik	4830f4a3b4	Merge branch 'develop' into develop#2	2020-12-03 11:05:00 +01:00
Hystepik	ecb5a3b028	Merge branch 'develop' into develop#3	2020-12-03 10:12:19 +01:00
Laurent Destailleur	46171a6ec8	Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT	2020-12-02 21:27:15 +01:00
Laurent Destailleur	bc1dc1e9f0	FIX #15590 manually	2020-12-02 19:34:04 +01:00
lmarcouiller	c7a31b2458	new widget funnel of prospection	2020-12-02 14:42:56 +01:00
Laurent Destailleur	c8274f13eb	Merge pull request #15582 from Hystepik/develop ... Close #15307 New Widget : Encours dépassé	2020-12-02 14:01:50 +01:00
lmarcouiller	6b5125fed0	dev widget state_board, add in user class and clean index	2020-12-01 14:50:12 +01:00
Scrutinizer Auto-Fixer	6df4954b20	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-12-01 01:41:19 +00:00
Laurent Destailleur	fc91e70e47	Update modFacture.class.php	2020-11-30 18:37:07 +01:00
Laurent Destailleur	00ad6df395	Fight against $_POST	2020-11-30 14:47:07 +01:00
lmarcouiller	00dca7ff9b	NEW : Encours dépassé #15307	2020-11-30 13:01:45 +01:00
Laurent Destailleur	8eacbaaf5f	Merge pull request #15570 from frederic34/strike ... simplify function	2020-11-29 19:10:06 +01:00
Laurent Destailleur	5ad1bb5b20	Merge pull request #15571 from frederic34/patch-14 ... Update mod_codecompta_aquarium.php	2020-11-29 19:08:29 +01:00
Laurent Destailleur	beafcc7853	Fix warning	2020-11-29 16:06:03 +01:00
Frédéric FRANCE	83c60d725a	Update mod_codecompta_aquarium.php	2020-11-28 23:45:32 +01:00
Frédéric FRANCE	3a041eed44	simplify function	2020-11-28 23:42:48 +01:00
Frédéric FRANCE	11a978ca08	simplify function	2020-11-28 23:41:44 +01:00
Frédéric FRANCE	eea9382b57	Update mod_codecompta_aquarium.php	2020-11-28 23:35:27 +01:00
Frédéric FRANCE	f9ef0f4d69	Update mod_codecompta_digitaria.php	2020-11-28 23:33:58 +01:00
Frédéric FRANCE	2f701f4889	Update mod_codecompta_aquarium.php	2020-11-28 23:24:13 +01:00
Frédéric FRANCE	fb871daf14	simplify function	2020-11-28 23:04:05 +01:00
Laurent Destailleur	147a12a922	Fix warning	2020-11-28 15:02:05 +01:00
Laurent Destailleur	df461d319e	Fix warning	2020-11-28 02:12:07 +01:00
Laurent Destailleur	574919de52	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/accountancy/bookkeeping/balance.php htdocs/adherents/class/subscription.class.php htdocs/compta/bank/categ.php htdocs/compta/facture/class/facture.class.php htdocs/core/boxes/box_task.php htdocs/core/class/commondocgenerator.class.php htdocs/core/class/interfaces.class.php htdocs/core/lib/project.lib.php htdocs/core/modules/modCategorie.class.php htdocs/expensereport/class/expensereport.class.php htdocs/fichinter/class/fichinterrec.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/install/repair.php htdocs/main.inc.php htdocs/product/price.php htdocs/projet/tasks/time.php htdocs/reception/card.php	2020-11-27 15:45:12 +01:00
Laurent Destailleur	4a5cdd0092	Several fixes in export and repair tool	2020-11-27 15:27:35 +01:00
Laurent Destailleur	250b42f60a	Fix phpcs	2020-11-27 00:37:36 +01:00
Laurent Destailleur	9aa657bc35	Debug v13	2020-11-26 18:48:51 +01:00
Laurent Destailleur	5d0a54c0de	Fix var not defined	2020-11-26 12:07:01 +01:00
Laurent Destailleur	74605cec12	Fix warning	2020-11-25 18:07:52 +01:00
Laurent Destailleur	d17ecbeccd	Fix #15438	2020-11-24 20:56:11 +01:00
Laurent Destailleur	bd0236edeb	Fix #15438	2020-11-24 20:53:42 +01:00
Laurent Destailleur	cf82581a2a	Move module to experimental	2020-11-24 14:06:02 +01:00
Laurent Destailleur	af2eabb24d	Fix warning	2020-11-22 15:06:53 +01:00
Laurent Destailleur	3d2da45f84	Remove warning	2020-11-22 11:36:07 +01:00
Laurent Destailleur	3534555909	Fix setup of scheduled jobs	2020-11-21 14:14:53 +01:00
Laurent Destailleur	95460e6372	Merge pull request #15422 from frederic34/patch-10 ... add optional tag which list all other tags in odt substitutions	2020-11-18 12:44:25 +01:00
Frédéric FRANCE	bf390ceb4d	Update doc_generic_member_odt.class.php	2020-11-17 11:56:11 +01:00
Frédéric FRANCE	fcfd630f84	Update doc_generic_user_odt.modules.php	2020-11-17 11:55:05 +01:00
Laurent Destailleur	6c42535eb2	Maxi debug v13	2020-11-16 12:20:18 +01:00
Frédéric FRANCE	d114c56672	add a tag which list all other tags in odt user	2020-11-15 23:49:16 +01:00
Laurent Destailleur	8e87729040	Merge pull request #15416 from frederic34/patch-25 ... doxygen	2020-11-15 17:06:34 +01:00
Laurent Destailleur	acfee5a0e1	Merge pull request #15415 from frederic34/patch-24 ... doxygen	2020-11-15 17:05:55 +01:00
Laurent Destailleur	041de0843a	Merge pull request #15414 from frederic34/patch-23 ... doxygen	2020-11-15 17:05:39 +01:00
Laurent Destailleur	27f3287ac4	Merge pull request #15413 from frederic34/patch-22 ... doxygen	2020-11-15 17:05:22 +01:00
Laurent Destailleur	c4094357c2	Merge pull request #15412 from frederic34/patch-21 ... doxygen	2020-11-15 17:05:03 +01:00
Laurent Destailleur	a1bdce06f5	Merge pull request #15411 from frederic34/patch-20 ... doxygen	2020-11-15 17:04:45 +01:00
Laurent Destailleur	db357da9a7	Merge pull request #15410 from frederic34/patch-19 ... doxygen	2020-11-15 17:04:17 +01:00
Laurent Destailleur	31c73403c0	Update pdf_eratosthene.modules.php	2020-11-15 17:04:07 +01:00
Laurent Destailleur	d0cf558604	Merge pull request #15409 from frederic34/patch-18 ... doxygen	2020-11-15 17:02:54 +01:00
Laurent Destailleur	ed6204183d	Merge pull request #15408 from frederic34/patch-17 ... doxygen	2020-11-15 17:00:54 +01:00
Laurent Destailleur	011e786996	Update pdf_sepamandate.modules.php	2020-11-15 17:00:37 +01:00
Laurent Destailleur	0db18136a5	Merge pull request #15407 from frederic34/patch-15 ... doxygen	2020-11-15 16:59:47 +01:00
Laurent Destailleur	c0ce41dc0d	Merge pull request #15406 from frederic34/patch-14 ... doxygen	2020-11-15 16:59:25 +01:00
Laurent Destailleur	5c15162c40	Fix warning	2020-11-15 15:10:15 +01:00
Frédéric FRANCE	41906fb5ee	Update pdf_cyan.modules.php	2020-11-14 22:15:05 +01:00
Frédéric FRANCE	92c28efe42	doxygen	2020-11-14 22:12:05 +01:00
Frédéric FRANCE	da0bdd0907	doxygen	2020-11-14 22:04:14 +01:00
Frédéric FRANCE	b994d0d84b	doxygen	2020-11-14 21:26:18 +01:00
Frédéric FRANCE	518ad097d0	Update pdf_sponge.modules.php	2020-11-14 21:21:58 +01:00
Frédéric FRANCE	9075e30a94	doxygen	2020-11-14 21:19:28 +01:00
Frédéric FRANCE	d6afdda8fe	Update pdf_rouget.modules.php	2020-11-14 21:09:02 +01:00
Frédéric FRANCE	0b097c74fa	Update pdf_merou.modules.php	2020-11-14 21:07:34 +01:00
Frédéric FRANCE	84ea018d81	doxygen	2020-11-14 21:05:53 +01:00
Frédéric FRANCE	c12c0a0d2f	Update pdf_strato.modules.php	2020-11-14 20:50:15 +01:00
Frédéric FRANCE	9c258b5dd4	Update pdf_eratosthene.modules.php	2020-11-14 20:46:49 +01:00
Frédéric FRANCE	e1c148a994	doxygen	2020-11-14 20:44:44 +01:00
Frédéric FRANCE	1db8afb4a9	doxygen	2020-11-14 20:40:17 +01:00
Frédéric FRANCE	a2fc7ce8c9	doxygen	2020-11-14 20:37:54 +01:00
Frédéric FRANCE	50e3fffbd8	doxygen	2020-11-14 20:35:52 +01:00
Frédéric FRANCE	d5f93e8c35	Update pdf_typhon.modules.php	2020-11-14 20:26:13 +01:00
Frédéric FRANCE	61d72b53be	doxygen	2020-11-14 20:24:26 +01:00
Frédéric FRANCE	30f89b1216	doxygen	2020-11-14 18:37:05 +01:00
Frédéric FRANCE	0a5e041775	Merge remote-tracking branch 'upstream/develop' into odtformembers	2020-11-14 00:56:21 +01:00
Frédéric FRANCE	4ca3c0aa95	Add odt for members	2020-11-14 00:48:13 +01:00
Laurent Destailleur	8970fbca79	Merge pull request #15397 from frederic34/patch-19 ... can upload odt model for user	2020-11-14 00:39:44 +01:00
Frédéric FRANCE	70f1ed53f8	can upload odt model for user	2020-11-13 22:51:10 +01:00
Frédéric FRANCE	2f3ff6628d	The variable $obj does not seem to be defined ... The variable $obj does not seem to be defined for all execution paths leading up to this point.	2020-11-13 20:51:48 +01:00
Laurent Destailleur	86481d16d0	Clean code	2020-11-13 15:02:49 +01:00
Laurent Destailleur	6d4d3c618d	FIX #15369 and standardize permission "readall"	2020-11-13 09:55:53 +01:00
Laurent Destailleur	754a9778ea	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/list.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/modUser.class.php	2020-11-12 14:17:10 +01:00
Laurent Destailleur	0764cb2abd	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-11-12 14:13:19 +01:00
Laurent Destailleur	02158928cc	FIX #15365 export of extrafields for user and resources	2020-11-12 14:11:59 +01:00
Laurent Destailleur	a168c3fbb1	Remove warnings	2020-11-12 12:33:29 +01:00
Laurent Destailleur	576e1e1de8	Fix pdf crabe	2020-11-11 23:42:24 +01:00
andreubisquerra	d6b5168d12	NEW Receipt Printer module as stable ... I want to propose in the canceled devcamp to set this module as stable. I will present the new TakePOS connector in the devcamp too, and requires this module. What a pity, the devcamp was canceled.	2020-11-10 22:19:46 +01:00
quentin	fb27c98f9c	FIX : handling $heightforinfotot when he's superior to a page height	2020-11-10 09:40:45 +01:00
Scrutinizer Auto-Fixer	f6e3f58fcb	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-11-09 14:18:56 +00:00
Laurent Destailleur	451432d73c	Merge pull request #15139 from dvdwalker/develop ... Update to allow importing extrafileds on Product Supplier Price	2020-11-08 12:40:53 +01:00
Laurent Destailleur	ea4ad24ac5	Fix doc	2020-11-07 02:14:17 +01:00
Laurent Destailleur	1d9aacc7da	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commoninvoice.class.php htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php	2020-11-05 09:51:28 +01:00
jcp	bae05bbe7d	Fix computed import	2020-11-03 18:43:03 +01:00
Frédéric FRANCE	0299d0c9cc	doxygen	2020-11-02 10:50:54 +01:00
Laurent Destailleur	1c15ec9dec	Merge pull request #15258 from frederic34/patch-13 ... Update mod_codeclient_elephant.php	2020-11-02 09:32:08 +01:00
Frédéric FRANCE	802efbe6a7	Update mod_codeclient_elephant.php	2020-11-01 23:30:15 +01:00
Frédéric FRANCE	1ccb5cb2d7	Update mod_codeclient_elephant.php	2020-11-01 23:09:30 +01:00
Frédéric FRANCE	c973faf9a9	Update mod_codeclient_elephant.php	2020-11-01 23:06:35 +01:00
Frédéric FRANCE	cd61e5b0b2	Update modules_societe.class.php	2020-11-01 22:44:09 +01:00
Laurent Destailleur	d6b6cacbe5	Removed warning	2020-11-01 20:02:12 +01:00
Laurent Destailleur	e0ed89c514	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/compta/facture/card.php htdocs/contrat/class/contrat.class.php htdocs/core/actions_addupdatedelete.inc.php htdocs/product/class/product.class.php htdocs/product/price.php htdocs/projet/tasks/time.php	2020-11-01 17:58:41 +01:00
Laurent Destailleur	72160deef7	FIX #14979	2020-11-01 17:01:26 +01:00
Scrutinizer Auto-Fixer	ab25e047c0	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer	7f52920716	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-31 13:32:18 +00:00
dvdwalker	d4d7e85805	Update modProduct.class.php	2020-10-30 08:19:28 -03:00
Laurent Destailleur	ec0c8e0c79	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/lib/security2.lib.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/tpl/advtarget.tpl.php	2020-10-30 03:35:40 +01:00
Laurent Destailleur	263b679af4	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/tpl/advtarget.tpl.php	2020-10-30 03:31:04 +01:00
Scrutinizer Auto-Fixer	208740c9c4	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-28 16:49:52 +00:00
Scrutinizer Auto-Fixer	a2a9c51e50	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-27 18:46:07 +00:00
Laurent Destailleur	ec6c735d89	Clean code	2020-10-27 19:44:15 +01:00
Laurent Destailleur	f7de9333bb	Doxygen	2020-10-27 19:29:42 +01:00
Alfredo Altamirano	1b82b6af4d	FIX #15111 Fix special characters output in PDF	2020-10-25 22:17:02 -06:00
Laurent Destailleur	8578a7cd7c	Fix regressions	2020-10-25 17:02:25 +01:00
Laurent Destailleur	cd4d738a56	Merge branch 'translateModLivraison2ModDelivery' of ... https://github.com/orebd/dolibarr into develop # Conflicts: # htdocs/install/mysql/migration/12.0.0-13.0.0.sql	2020-10-25 16:01:18 +01:00
Laurent Destailleur	4d9c8e2225	Merge pull request #15124 from frederic34/retrieve ... retrieve the spelling	2020-10-25 14:48:51 +01:00
dvdwalker	8b91b5527a	Update to allow importing extrafileds on Product Supplier Price	2020-10-24 11:13:44 -03:00
Frédéric FRANCE	96e80f116a	fix unknown property db	2020-10-23 22:06:23 +02:00
Frédéric FRANCE	ae3228b9e0	retrieve the spelling 🎉	2020-10-23 20:08:35 +02:00
Frédéric FRANCE	9a470fa42d	replace deprecated	2020-10-22 22:50:03 +02:00
Laurent Destailleur	a83131276d	Merge pull request #15079 from FHenry/dev_addtranslationkeyPDFInvoiceSituation ... new: add PDFInvoiceSituation translation key for PDF title	2020-10-22 15:49:25 +02:00
Laurent Destailleur	bf6ec35478	Merge pull request #15095 from joseplluis/patch-9 ... FIX input name in MRP mask const	2020-10-22 15:45:36 +02:00
Josep Lluís	1221cc854d	FIX input name in MRP mask const ... input name in MRP mask const was wrong	2020-10-22 15:23:45 +02:00
Frédéric FRANCE	f500076247	remove warning	2020-10-21 21:21:30 +02:00
Frédéric FRANCE	4873794dc0	doxygen	2020-10-21 21:08:33 +02:00
Frédéric FRANCE	06325f9422	doxygen	2020-10-21 21:00:50 +02:00
Frédéric FRANCE	81f6a7abb6	can add a driver for printing in module	2020-10-21 20:18:06 +02:00
Florian HENRY	d347af385b	new: add PDFInvoiceSituation translation key for PDF title	2020-10-21 13:47:40 +02:00
Laurent Destailleur	e3552e7e02	Clean code	2020-10-16 20:17:54 +02:00
jove@bisquerra.com	f90b236e0f	Change the tag char for security reasons in 'Receipt Printer' module	2020-10-15 23:44:13 +02:00
Laurent Destailleur	64b1a31e45	Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType ... NEW : Nature of product is now a dictionay	2020-10-15 21:07:42 +02:00
Laurent Destailleur	a1913995df	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/class/expensereport.class.php	2020-10-15 21:05:00 +02:00
Laurent Destailleur	e7992131ec	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php	2020-10-15 21:00:49 +02:00
Laurent Destailleur	6277422115	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contrat/class/contrat.class.php htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/class/expensereport.class.php	2020-10-15 20:38:32 +02:00
ATM john	b9cbd84d4e	Fix page break	2020-10-15 09:30:48 +02:00
Florian HENRY	109d1ab801	Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType	2020-10-15 08:25:46 +02:00
Laurent Destailleur	0908ac5867	Fix phpcs	2020-10-14 20:18:07 +02:00
Florian HENRY	7d09f22afa	add correct import and dict edition	2020-10-14 16:39:42 +02:00
Laurent Destailleur	4a3a3190ea	Standardize pdf templates	2020-10-14 01:46:49 +02:00
Laurent Destailleur	75997bb8f5	Minor fixes	2020-10-12 14:01:15 +02:00
Laurent Destailleur	726fd1b631	Merge pull request #11227 from aspangaro/10.0_intracommreport ... NEW module Intracomm report	2020-10-12 13:35:58 +02:00
Laurent Destailleur	a1dd922394	Update modProduct.class.php	2020-10-12 13:04:10 +02:00
Florian HENRY	cea6eb279f	add immport packaging supplier quantity	2020-10-12 11:26:09 +02:00
Laurent Destailleur	b36b9170b2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-10 15:45:22 +02:00
Laurent Destailleur	437eead694	Fix bad permission	2020-10-10 15:45:04 +02:00
Philippe GRAND	ba674d09d3	add some translations	2020-10-10 14:45:58 +02:00
Philippe GRAND	094dbc1265	add some translations	2020-10-10 14:38:57 +02:00
Philippe GRAND	37b6a43c5c	add some translations	2020-10-10 14:30:22 +02:00
Alexandre SPANGARO	b3b37dd9ee	Fix sticklerCI	2020-10-09 09:32:50 +02:00
Alexandre SPANGARO	ca7ad35342	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-10-09 06:39:42 +02:00
Laurent Destailleur	0628c92bdb	Merge pull request #14960 from rabib-metroworks/import-po ... NEW ADDED IMPORT TOOL FOR PO	2020-10-08 19:29:53 +02:00
Aurélien	b6283c1a5d	Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery	2020-10-08 16:19:10 +02:00
quentin	77552c6508	Merge branch 'NEW_helper_functions' of github.com:atm-quentin/dolibarr into NEW_helper_functions	2020-10-08 10:50:08 +02:00
quentin	7591ec6cf6	FIX style	2020-10-08 10:49:29 +02:00
stickler-ci	f5b34370b6	Fixing style errors.	2020-10-08 08:34:40 +00:00
quentin	fe8d7f7f1b	missing public parameter	2020-10-08 10:32:16 +02:00
quentin	bf97d2a50f	NEW helper functions for export with phpspreadsheet	2020-10-08 10:26:30 +02:00
Ahmad Jamaly Rabib	40e16cc840	NEW ADDED IMPORT TOOL FOR PO ... Added Purchase Order import functionality	2020-10-08 00:34:53 +06:00
Scrutinizer Auto-Fixer	1512521d91	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-07 13:01:28 +00:00
Laurent Destailleur	3ace9f638a	Clean code	2020-10-07 13:20:38 +02:00
Laurent Destailleur	33fe5eb85f	Fix sql request	2020-10-07 12:53:17 +02:00
Laurent Destailleur	e369610538	Fix	2020-10-07 12:48:05 +02:00
Laurent Destailleur	59e89fd53a	Fix	2020-10-07 12:42:41 +02:00
Laurent Destailleur	145b1e97ca	Fix sql	2020-10-07 12:41:25 +02:00
Laurent Destailleur	f16a58a62c	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modSocialNetworks.class.php	2020-10-06 23:36:15 +02:00
Laurent Destailleur	04f8de4188	Remove dependency	2020-10-06 17:59:31 +02:00
AurelienBinard	39d538befc	Merge branch 'develop' into translateModLivraison2ModDelivery	2020-10-06 16:20:25 +02:00
Aurélien	f954e8b173	:mod livraison rename user acces right #14697	2020-10-06 16:10:48 +02:00
Aurélien	1af42b313c	rename livraison pdf and dependencies #14697	2020-10-06 13:32:02 +02:00
Aurélien	140200213e	change table into DB and ref #14697	2020-10-06 11:04:31 +02:00
Frédéric FRANCE	005cc093b9	fix typo	2020-10-05 20:02:23 +02:00
Laurent Destailleur	23f1137c84	Merge pull request #14920 from rabib-metroworks/import-vendor-invoice ... NEW Can import Supplier invoice	2020-10-05 16:44:49 +02:00
Aurélien	bdd095f6bb	translate livraison2delivery => change folder, filename and class ref into all dependencies #14697	2020-10-05 13:59:59 +02:00
Ahmad Jamaly Rabib	4a6000c750	NEW ADDED IMPORT TOOL FOR CUSTOMER ORDER ... Added Order import functionality in import module	2020-10-05 16:39:26 +06:00
Laurent Destailleur	8a079cf716	Code comment	2020-10-05 09:31:12 +02:00
Ahmad Jamaly Rabib	66a1aa9a86	NEW ADDED IMPORT TOOL FOR SUPPLIER INVOICE ... Added supplier invoice import functionality in import module	2020-10-05 00:39:35 +06:00
Laurent Destailleur	03ede71989	Clean code	2020-10-02 16:15:24 +02:00
Laurent Destailleur	580df3d503	Merge pull request #14880 from rabib-metroworks/import-proposal ... NEW Can import proposals	2020-10-01 19:09:14 +02:00
Laurent Destailleur	7b3a7c9921	Add token on all url with action=delete	2020-10-01 10:50:54 +02:00
Laurent Destailleur	91f0429bd2	Fix mention for france, only for FR country	2020-10-01 09:34:10 +02:00
Ahmad Jamaly Rabib	0b35a07290	NEW ADDED IMPORT TOOL FOR PROPOSAL MODULE ... Added proposal import functionality in import module	2020-10-01 11:52:56 +06:00
Laurent Destailleur	f442dac2c9	Add token on most GET url for admin action	2020-09-30 15:13:28 +02:00
Laurent Destailleur	1f8f2c0cc3	NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr	2020-09-29 13:13:47 +02:00
Laurent Destailleur	bd11154bfc	NEW Can filter on accounting system ref in export of chart of account	2020-09-28 18:56:53 +02:00
Laurent Destailleur	4cf6e483ca	Fix export of various payments.	2020-09-28 18:49:20 +02:00
Alexandre SPANGARO	88772726d7	New Add export for various payment	2020-09-28 09:32:49 +02:00
stickler-ci	f6513b898d	Fixing style errors.	2020-09-23 13:37:35 +00:00
John Botella	a374ffd03a	Merge branch '13.0_new_pdf_storm_for_delivery' of github.com:atm-john/dolibarr into 13.0_new_pdf_storm_for_delivery	2020-09-23 15:35:37 +02:00
John Botella	4a65b23bbf	Fix missing fetch optionals	2020-09-23 15:35:17 +02:00
stickler-ci	9cc87e8a0c	Fixing style errors.	2020-09-23 13:23:19 +00:00
John Botella	d3c9a035e9	Add new PDF model storm for delivery	2020-09-23 15:18:53 +02:00
Laurent Destailleur	e4bd75dbdc	Enhancement for #14589	2020-09-22 16:26:53 +02:00
Laurent Destailleur	4ce7507518	Fix warnings	2020-09-20 17:06:53 +02:00
Laurent Destailleur	fa86b62198	Fix escaping	2020-09-20 01:53:24 +02:00
Laurent Destailleur	b5703350da	Fix escape	2020-09-19 22:41:05 +02:00
Laurent Destailleur	54c0f742b1	Fix escape	2020-09-19 21:19:04 +02:00
Laurent Destailleur	534846c5c7	NEW Framework is ready for CSRF token protection on explicit GET URLs.	2020-09-18 04:30:24 +02:00
Laurent Destailleur	0f0e4feeaf	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modSociete.class.php	2020-09-17 19:33:29 +02:00
Laurent Destailleur	e123a4cb84	Fix help on minimum nb of chars	2020-09-17 15:09:29 +02:00
Laurent Destailleur	8029b80f08	Fix install hangs	2020-09-17 13:03:34 +02:00
Laurent Destailleur	004ba33695	Fix cach call of useNPR()	2020-09-17 10:11:06 +02:00
Laurent Destailleur	bfbb217607	Fix GETPOST on 'action'	2020-09-16 19:39:50 +02:00
Laurent Destailleur	40acd8a386	Fix missing field canvas	2020-09-16 12:17:33 +02:00
Laurent Destailleur	5c31593d43	Add date of birth in candidatures	2020-09-16 00:47:44 +02:00
Laurent Destailleur	cc37f4b29c	Clean code. <input name="token" value="$_SESSION['newtoken']" is now ... forbidden by CI. You must use newToken().	2020-09-14 16:24:02 +02:00
Scrutinizer Auto-Fixer	73915d51c8	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-14 02:30:04 +00:00
Laurent Destailleur	1bdd4cae9b	Merge pull request #14699 from atm-adrien/NEW_add_widget_empty_tasks ... New add widget empty tasks	2020-09-12 01:18:50 +02:00
Adrien Raze	c9833c501d	SQL + insertion champs dans box	2020-09-10 11:10:06 +02:00
Laurent Destailleur	6ec89afe8b	Fix phpcs	2020-09-10 03:30:24 +02:00
Laurent Destailleur	b99192bdb2	Update pdf_standard.class.php	2020-09-09 14:46:42 +02:00
stickler-ci	221c54c16f	Fixing style errors.	2020-09-09 12:46:25 +00:00
Laurent Destailleur	4b783d203e	Update pdf_standard.class.php	2020-09-09 14:44:09 +02:00
Laurent Destailleur	229aa14a97	Update pdf_standard.class.php	2020-09-09 14:43:24 +02:00
bahfir abbes	f08c91fcc6	fix: replace values of __YEAR__, __MONTH__ and __DAY__ in member docs	2020-09-09 09:29:19 +01:00
Scrutinizer Auto-Fixer	c263c8a76c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-08 19:27:28 +00:00
Laurent Destailleur	b1e45aef46	Debug opensurvey. Look and feel v13. Removed deprecated properties.	2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer	b78ff67d7e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-07 08:18:17 +00:00
Laurent Destailleur	77d15c9382	Fix long name overlap date	2020-09-03 11:34:20 +02:00
Laurent Destailleur	1eaba7d889	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-29 05:13:48 +02:00
Laurent Destailleur	f8bd7946a5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-08-29 05:13:20 +02:00
Laurent Destailleur	47c5bf5f06	Fix example	2020-08-29 04:22:57 +02:00
FlorianMortgat	c25463a4ba	+ more parentheses around expression for readability	2020-08-28 21:07:11 +02:00
FlorianMortgat	173ad057f9	+ parentheses around expression for readability	2020-08-28 20:46:35 +02:00
Florian Mortgat	7ddf85cd33	Merge branch '11.0' into 11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot	2020-08-28 10:05:00 +02:00
Florian Mortgat	a5d1f1f68f	FIX: expenses lines overlapping the frame for total amounts. ... If there is no room for this frame when printing the last expense line, this line should be on a new page.	2020-08-28 10:02:43 +02:00
Laurent Destailleur	f4793f505e	Merge pull request #14532 from StephaneLesage/import-thirdparty-mothercompany-debtlimit-bank-incoterms ... NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms	2020-08-27 20:12:36 +02:00
Laurent Destailleur	b6e9ba8ed6	Merge pull request #14535 from aspangaro/13a6 ... Some fix on assets	2020-08-27 20:01:33 +02:00
Alexandre SPANGARO	eebe888377	Some fix on assets	2020-08-24 09:47:37 +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	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	34d2d9a7c6	Look and feel v13	2020-08-23 15:17:22 +02:00
Laurent Destailleur	23cda5f464	Enhance recruitment module	2020-08-22 14:37:09 +02:00
Laurent Destailleur	dabe804299	Add numbering modules for candidatures. Mass action Validate.	2020-08-22 03:49:46 +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	1b22de5652	Fix phpcs	2020-08-21 13:22:49 +02:00
Laurent Destailleur	220fc6db98	Work on recruitment module	2020-08-21 13:00:12 +02:00
Laurent Destailleur	461c37c4a8	Clean code	2020-08-21 01:28:40 +02:00
Laurent Destailleur	eb15a8e4db	Enhance email collector module	2020-08-20 23:03:57 +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	66f9f37f41	Minor code and doc enhancement	2020-08-20 19:00:43 +02:00
StephaneLesage	ad6fe8c6b6	NEW: Products Import/Export 'default warehouse' and 'use batch number' fields	2020-08-20 13:51: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	58e25768a7	NEW Add PDF document templates for warehouses (list of stock)	2020-08-18 14:02:36 +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
Alexandre SPANGARO	27c36713d3	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-08-16 22:10:02 +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	cab9f6daae	Comment must be in english	2020-08-08 13:22:55 +02:00
Laurent Destailleur	0dda5ca4d6	Fix experimental	2020-08-07 16:27:09 +02:00
Laurent Destailleur	aa422ce4d7	Merge branch 'develop' into develop	2020-08-07 12:05:32 +02:00
Laurent Destailleur	d8e38201d9	Merge pull request #14378 from grandoc/patch-5 ... Update pdf_crabe.modules.php	2020-08-07 11:42:12 +02:00
Laurent Destailleur	a2e4e2d3b2	Merge pull request #14380 from grandoc/patch-6 ... Update pdf_blochet.class.php	2020-08-07 11:41:44 +02:00
Laurent Destailleur	9320ba1b37	Merge pull request #14376 from grandoc/patch-3 ... Update pdf_rouget.modules.php	2020-08-07 11:41:28 +02:00
Laurent Destailleur	07564166c7	Merge pull request #14375 from grandoc/patch-2 ... Update pdf_merou.modules.php	2020-08-07 10:11:16 +02:00
Laurent Destailleur	84c80e50a0	Merge pull request #14374 from grandoc/patch-1 ... Update pdf_ban.modules.php	2020-08-07 10:10:58 +02:00
Laurent Destailleur	8b69dd1384	Increase length of default password.	2020-08-07 09:50:15 +02:00
Laurent Destailleur	9d79e984dd	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/tpl/stockcorrection.tpl.php	2020-08-06 02:15:04 +02:00
Laurent Destailleur	2fd430bd2c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-08-06 02:08:44 +02:00
Laurent Destailleur	375fe3f3e8	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php htdocs/fourn/paiement/card.php	2020-08-06 02:08:04 +02:00
Laurent Destailleur	9cb5735165	FIX Bad address used for vendor on PDF standard of supplier payment	2020-08-06 02:05:55 +02:00
Laurent Destailleur	1cf3422e05	FIX Bad adress of vendor in PDF for PDF of supplier payment ... FIX dol_convertToWord() Bad conversion of number into a string	2020-08-06 01:56:42 +02:00
Philippe Grand	eed8957e07	Update pdf_blochet.class.php ... The comment should be TCPDF and not PDF	2020-08-04 17:33:52 +02:00
Philippe Grand	8d2edfc5ab	Update pdf_crabe.modules.php ... The comment should be TCPDF and not PDF	2020-08-04 17:13:08 +02:00
Philippe Grand	8483d4609c	Update pdf_rouget.modules.php ... The comment should be TCPDF and not PDF	2020-08-04 17:05:32 +02:00
Philippe Grand	7e519da8df	Update pdf_merou.modules.php ... The comment should be TCPDF and not PDF	2020-08-04 17:00:59 +02:00
Philippe Grand	e368de9bba	Update pdf_ban.modules.php	2020-08-04 16:55:47 +02:00
Philippe Grand	bc86518020	Update pdf_aurore.modules.php	2020-08-04 16:13:35 +02:00
Philippe Grand	6a24aed42a	Update pdf_standard.modules.php	2020-08-04 16:12:21 +02:00
Philippe Grand	c6b4c4392c	Update pdf_muscadet.modules.php	2020-08-04 16:11:25 +02:00
Philippe Grand	79be00f0aa	Update pdf_cornas.modules.php	2020-08-04 16:10:06 +02:00
Philippe Grand	62c49b2ce3	Update pdf_canelle.modules.php	2020-08-04 16:08:43 +02:00
Philippe Grand	49c99cfa70	Update pdf_squille.modules.php	2020-08-04 16:07:21 +02:00
Philippe Grand	4d1743ffcf	Update pdf_cyan.modules.php	2020-08-04 16:06:01 +02:00
Philippe Grand	f4a4444c79	Update pdf_azur.modules.php	2020-08-04 16:04:54 +02:00
Philippe Grand	54878e2916	Update pdf_timespent.modules.php	2020-08-04 16:03:28 +02:00
Philippe Grand	d9c260c7f1	Update pdf_beluga.modules.php	2020-08-04 16:02:19 +02:00
Philippe Grand	81b484ecc8	Update pdf_baleine.modules.php	2020-08-04 16:01:28 +02:00
Philippe Grand	d781a7cf62	Update pdf_espadon.modules.php	2020-08-04 16:00:12 +02:00
Philippe Grand	e8f92fe5bc	Update pdf_standard.class.php	2020-08-04 15:59:23 +02:00
Philippe Grand	6937efa3ba	Update pdf_typhon.modules.php	2020-08-04 15:57:25 +02:00
Philippe Grand	ea72d5dc82	Update pdf_soleil.modules.php	2020-08-04 15:56:17 +02:00
Philippe Grand	51cbbcd3b8	Update pdf_sponge.modules.php	2020-08-04 15:55:14 +02:00
Philippe Grand	d97a9c9b0d	Update pdf_crabe.modules.php	2020-08-04 15:53:20 +02:00
Philippe Grand	85879a0baa	Update pdf_standard.modules.php	2020-08-04 15:51:35 +02:00
Philippe Grand	001662af3d	Update pdf_rouget.modules.php	2020-08-04 15:49:47 +02:00
Philippe Grand	19fb6e827e	Update pdf_merou.modules.php	2020-08-04 15:47:00 +02:00
Philippe Grand	f94d4413a9	Update pdf_espadon.modules.php	2020-08-04 15:45:52 +02:00
Philippe Grand	3fcacf7196	Update pdf_blochet.class.php	2020-08-04 15:44:25 +02:00
Philippe Grand	2627bec686	Update pdf_sepamandate.modules.php	2020-08-04 15:43:28 +02:00
Philippe Grand	6874feb09a	Update pdf_ban.modules.php	2020-08-04 15:42:14 +02:00
Philippe Grand	e4faa0228e	Update pdf_strato.modules.php	2020-08-04 15:40:42 +02:00
Laurent Destailleur	4c1aa25b32	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/admin/adherent_emails.php htdocs/core/tpl/extrafields_list_search_title.tpl.php htdocs/product/traduction.php	2020-08-04 13:51:11 +02:00
Laurent Destailleur	2076d18825	FIX Param of fetch_name_optionals_label must be object->table_element	2020-08-04 12:47:09 +02:00
Laurent Destailleur	c78b19b3b8	Move module as experimental (it is working enough).	2020-08-03 16:39:52 +02:00
Laurent Destailleur	fa26d2acdf	css	2020-08-03 16:31:52 +02:00
Laurent Destailleur	aa696d8343	Show warning in kanban view	2020-08-03 15:17:37 +02:00
Laurent Destailleur	d1f92fb66b	NEW: Add module Credit transfer SEPA to manage payment of supplier using ... bank credit transfer SEPA files	2020-08-03 14:15:14 +02:00
Philippe GRAND	42fcb64700	Change comment to fixe a lot of undefined method	2020-08-03 10:26:01 +02:00
Philippe GRAND	85b2adaaec	Change comment to fixe a lot of undefined method	2020-08-03 10:13:18 +02:00
Philippe GRAND	0d6274c8fe	Change comment to fixe a lot of undefined method	2020-08-03 10:04:54 +02:00
Philippe GRAND	d6c84ef5ce	Change comment to fixe a lot of undefined method	2020-08-03 10:02:25 +02:00
Philippe GRAND	6fa3e8df4e	Change comment to fixe a lot of undefined method	2020-08-03 10:00:20 +02:00
Philippe GRAND	3a2e527454	Change comment to fixe a lot of undefined method	2020-08-03 09:58:47 +02:00
Philippe GRAND	1ea21ee1b8	Change comment to fixe a lot of undefined method	2020-08-03 09:56:48 +02:00
Philippe GRAND	d446a38b34	Change comment to fixe a lot of undefined method	2020-08-03 09:54:19 +02:00
Philippe GRAND	9fd520b5d4	Change comment to fixe a lot of undefined method	2020-08-03 09:52:11 +02:00
Philippe GRAND	3b80e9a08e	Change comment to fixe a lot of undefined method	2020-08-03 09:50:30 +02:00
Philippe GRAND	8ff27f89e5	Change comment to fixe a lot of undefined method	2020-08-03 09:48:25 +02:00
Philippe GRAND	703de5286f	Change comment to fixe a lot of undefined method	2020-08-03 09:46:07 +02:00
Philippe GRAND	ed6d83687c	Change comment to fixe a lot of undefined method	2020-08-03 09:44:44 +02:00
Philippe GRAND	2c4d8bceb6	Change comment to fixe a lot of undefined method	2020-08-03 09:39:54 +02:00
Philippe GRAND	c7bf47a00b	Change comment to fixe a lot of undefined method	2020-08-03 09:38:05 +02:00
Philippe GRAND	857505a887	Change comment to fixe a lot of undefined method	2020-08-03 09:36:23 +02:00
Philippe GRAND	0e0adcbe43	Change comment to fixe a lot of undefined method	2020-08-03 09:33:19 +02:00
Philippe GRAND	38f4e0392d	Change comment to fixe a lot of undefined method	2020-08-03 09:30:31 +02:00
Philippe GRAND	8bdf15a6a6	Change comment to fixe a lot of undefined method	2020-08-03 09:28:25 +02:00
Philippe GRAND	83d1ff2a6c	Change comment to fixe a lot of undefined method	2020-08-03 09:25:17 +02:00
Philippe GRAND	0b75280104	Change comment to fixe a lot of undefined method	2020-08-03 09:19:55 +02:00
Philippe GRAND	ccb9d62a14	Change comment to fixe a lot of undefined method	2020-08-03 09:13:46 +02:00
Laurent Destailleur	93fea8591c	Fix phpcs	2020-07-24 12:17:02 +02:00
Laurent Destailleur	6e36fba4f3	NEW Development of module Recruitment	2020-07-24 11:54:57 +02:00
Laurent Destailleur	acdb61b640	Merge pull request #14227 from defrance/patch-154 ... NEW : add class for ticket edition (pdf or odt)	2020-07-19 02:11:13 +02:00
BENKE Charlene	a2cf473891	add class for ticket edition (pdf or odt)	2020-07-13 14:24:07 +02:00
Philippe GRAND	5902dd6df3	Minimum version of PHP required by module	2020-07-11 15:10:53 +02:00
Philippe GRAND	2906e9b848	Minimum version of PHP required by module	2020-07-11 15:10:26 +02:00
Philippe GRAND	fc778e433f	Minimum version of PHP required by module	2020-07-11 15:10:02 +02:00
Philippe GRAND	8c5bdb8fb6	Minimum version of PHP required by module	2020-07-11 15:09:36 +02:00
Philippe GRAND	3ee18e5852	Minimum version of PHP required by module	2020-07-11 15:09:15 +02:00
Philippe GRAND	1d5a1beb79	Minimum version of PHP required by module	2020-07-11 15:08:52 +02:00
Philippe GRAND	1bb60ca7cc	Minimum version of PHP required by module	2020-07-11 15:08:28 +02:00
Philippe GRAND	1358801316	Minimum version of PHP required by module	2020-07-11 15:08:00 +02:00
Philippe GRAND	b4252b899c	Minimum version of PHP required by module	2020-07-11 15:07:33 +02:00
Philippe GRAND	9451148928	Minimum version of PHP required by module	2020-07-11 15:07:09 +02:00
Philippe GRAND	bbde5a3c95	Minimum version of PHP required by module	2020-07-11 15:06:44 +02:00
Philippe GRAND	05b97dc134	Minimum version of PHP required by module	2020-07-11 15:06:17 +02:00
Philippe GRAND	eb602d8bae	Minimum version of PHP required by module	2020-07-11 15:05:49 +02:00
Philippe GRAND	2e6addae11	Minimum version of PHP required by module	2020-07-11 15:05:20 +02:00
Philippe GRAND	f453c2272a	Minimum version of PHP required by module	2020-07-11 15:04:54 +02:00
Philippe GRAND	3a4f526ccd	Minimum version of PHP required by module	2020-07-11 15:04:31 +02:00
Philippe GRAND	8f37bb5a69	Minimum version of PHP required by module	2020-07-11 15:04:06 +02:00
Philippe GRAND	d4562a91ff	Minimum version of PHP required by module	2020-07-11 15:03:38 +02:00
Philippe GRAND	8d06471a4e	Minimum version of PHP required by module	2020-07-11 15:03:00 +02:00
Philippe GRAND	b26a1042d2	Minimum version of PHP required by module	2020-07-11 15:02:03 +02:00
Philippe GRAND	b2af2320ef	Merge branch 'new_branch_11_07_2020' of github.com:grandoc/dolibarr into new_branch_11_07_2020	2020-07-11 14:57:26 +02:00
Philippe GRAND	a61955234f	Minimum version of PHP required by module	2020-07-11 14:54:23 +02:00
Philippe GRAND	b02b6db181	Minimum version of PHP required by module	2020-07-11 14:43:30 +02:00
Philippe GRAND	8a2db6bad5	Minimum version of PHP required by module	2020-07-11 14:42:53 +02:00
stickler-ci	0d58c55167	Fixing style errors.	2020-07-11 12:42:38 +00:00
Philippe GRAND	ece128c9c5	Minimum version of PHP required by module	2020-07-11 14:42:04 +02:00
Philippe GRAND	7c84406494	Minimum version of PHP required by module	2020-07-11 14:41:10 +02:00
Philippe GRAND	370a7bcf38	Minimum version of PHP required by module	2020-07-11 14:39:46 +02:00
Philippe GRAND	0531dd00d9	Minimum version of PHP required by module	2020-07-11 14:38:44 +02:00
Philippe GRAND	baa9c39ace	Minimum version of PHP required by module	2020-07-11 14:38:03 +02:00
Philippe GRAND	872b99be42	Minimum version of PHP required by module	2020-07-11 14:37:25 +02:00
Philippe GRAND	0fdb209045	Minimum version of PHP required by module	2020-07-11 14:36:22 +02:00
Philippe GRAND	7f5ebf2e31	Minimum version of PHP required by module	2020-07-11 14:35:36 +02:00
Philippe GRAND	c9c5d9cc70	Minimum version of PHP required by module	2020-07-11 14:34:11 +02:00
Philippe GRAND	fd01a4d154	Minimum version of PHP required by module	2020-07-11 14:31:16 +02:00
Laurent Destailleur	b2bd90ae1a	Fix link to list of event	2020-07-09 12:33:28 +02:00
Alexandre SPANGARO	dc40ddb370	Some correction	2020-07-06 09:56:28 +02:00
Alexandre SPANGARO	82c96a4f83	Fix SticklerCi	2020-07-06 04:47:27 +02:00
Alexandre SPANGARO	725ef1057d	Some correct	2020-07-06 04:19:50 +02:00
Alexandre SPANGARO	59ee22537d	Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport	2020-07-06 03:24:27 +02:00
Laurent Destailleur	146c521efd	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/security.lib.php htdocs/filefunc.inc.php	2020-06-29 18:06:42 +02:00
Laurent Destailleur	5b3670f300	FIX SQL syntax error when editing extrafields ... Conflicts: htdocs/core/lib/security.lib.php	2020-06-29 14:28:53 +02:00
Laurent Destailleur	7c5b0be6a3	FIX SQL syntax error when editing extrafields	2020-06-29 13:48:00 +02:00
Laurent Destailleur	7c4e737668	Clean code	2020-06-29 09:53:55 +02:00
Laurent Destailleur	a5893db106	FIX upload documents into manual ECM was reported a permission error	2020-06-28 22:05:55 +02:00
lvessiller	3eb695ffa8	NEW add region in export companies and contacts	2020-06-26 09:14:06 +02:00
Laurent Destailleur	c36c8ed447	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_linkedfiles.inc.php	2020-06-17 15:28:19 +02:00
Laurent Destailleur	1a7f0741b5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/compta/paiement/class/paiement.class.php htdocs/core/actions_linkedfiles.inc.php htdocs/fourn/class/paiementfourn.class.php	2020-06-17 14:53:24 +02:00
Laurent Destailleur	7d3c176727	Prepare convertion of field "montant" into "amount"	2020-06-17 12:45:56 +02:00
Laurent Destailleur	6ea4928c79	Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports ... 11.0 - FIX - missing currency columns in supplier exports	2020-06-16 22:00:56 +02:00
Florian Mortgat	18d5ec7750	11.0 - FIX - missing currency columns in supplier exports ... (copy-pasted from modFacture.class.php)	2020-06-16 10:56:10 +02:00
Laurent Destailleur	72130dacb9	Merge pull request #14061 from atm-gauthier/10.0_fix_progress_pdf ... FIX : percent must be displayed on one line	2020-06-12 14:50:49 +02:00
Laurent Destailleur	90b5ed9908	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/website.lib.php	2020-06-11 23:41:35 +02:00
Laurent Destailleur	e087edf005	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/class/html.formticket.class.php htdocs/ticket/class/ticket.class.php	2020-06-11 23:39:26 +02:00
Laurent Destailleur	2109a91992	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/core/class/html.formticket.class.php htdocs/takepos/admin/setup.php	2020-06-11 23:36:55 +02:00
gauthier	92b89437d1	FIX : percent must be displayed on one line	2020-06-09 16:02:41 +02:00
Florian Mortgat	0a2099e0ac	FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat	2020-06-09 14:22:32 +02:00
Laurent Destailleur	9a30d4ca44	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-02 13:32:02 +02:00
Laurent Destailleur	c6a53d9b3d	Update pdf_blochet.class.php	2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)	7189e060e0	Fix line heiht overflow for blochet template ... Fixed if by adding dynamic line height calculation. Now line height depend on bank field content or transmitter field content. You can use long text in this fields.	2020-06-02 11:17:37 +02:00
Laurent Destailleur	c8d0476728	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php	2020-06-01 04:09:52 +02:00
Laurent Destailleur	dbac97a908	Fix several troubles into numbering modules. ... Prefix for takepos moved from TK to TC (TK was already used for tasks)	2020-06-01 04:02:47 +02:00
Laurent Destailleur	156f09729e	Debug module Payment by credit transfer	2020-05-30 02:10:41 +02:00
Laurent Destailleur	0a8b90c4e8	Debug module Payment by credit transfer	2020-05-30 02:10:02 +02:00
Laurent Destailleur	3b22b6192d	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-28 21:36:08 +02:00
Laurent Destailleur	2e0cf05e55	phpcs	2020-05-28 21:20:30 +02:00
Laurent Destailleur	2836368017	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/filefunc.inc.php htdocs/takepos/css/phone.css htdocs/takepos/invoice.php	2020-05-28 20:20:39 +02:00
Laurent Destailleur	3606ed2bda	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/adherents/class/adherent.class.php	2020-05-28 20:17:26 +02:00
Laurent Destailleur	8360ca4b20	Update pdf_crabe.modules.php	2020-05-28 17:38:20 +02:00
Laurent Destailleur	bdc73b5cae	Update pdf_crabe.modules.php	2020-05-28 17:37:53 +02:00
atm-lena	edc6abcea8	FIX Rounding Total TVA in "crabe" model pdf	2020-05-28 15:19:37 +02:00
Laurent Destailleur	e787978890	Doc	2020-05-27 23:12:26 +02:00
Laurent Destailleur	a2a15ceb5b	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/create.php htdocs/compta/prelevement/demandes.php htdocs/core/class/html.form.class.php	2020-05-27 23:07:18 +02:00
Laurent Destailleur	e37e45f984	Debug credit transfer	2020-05-27 22:35:55 +02:00
Frédéric FRANCE	5aa84c64d0	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:54:33 +02:00
Laurent Destailleur	d8d5907aff	Merge pull request #13939 from grandoc/develop ... Fix : some comment and translation	2020-05-23 15:11:32 +02:00
Frédéric FRANCE	0f4f727d18	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-22 08:27:12 +02:00
Laurent Destailleur	60f865fbb8	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-22 00:58:27 +02:00
Laurent Destailleur	9e295d44f0	Code comment	2020-05-21 17:14:42 +02:00
Frédéric FRANCE	b41ac00b98	add new rule	2020-05-21 15:05:19 +02:00
Philippe GRAND	c77a1be176	fix comment and add some translation	2020-05-21 11:35:32 +02:00
Frédéric FRANCE	ee6fadd0d5	add new rule	2020-05-21 01:41:27 +02:00
Laurent Destailleur	15f3c97fff	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-20 23:59:11 +02:00
Laurent Destailleur	92cbff7749	Clean code	2020-05-20 23:40:04 +02:00
Laurent Destailleur	bd564486ff	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-17 20:03:09 +02:00
Laurent Destailleur	106fe7bde6	Clean conflict between direct debit and direct credit orders.	2020-05-17 15:06:09 +02:00
Scrutinizer Auto-Fixer	9699ee7263	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-05-15 11:55:31 +00:00
Laurent Destailleur	a865dc7232	Merge pull request #13762 from indelog/rappaygroupmod ... NEW possibilty to group payments by mode and show their subtotal	2020-05-14 16:55:37 +02:00
Laurent Destailleur	7c01b54d73	Fix version on module list	2020-05-14 15:42:37 +02:00
Laurent Destailleur	6ec5dd02b6	Fix Fatal error with bad triggers	2020-05-14 15:27:10 +02:00
Laurent Destailleur	44d36815bd	Look and feel v12	2020-05-11 19:00:27 +02:00
Laurent Destailleur	c511af69fe	Debug look and feel v12	2020-05-10 21:07:49 +02:00
Laurent Destailleur	247acdd274	Fix position of custom groups of modules	2020-05-06 03:47:28 +02:00
Laurent Destailleur	4d6a45d491	Major doxygen fix	2020-05-03 22:48:35 +02:00
Laurent Destailleur	a88ab40384	Clean phpcs	2020-05-02 15:18:59 +02:00
Scrutinizer Auto-Fixer	8f0e00b4aa	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-05-02 01:39:56 +00:00
Laurent Destailleur	62a2469c71	Fix position of modules	2020-05-02 00:41:27 +02:00
Laurent Destailleur	66b33573ef	Fix menu	2020-04-28 18:30:38 +02:00
stickler-ci	2cf5f12a62	Fixing style errors.	2020-04-28 07:18:45 +00:00
DEMAREST Maxime (Indelog)	740b2c9228	NEW possibilty to group payments by mode and show their subtotal ... This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments to group them by mode and get subtotals for each mode. Add the corresponding configuration options on admin page fore each payments and supplier payments.	2020-04-28 09:01:00 +02:00
Laurent Destailleur	1c70e49695	Merge branch 'develop' into 12.0_a23	2020-04-27 14:14:13 +02:00
Laurent Destailleur	b20d85b198	Fix phpcs	2020-04-26 23:06:52 +02:00
Laurent Destailleur	a36d0c96c1	Fix sql	2020-04-26 22:28:43 +02:00
Laurent Destailleur	1d68510c7d	Fix syntax error	2020-04-25 19:32:18 +02:00
Laurent Destailleur	068a890c36	Enable more PHPCS rules	2020-04-25 19:13:20 +02:00
Scrutinizer Auto-Fixer	1bf5745286	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-25 11:52:07 +00:00
Laurent Destailleur	38f2aad0c6	Debug asset module	2020-04-25 03:19:30 +02:00
Laurent Destailleur	3ed11f374a	Look and feel v12	2020-04-24 23:56:57 +02:00
Laurent Destailleur	7bbfd2175d	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/class/fournisseur.commande.dispatch.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/reception/class/reception.class.php	2020-04-24 18:58:47 +02:00
Scrutinizer Auto-Fixer	548f3007cf	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-23 16:55:10 +00:00
Laurent Destailleur	00e9ed1452	Merge pull request #13716 from atm-florian/11.0 ... fix: remove debug pring	2020-04-23 18:22:18 +02:00
Laurent Destailleur	dc0978e88b	Merge pull request #13720 from FHenry/dev_fix_odt ... fix: uniformize extrafeild replacemnt for ODT docs	2020-04-23 18:22:00 +02:00
Laurent Destailleur	8401f68bde	Update doc_generic_task_odt.modules.php	2020-04-23 18:21:17 +02:00
Laurent Destailleur	86be024dcc	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modFournisseur.class.php	2020-04-23 17:17:42 +02:00
florian HENRY	32385b75e1	travis	2020-04-23 16:18:31 +02:00
florian HENRY	6dafb30ee8	fix time duration substitution	2020-04-23 15:57:06 +02:00
florian HENRY	55a9aa5991	fix: missing duration odt task substitution	2020-04-23 15:55:37 +02:00
florian HENRY	882b39628f	fix: uniformize extrafeild replacemnt for ODT docs	2020-04-23 15:50:42 +02:00
Laurent Destailleur	6819255b76	FIX #13650	2020-04-23 13:49:18 +02:00
florian HENRY	7972174787	remove debug pring	2020-04-23 13:44:23 +02:00
Laurent Destailleur	3101f72b5c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-22 18:28:59 +02:00
Laurent Destailleur	39c454d07b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modFournisseur.class.php	2020-04-22 18:28:52 +02:00
Laurent Destailleur	bbfb93bc42	Merge pull request #13690 from OPEN-DSI/new-societe-import-update-contacts ... NEW can update contact in import model	2020-04-22 18:09:49 +02:00
Laurent Destailleur	c1d0cae24d	Merge pull request #13692 from hregis/11.0_bug ... FIX missing fk_bank during export of suppliers invoices	2020-04-22 13:18:46 +02:00
Regis Houssin	f6f9ca48dd	FIX missing fk_bank during export of suppliers invoices	2020-04-22 12:23:26 +02:00
florian HENRY	8be14060d6	fix: avoid php notice	2020-04-22 12:08:05 +02:00
VESSILLER	cce3085a79	NEW can update contact in import model	2020-04-22 10:44:23 +02:00
Frédéric FRANCE	8f42707220	Update pdf_crabe.modules.php	2020-04-21 23:20:11 +02:00
Frédéric FRANCE	7972a35e36	Update pdf_azur.modules.php	2020-04-21 23:12:12 +02:00
Frédéric FRANCE	2fde77703d	add extrafields in note for enstein	2020-04-21 23:06:41 +02:00
Laurent Destailleur	770fca0b33	Debug the double language feature in pdf	2020-04-21 20:16:36 +02:00
Laurent Destailleur	cadb52c5b3	Look and feel v12	2020-04-20 19:39:34 +02:00
Laurent Destailleur	230fe26b58	Look and feel v12	2020-04-20 18:38:25 +02:00
Laurent Destailleur	40b3db940c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-20 14:44:36 +02:00
Frédéric FRANCE	7b68a2a60e	Update pdf_crabe.modules.php	2020-04-19 21:50:52 +02:00
Laurent Destailleur	3e7f0b364e	FIX #13611	2020-04-17 10:22:08 +02:00
ATM john	3b4b30ea57	Fix merge remaining lines	2020-04-16 20:33:53 +02:00
ATM john	c334a931de	Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty	2020-04-16 20:29:54 +02:00
Laurent Destailleur	5254a94038	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/ldap.php htdocs/commande/class/commande.class.php htdocs/commande/index.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/expedition/list.php htdocs/fourn/commande/list.php htdocs/fourn/facture/list.php htdocs/loan/list.php htdocs/product/class/product.class.php htdocs/supplier_proposal/list.php	2020-04-16 15:58:59 +02:00
Laurent Destailleur	984fa0d5a0	Fix hidden const	2020-04-16 15:24:12 +02:00
Scrutinizer Auto-Fixer	d021559b16	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-15 22:42:57 +00:00
Laurent Destailleur	43ec6c3ae5	Fix phpcs	2020-04-15 23:38:14 +02:00
Laurent Destailleur	3be426be5b	Align sponge and crabe	2020-04-15 02:24:08 +02:00
Laurent Destailleur	1dd951495b	Removed hard coded dependency on an external module	2020-04-15 02:20:57 +02:00
Laurent Destailleur	c337bd91fe	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-14 21:58:13 +02:00
Laurent Destailleur	d143bd8aec	FIX #13589 missing price_level in import of thirdparties	2020-04-14 21:22:08 +02:00
ATM john	b70cd84402	Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty	2020-04-14 14:11:12 +02:00
Laurent Destailleur	8c8a8263dd	Merge branch 'develop' into patch-145	2020-04-13 16:22:19 +02:00
Laurent Destailleur	99cbb273c8	Update pdf_crabe.modules.php	2020-04-13 16:21:47 +02:00
Laurent Destailleur	e02ac3b518	Trans	2020-04-13 15:57:25 +02:00
Laurent Destailleur	96d087c99d	Fix clean event report	2020-04-13 02:59:33 +02:00
Laurent Destailleur	d503c1b6be	Fix help	2020-04-12 23:18:21 +02:00
Laurent Destailleur	5b8864b46e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php	2020-04-12 21:41:40 +02:00
Laurent Destailleur	549b126eff	Look and feel v12	2020-04-12 21:36:57 +02:00
Laurent Destailleur	08301e2696	Merge pull request #13567 from atm-maxime/new_expensereport_tab_remove ... Remove expense report tab from user	2020-04-12 17:11:37 +02:00
Laurent Destailleur	d7784887d1	More font awesome picto	2020-04-12 14:58:50 +02:00
Maxime Kohlhaas	2ef787c7ff	Remove expense report tab from user	2020-04-11 17:38:54 +02:00
simicar29	9573f1289a	FIX #7594 ... This is a temptative fix of the bad "multi page break" in expense report	2020-04-11 13:42:37 +02:00
Laurent Destailleur	db30f0bbc4	NEW Receipt printer module moved from 'development' to 'experimental'	2020-04-11 00:56:18 +02:00
Laurent Destailleur	5ff981bf61	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/user/perms.php	2020-04-10 12:04:21 +02:00
Laurent Destailleur	874cbcefc7	Fix permission to close a proposal or order was not correctly used ... #13547	2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer	444c293c01	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-10 08:59:32 +00:00
Laurent Destailleur	83af4ebea4	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/class/entrepot.class.php htdocs/product/stock/list.php	2020-04-10 01:22:22 +02:00
Francis Appels	0a8a8bafa0	FIX print pictures in shipment docs	2020-04-09 15:40:36 +02:00
Laurent Destailleur	361baa0c73	CSS	2020-04-08 17:56:24 +02:00
Laurent Destailleur	02436c1e84	NEW The module selection uses a KanBan view by default.	2020-04-08 17:04:23 +02:00
Laurent Destailleur	7514aa4612	Merge pull request #13506 from joseplluis/patch-6 ... NEW add professional ID 1 in sepamandate document	2020-04-08 14:40:38 +02:00
Laurent Destailleur	0716951b6d	Fix logo	2020-04-08 13:38:29 +02:00
Laurent Destailleur	9d9364256b	More picto using fontawesome.	2020-04-07 16:45:08 +02:00
Laurent Destailleur	809c741d11	Can use font awesome as picto of object and modules.	2020-04-06 15:34:28 +02:00
Laurent Destailleur	082b205149	WIP Work on Kanban view for module list	2020-04-06 15:12:42 +02:00
stickler-ci	3b9267fd8a	Fixing style errors.	2020-04-06 10:51:06 +00:00
Josep Lluís	35f3052280	NEW add VAT ID in sepamandate document ... add: VAT ID in sepamandate document	2020-04-06 12:47:57 +02:00
Scrutinizer Auto-Fixer	612bac6598	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-04-05 00:44:59 +00:00
Laurent Destailleur	e6641b5369	Fix doc	2020-04-03 18:01:54 +02:00
ATM john	c466beea3d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty	2020-03-31 16:28:43 +02:00
oscim	3b8a16e3fd	Update modCommande.class.php ... add extrafileds company in export orders	2020-03-31 11:05:21 +02:00
Laurent Destailleur	b33552fb6f	Fix phpcs	2020-03-27 16:13:53 +01:00
Laurent Destailleur	c27592bad2	Clean deprecated params on all fetch_optionals()	2020-03-27 16:02:58 +01:00
Laurent Destailleur	354cb8c1b0	Work on Kanban view for modules	2020-03-27 01:59:17 +01:00