Commit Graph

596 Commits

Author SHA1 Message Date
Regis Houssin
97a1774bf3 NEW add hooks contact tab badge and hooks parameter for avoid conflicts 2022-03-26 12:57:30 +01:00
Alexandre SPANGARO
9db7d29237 Accountancy - Removed old code for reconciled (or lettering...) 2022-03-24 23:14:23 +01:00
Regis Houssin
4efe10a9a5 NEW add hook printFieldListWhere in "show_contacts" function 2022-03-22 10:46:26 +01:00
Laurent Destailleur
5d90a00728 Debug v15 2022-02-14 12:27:35 +01:00
Laurent Destailleur
27b94ceea1 Debug v15 2022-02-13 19:26:16 +01:00
Laurent Destailleur
0259f094bd Fix trans 2022-02-02 18:04:11 +01:00
Laurent Destailleur
73474a1cea Fix css 2022-02-02 17:57:20 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
2021-12-19 00:36:22 +01:00
Laurent Destailleur
98ddfbf792 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/compta/facture/info.php
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/fourn/facture/list.php
	htdocs/mrp/mo_movements.php
	htdocs/product/stock/movement_card.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/replenishorders.php
	htdocs/reception/card.php
	htdocs/supplier_proposal/list.php
2021-12-19 00:17:37 +01:00
Laurent Destailleur
2bc417fcf7 FIX parameter $action replaced with $mode. $action reserved for action 2021-12-11 13:22:43 +01:00
Gauthier PC portable 024
b609c579b6 FIX : postgresql compatibility, "" as is not authorized 2021-12-10 11:40:25 +01:00
Laurent Destailleur
e3e4b154e7 Fix partnership 2021-11-29 01:04:32 +01:00
Alexandre SPANGARO
f73f3cd55f typo 2021-11-02 04:50:29 +01:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code
New : integration gpec, source code
2021-10-11 15:39:54 +02:00
Laurent Destailleur
7180f5eeff css 2021-10-10 21:25:46 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Alexandre SPANGARO
42bb9ac6d2 Better URL 2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
042d520061 Change Url 2021-10-03 05:30:49 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Gauthier PC portable 024
fde0f1ac25 NEW : HRM integration, source code 2021-09-27 11:20:38 +02:00
Laurent Destailleur
edb1f31a19 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
2021-09-10 20:55:52 +02:00
Florian HENRY
257686c2fe fix: on Event tabs, if no evt type use in filter, filter on label and state not apply 2021-09-10 15:45:03 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
a25346e302 FIX Date of payment of subscription must not be set to 1970-01-01.
Fix look and feel v14
2021-08-23 15:00:29 +02:00
Laurent Destailleur
4c505619e3 FIX look and field v14 2021-07-23 00:02:14 +02:00
John BOTELLA
deb9a374f3 Fix ui event badge status 2021-07-12 12:28:21 +02:00
Laurent Destailleur
5bfd82e528 Clean code 2021-06-21 11:23:53 +02:00
Frédéric FRANCE
5d79143401
fix php warning 2021-06-16 11:50:52 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
2a47128e2d Code comment 2021-05-03 11:00:41 +02:00
stickler-ci
81b964db45 Fixing style errors. 2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321 FIX SQL Error show_contacts : socialnetworks 2021-04-30 10:04:21 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Frédéric FRANCE
da3fcf3ca5
fix php8 warning 2021-03-17 22:16:54 +01:00
Laurent Destailleur
8de1b4c94e Factorize code 2021-03-17 11:34:19 +01:00
Laurent Destailleur
7abf572f2d
Merge pull request #16512 from Hystepik/develop#1
Fix #16432 : Update of getCountriesinEEC
2021-03-02 23:56:37 +01:00
Laurent Destailleur
348b8d2ffe More phpunit tests 2021-03-02 23:55:41 +01:00
lmarcouiller
2eaa6ad6c6 Fix #16432 : Add cache use in function 2021-03-02 16:21:43 +01:00
stickler-ci
b374a8a00b Fixing style errors. 2021-03-02 15:03:36 +00:00
lmarcouiller
fc86784cfc Fix #16432 : update with eldy advices 2021-03-02 16:03:14 +01:00
lmarcouiller
c5ac79e34c Fix #16432 : Update of getCountriesinEEX 2021-03-02 15:24:55 +01:00
Frédéric FRANCE
554e449e40
code syntax core directory 2021-02-23 22:03:23 +01:00
Frédéric FRANCE
41b89ae677
add files and links 2021-02-21 09:50:58 +01:00
Frédéric FRANCE
518826ad3d
add project 2021-02-20 22:03:11 +01:00
Frédéric FRANCE
65925e60b9
memcached can set expire 2021-02-20 20:48:59 +01:00
Laurent Destailleur
1dd1dcefc5 Rename cache keys 2021-02-20 18:25:48 +01:00
Laurent Destailleur
341cd06252 Clean code for cache feature 2021-02-20 18:21:10 +01:00
Frédéric FRANCE
57e15eb46d
try to apply the advice 2021-02-20 17:12:06 +01:00
Frédéric FRANCE
ec1dd40a8a
enhance caching 2021-02-20 15:52:45 +01:00
Frédéric FRANCE
99fa13cbad
enhance caching 2021-02-20 15:41:57 +01:00
Frédéric FRANCE
1e3ae8348a
use cache 2021-02-19 23:16:56 +01:00
Frédéric FRANCE
45e947ee2b
count actioncomm for thirdparty tab agenda 2021-02-17 22:16:07 +01:00
Frédéric FRANCE
933a944603
count actioncomm for thirdparty tab agenda 2021-02-17 22:14:21 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems
Conflicts:
	htdocs/core/lib/company.lib.php
