Laurent Destailleur
|
ca1715df96
|
Add some protection for SQL injection
|
2021-03-22 13:31:06 +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 |
|
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 |
|
Frédéric FRANCE
|
bae1770176
|
uniformise comments to remove nested comments
|
2021-03-20 10:00:24 +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 |
|
Frédéric FRANCE
|
8ab8043557
|
fix php8 warning
|
2021-03-17 22:27:39 +01:00 |
|
Laurent Destailleur
|
8829d42e1d
|
Merge pull request #16742 from frederic34/fix-php8-20210306
Fix php8
|
2021-03-17 16:58:05 +01:00 |
|
Laurent Destailleur
|
1e402f9ea2
|
Merge pull request #16754 from frederic34/patch-13
fix php8 warnings
|
2021-03-17 16:55:54 +01:00 |
|
Laurent Destailleur
|
9cbb2e8d42
|
Merge pull request #16755 from frederic34/patch-14
fix php7 php8 warning
|
2021-03-17 16:52:07 +01:00 |
|
Laurent Destailleur
|
8de1b4c94e
|
Factorize code
|
2021-03-17 11:34:19 +01:00 |
|
Frédéric FRANCE
|
11a6961c13
|
fix php8 warning
|
2021-03-16 23:02:28 +01:00 |
|
Frédéric FRANCE
|
ff690861c4
|
fix php8 warnings
|
2021-03-16 22:50:14 +01:00 |
|
Frédéric FRANCE
|
358dcff0cf
|
fix php8
|
2021-03-16 17:38:12 +01:00 |
|
Laurent Destailleur
|
9480e15755
|
Merge pull request #16703 from dolibit-ut/patch-84
Update card.php
|
2021-03-16 10:37:07 +01:00 |
|
Laurent Destailleur
|
a733275559
|
Merge pull request #16702 from dolibit-ut/patch-83
Update card.php
|
2021-03-16 10:36:53 +01:00 |
|
Laurent Destailleur
|
e00e6cfd9a
|
Merge pull request #16721 from aspangaro/14a25
Translation "Generated documents"
|
2021-03-16 10:25:31 +01:00 |
|
Alexandre SPANGARO
|
6960f0dc25
|
Uniformize translation
|
2021-03-16 04:22:55 +01:00 |
|
Alexandre SPANGARO
|
4fd24c6855
|
Translation "Generated documents"
|
2021-03-16 04:04:18 +01:00 |
|
UT from dolibit
|
9eb87ab43a
|
Update card.php
$help_url add -> DE:Modul_Angebot
|
2021-03-15 19:28:48 +01:00 |
|
UT from dolibit
|
1d11dfd468
|
Update card.php
$help_url add -> DE:Modul_Geschäftspartner
|
2021-03-15 19:24:49 +01:00 |
|
Laurent Destailleur
|
7d1e18f5ab
|
Merge pull request #16625 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-15 11:37:57 +01:00 |
|
Laurent Destailleur
|
a46bbb83f8
|
Merge pull request #16678 from frederic34/patch-32
fix php8 warnings
|
2021-03-15 10:54:23 +01:00 |
|
Frédéric FRANCE
|
5d99dfea50
|
fix php8 warning
|
2021-03-15 08:08:05 +01:00 |
|
Frédéric FRANCE
|
1e85e8f37d
|
fix php8 warnings
|
2021-03-15 00:53:34 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Frédéric FRANCE
|
67abd6d1d6
|
go back actioncomm create after create project
|
2021-03-12 17:05:11 +01:00 |
|
Florian HENRY
|
862926316a
|
working on list
|
2021-03-11 19:09:42 +01:00 |
|
Laurent Destailleur
|
c3a047ee06
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
|
2021-03-08 19:31:47 +01:00 |
|
Laurent Destailleur
|
2f0c4038fb
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
htdocs/compta/sociales/card.php
htdocs/societe/consumption.php
|
2021-03-08 19:27:34 +01:00 |
|
Frédéric FRANCE
|
c0c9ac439f
|
Update api_agendaevents.class.php
|
2021-03-08 00:23:05 +01:00 |
|
Frédéric FRANCE
|
45189de496
|
Update api_agendaevents.class.php
|
2021-03-08 00:16:28 +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
|
3cfcad284b
|
Fix unsubscribe to MLs
|
2021-03-05 17:48:55 +01:00 |
|
Florian HENRY
|
6844c57413
|
fix sql
|
2021-03-04 07:53:32 +01:00 |
|
Florian HENRY
|
ec52ed445c
|
fix ambigous
|
2021-03-03 22:18:42 +01:00 |
|
Florian HENRY
|
04c6d5dd8f
|
fix sql
|
2021-03-03 22:16:35 +01:00 |
|
Florian HENRY
|
91b93ac7ce
|
fix sql
|
2021-03-03 22:10:17 +01:00 |
|
Florian HENRY
|
9c256ab8a8
|
fix review
|
2021-03-03 21:40:37 +01:00 |
|
Florian HENRY
|
4e2f929460
|
test
|
2021-03-03 21:11:04 +01:00 |
|
Florian HENRY
|
55e9a6596b
|
test
|
2021-03-03 21:10:50 +01:00 |
|
Florian HENRY
|
1913564b38
|
fix travis
|
2021-03-03 16:28:14 +01:00 |
|
Florian HENRY
|
c909306f34
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
|
2021-03-03 16:27:05 +01:00 |
|
Laurent Destailleur
|
f11a85a3e3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
|
2021-03-03 11:37:34 +01:00 |
|
Laurent Destailleur
|
7eb3e324c7
|
FIX #16503
|
2021-03-02 23:09:55 +01:00 |
|
stickler-ci
|
e28f844d54
|
Fixing style errors.
|
2021-03-02 21:31:48 +00:00 |
|
Florian HENRY
|
e5e3abd685
|
class conference or booth or and table actioncomm ok
|
2021-03-02 22:23:54 +01:00 |
|
Florian HENRY
|
6862c206aa
|
merge from develop
|
2021-03-02 21:48:35 +01:00 |
|