Commit Graph

10834 Commits

Author SHA1 Message Date
Laurent Destailleur
827a952dca Merge pull request #16839 from dolibit-ut/patch-130
Update card.php
2021-03-20 11:49:18 +01:00
Laurent Destailleur
3edeb8b4aa Merge pull request #16840 from dolibit-ut/patch-131
Update document.php
2021-03-20 11:49:06 +01:00
Laurent Destailleur
ba6f97acbc Merge pull request #16865 from frederic34/uniformisecomment
uniformise comments to remove nested comments
2021-03-20 11:24:39 +01:00
Laurent Destailleur
11a7420b59 Merge pull request #16877 from frederic34/patch-27
fix doxygen
2021-03-20 11:12:33 +01:00
Frédéric FRANCE
3d3715f55d fix doxygen 2021-03-20 10:37:51 +01:00
Frédéric FRANCE
81c885dbf1 fix doxygen 2021-03-20 10:36:53 +01:00
Frédéric FRANCE
bae1770176 uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Laurent Destailleur
ae7261c0a7 FIX #yogosha5677 2021-03-19 14:12:08 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Laurent Destailleur
ebf409f831 FIX #yogosha5668 2021-03-19 12:08:40 +01:00
UT from dolibit
46c23807e9 Update document.php
$helpurl  ->  $help_url
2021-03-19 09:38:33 +01:00
UT from dolibit
b4e929e57f Update card.php
$helpurl  ->  $help_url
2021-03-19 09:36:49 +01:00
Laurent Destailleur
a200f6f6ea Merge pull request #16785 from frederic34/fixextrafieldsadmin
fix php8 warning
2021-03-18 23:08:15 +01:00
Laurent Destailleur
3522af926a Merge pull request #16799 from AlexisLaurier/addInvoiceListHook
invoice list - add new standard hooks
2021-03-18 22:58:18 +01:00
Laurent Destailleur
43494df56c Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice
add invoice getNomUrl hook
2021-03-18 22:57:37 +01:00
Laurent Destailleur
9ba568eb25 Fix security check 2021-03-18 20:57:50 +01:00
Laurent Destailleur
461d748f97 Fix #yogosha235 2021-03-18 20:27:36 +01:00
Alexis LAURIER
5b72193f0d invoice list - ajust hooks 2021-03-18 17:06:49 +01:00
Alexis LAURIER
ada5d728b5 invoice list - ajust hooks 2021-03-18 17:00:57 +01:00
Alexis LAURIER
06bc999614 Add group by and having hooks on invoice list 2021-03-18 16:51:02 +01:00
Alexis LAURIER
c3f8e0e397 invoice list - add new standard hook 2021-03-18 16:21:54 +01:00
Laurent Destailleur
640f5f6051 FIx #yogosha5661 2021-03-18 14:41:48 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Laurent Destailleur
d2ef4b0506 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/opensurvey/card.php
	htdocs/opensurvey/index.php
	htdocs/opensurvey/results.php
2021-03-18 12:24:34 +01:00
Alexis LAURIER
b416223194 fix 2021-03-18 11:16:49 +01:00
Alexis LAURIER
c33347b461 add invoice getNomUrl hook 2021-03-18 11:10:43 +01:00
Frédéric FRANCE
75cf5e3599 fix php8 warning 2021-03-17 23:55:46 +01:00
Laurent Destailleur
73e55f1b73 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-17 18:44:47 +01:00
Laurent Destailleur
0da5c89973 Look and feel v14 2021-03-17 18:24:37 +01:00
Laurent Destailleur
1f9d4eca3d Merge pull request #16746 from frederic34/patch-8
fix php8 warnings
2021-03-17 17:00:22 +01:00
Laurent Destailleur
22ed95a629 Look and feel v14 2021-03-16 19:09:56 +01:00
Laurent Destailleur
26dc3ef1b0 FIX Filter on debit/credit
Conflicts:
	htdocs/compta/bank/bankentries_list.php
2021-03-16 18:59:28 +01:00
Laurent Destailleur
9ea7c92b1b FIX Filter on debit/credit 2021-03-16 18:56:10 +01:00
Frédéric FRANCE
519b08b782 fix php8 warnings 2021-03-16 18:25:25 +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
Laurent Destailleur
26931a7e52 Merge pull request #16705 from dolibit-ut/patch-86
Update card.php
2021-03-16 10:36:27 +01:00
Laurent Destailleur
8a23d515e9 Merge pull request #16715 from frederic34/patch-12
fix php8 warning
2021-03-16 10:31:09 +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
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Frédéric FRANCE
50cd8274a5 fix php8 warning 2021-03-15 21:07:30 +01:00
UT from dolibit
7b8d2e55b7 Update card.php
$helpurl = "EN:Module_Banks_and_Cash";
2021-03-15 19:46:51 +01:00
Laurent Destailleur
dfda1bfa0d Merge pull request #16686 from frederic34/patch-5
fix php8 warning
2021-03-15 17:16:52 +01:00
Frédéric FRANCE
99cd866eba fix php8 warning 2021-03-15 15:12:10 +01:00
Frédéric FRANCE
691b8d5976 fix php8 warning 2021-03-15 14:05:05 +01:00
Laurent Destailleur
3964801d40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-03-15 13:26:20 +01:00
Laurent Destailleur
85eaec48e1 Merge pull request #16307 from aspangaro/14a15
NEW: VAT report - Optimisation & collapse by rate
2021-03-15 11:56:06 +01:00
Laurent Destailleur
a1cfacfa9e Merge pull request #16652 from frederic34/patch-9
fix php8 warnings
2021-03-15 11:09:23 +01:00