2021-02-07 19:47:33 +01:00
Laurent Destailleur
8c71c8335e Fix TZ problems 2021-02-07 19:44:22 +01:00
Regis Houssin
aec01a95fc FIX again and again 2020-12-29 17:48:52 +01: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
Frédéric FRANCE
0d65ab0c96
add cache 2020-10-28 00:34:59 +01:00
Laurent Destailleur
4dea8c4bb7 Fix missing token 2020-10-16 13:36:05 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02: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
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
ad0625b6ec Debug posting message from ticket page 2020-08-21 01:11:22 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
46fccf8eb1 FIX dolGetElementUrl and agenda page for external modules 2020-07-24 11:53:44 +02:00
Laurent Destailleur
b2bd90ae1a Fix link to list of event 2020-07-09 12:33:28 +02:00
Laurent Destailleur
1f466f3846
Update company.lib.php 2020-07-03 00:57:15 +02:00
quentin
39651953b3 FIX refacto 2020-07-01 14:04:41 +02:00
Laurent Destailleur
95729e2375 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
Florian Mortgat
ccfe6f18fe FIX 10.0 - fatal with postgres
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +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
Florian Mortgat
5bc80f8626 FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax 2020-06-10 16:22:48 +02:00
stickler-ci
b4dd11ec98 Fixing style errors. 2020-06-08 14:00:57 +00:00
atm-quentin
3dd7c81f54 FIX stickler 2020-06-08 15:58:20 +02:00
atm-quentin
69db790cf5 NEW multiselect type and date to date filter 2020-06-08 14:43:14 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
2020-05-27 14:28:20 +02:00
Laurent Destailleur
c0ce584487 Look and feel v12 2020-05-27 00:26:04 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
0878ee3a0f Look and feel v12 2020-04-13 17:55:25 +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
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
gauthier
4c0de74470 FIX : sort by default role makes no sense 2020-03-24 16:27:53 +01:00
Laurent Destailleur
b18d3e5588 Fix var not defined 2020-03-23 15:58:47 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00