Commit Graph

1585 Commits

Author SHA1 Message Date
Laurent Destailleur
0fd200083f
Merge pull request #17970 from a-schild/develop
Allow to update ref_ext via webservices
2021-06-19 14:20:28 +02:00
stickler-ci
d4fa284f67 Fixing style errors. 2021-06-17 16:18:55 +00:00
a-schild
597e8ef671 Allow to update ref_ext via webservices
See issue #17967
2021-06-17 18:17:08 +02:00
Laurent Destailleur
5b8c93b090 FIX #17967 2021-06-17 18:01:31 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
87a19af86d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/contacts.tpl.php
2021-06-15 22:17:53 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
9a820ba974
Merge pull request #17925 from dolibit-ut/patch-347
Update agenda.php
2021-06-14 14:27:56 +02:00
Laurent Destailleur
f988f4c352 Fix contact 2021-06-14 14:15:32 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
UT from dolibit
2143395d70
Update agenda.php 2021-06-14 11:02:43 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
067f37e22e Clean code 2021-06-10 00:09:38 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
9952fdb6d3 FIX #17648 #17712 2021-05-26 17:45:45 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
b96205d968
Merge pull request #17374 from Robin-Yann/13-fix-contact_filer-fournisseur
FIX List contact TAG filter fournisseur
2021-04-26 22:43:12 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
stickler-ci
ed923253bd Fixing style errors. 2021-04-22 15:23:37 +00:00
Robin-Yann
4505ba0fc8
Merge branch 'develop' into 13-fix-contact_filer-fournisseur 2021-04-22 17:21:09 +02:00
Robin
379cb74cd9 FIX tag selector error if supplier disable 2021-04-22 17:09:33 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +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
Florian HENRY
cf1c4ce11f add missing hook 2021-04-13 09:51:08 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
50de0777e4 Look and feel v14 2021-03-27 12:45:57 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Frédéric FRANCE
d20e8798e8
fix warning 2021-03-19 17:14:05 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Frédéric FRANCE
bd44658cbd
fix php8 warning 2021-03-18 23:09:13 +01:00
Laurent Destailleur
c17e1ac67b
Merge pull request #16816 from frederic34/patch-24
fix php8 warning
2021-03-18 23:05:35 +01:00
Laurent Destailleur
172cb02b4a
Merge pull request #16814 from frederic34/patch-22
fix php8 warning
2021-03-18 22:50:31 +01:00
Frédéric FRANCE
a400559342
fix php8 warning 2021-03-18 22:44:58 +01:00
Frédéric FRANCE
0d67f68174
Update card.php 2021-03-18 22:36:17 +01:00
Frédéric FRANCE
181436f279
fix php8 warning 2021-03-18 22:31:41 +01:00
Frédéric FRANCE
ba33bc8eac
fix php8 warning 2021-03-18 22:29:08 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
5b74fefb60 Fix look and feel v13 2021-03-09 17:01:20 +01:00
stickler-ci
47dd477c61 Fixing style errors. 2021-03-04 09:36:17 +00:00
lmarcouiller
e94f703f5d Fix #16523 : return to backward compatibility 2021-03-04 10:33:18 +01:00
lmarcouiller
500f192a05 Fix #16523 : New column Contact assigned 2021-03-04 10:15:41 +01:00
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
1a521bcc99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/class/contact.class.php
2021-02-26 10:27:55 +01:00
Laurent Destailleur
5c0fba26e2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-26 10:25:55 +01:00
Laurent Destailleur
549136efeb Removed useless log 2021-02-26 10:25:30 +01:00
Laurent Destailleur
99a17cadb7 Fix sql syntax 2021-02-26 10:25:08 +01:00
Laurent Destailleur
8e8efce7d1 Fix sql syntax 2021-02-26 10:23:53 +01:00
Florian Mortgat
d59ee06438 FIX 11.0 - $this->socid injected in query without checking for empty value 2021-02-25 14:51:57 +01:00
Frédéric FRANCE
3b6d01ffae
code syntax contact directory 2021-02-23 21:16:15 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
912f9f9bdb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/card.php
	htdocs/core/actions_massactions.inc.php
2021-02-22 15:54:24 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
Laurent Destailleur
60ae50abb3
Merge pull request #16270 from frederic34/patch-3
fix unknown variable
2021-02-11 23:00:36 +01:00
Frédéric FRANCE
ac40067e88
fix unknown variable 2021-02-11 22:11:16 +01:00
Frédéric FRANCE
bcac4386d6
doxygen 2021-02-11 21:26:21 +01:00
Laurent Destailleur
8a13ad2f26 Close #16075 2021-01-27 19:31:30 +01:00
Laurent Destailleur
6d0cbd3ee5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-23 17:32:49 +01:00
Laurent Destailleur
7e8d06e8b8 Fix update default contact type 2021-01-22 14:10: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
93ca27d808 FIX #16041 2021-01-22 13:17:27 +01:00
Laurent Destailleur
cf11f356e8 Fix load of data are not complete 2021-01-22 10:51:47 +01:00
Frédéric FRANCE
177b87da0d
Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-16 17:58:01 +01:00
Frédéric FRANCE
f1685ba1b1
code syntax 2021-01-16 14:24:47 +01:00
Anthony Berton
df5e6a2519 picto 2021-01-14 08:56:38 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Florian HENRY
2be924d5d8 fix js bulkemail 2021-01-12 10:01:32 +01:00
Florian HENRY
8adfe54949 bulk email management 2021-01-07 17:33:57 +01:00
Florian HENRY
5c53a963e2 bulk email management 2021-01-07 17:23:02 +01:00
kamel
c2489dd313 FIX : Fix the display on the 'contact by default' on the contact card 2021-01-06 11:07:25 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes
NEW Can toggle FCKeditor on public/private notes
2020-12-27 15:06:35 +01:00
Florian HENRY
f03574d061 bank ok 2020-12-24 14:56:26 +01:00
Florian HENRY
055a2b6fec on goung 2020-12-23 23:44:38 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links 2020-12-12 17:00:23 +01:00
Laurent Destailleur
05a560c2e3 Fix warning 2020-12-04 20:43:11 +01:00
Laurent Destailleur
0d4121c5bd Fix warning 2020-12-04 12:01:41 +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
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
f6d6efa288 CSS 2020-11-22 13:23:56 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
Update fork
2020-11-20 13:53:43 +01:00
Frédéric FRANCE
cac91211c9
remove deprecated 2020-11-19 21:27:20 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Florian HENRY
b16af0a7c3 fix deprecated warning php 7.4 2020-11-11 15:43:36 +01:00