Commit Graph

95438 Commits

Author SHA1 Message Date
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Laurent Destailleur
8a602ad143
Merge pull request #16493 from aspangaro/13p8
FIX: Various payment - Missing fields for check transmitter & bank name
2021-03-01 14:11:33 +01:00
Laurent Destailleur
b2cfc431bc
Merge pull request #16489 from aspangaro/13p7
FIX: Total_ht not show in contract link element
2021-03-01 14:07:29 +01:00
Laurent Destailleur
5cddd0465c Fix trans 2021-03-01 13:25:54 +01:00
Laurent Destailleur
81f1bee10c Fix option DONATION_USE_THIRDPARTIES 2021-03-01 11:18:14 +01:00
Laurent Destailleur
a68721c5b4 Fix missing translation 2021-03-01 10:58:06 +01:00
Laurent Destailleur
c80151717e Fix set of payment 2021-03-01 10:45:37 +01:00
Laurent Destailleur
0796bc45b1 Fix amount for some language on public payment page 2021-03-01 10:39:27 +01:00
Alexandre SPANGARO
0abe576fdc FIX: Various payment - Missing fields for check transmitter & bank name 2021-03-01 04:49:06 +01:00
Alexandre SPANGARO
3b1a9cd668 FIX: Total_ht not show in contract link element 2021-03-01 03:18:14 +01:00
Alexandre SPANGARO
0d954cb1c7 FIX: Total_ht not show in contract link element 2021-03-01 03:09:36 +01:00
Laurent Destailleur
77151bd560 Standardize tabs 2021-02-28 23:53:20 +01:00
Laurent Destailleur
bcdfdae10c FIX #16480 2021-02-28 23:43:07 +01:00
Laurent Destailleur
3e52c33bde Fix manual phpunit 2021-02-28 22:52:41 +01:00
Laurent Destailleur
490faec547 FIX Timezone problems
Conflicts:
	htdocs/core/lib/date.lib.php
	test/phpunit/DateLibTest.php
2021-02-28 22:50:21 +01:00
Laurent Destailleur
ae81ab0c7c FIX Timezone problems 2021-02-28 22:44:11 +01:00
Alexandre SPANGARO
de241eced3 FIX: Total_ht not show in contract link element 2021-02-28 22:22:20 +01:00
Laurent Destailleur
a6bc218280 Look and feel v14 2021-02-28 21:34:27 +01:00
Laurent Destailleur
5406de13ee css 2021-02-28 21:33:13 +01:00
Laurent Destailleur
0a0c7fdeb1 FIX hourglass and hide button to pay 2021-02-28 21:15:40 +01:00
Laurent Destailleur
79ed52c3d3 NEW Add last date of modification for website pages in list 2021-02-28 20:49:52 +01:00
Laurent Destailleur
87bc0f9c24 Fix align 2021-02-28 14:28:41 +01:00
Laurent Destailleur
6294ae61a8 Look and feel v14 2021-02-28 14:26:32 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
2021-02-28 13:37:45 +01:00
Laurent Destailleur
2a3b3753a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-28 13:27:38 +01:00
Laurent Destailleur
12ff29cc83
Merge pull request #16468 from frederic34/public_code_syntax
code syntax public dir
2021-02-28 13:26:44 +01:00
Laurent Destailleur
68aebaeade
Merge pull request #16479 from frederic34/update_CommandeFournisseur
add update CommandeFournisseur for api use
2021-02-28 13:26:28 +01:00
Laurent Destailleur
c7d02ef38a
Merge pull request #16471 from frederic34/eventorg_code_syntax
code syntax eventorganization dir
2021-02-28 13:25:44 +01:00
Laurent Destailleur
3a2d300a17
Merge pull request #16472 from frederic34/admin_code_syntax
code syntax admin dir
2021-02-28 13:25:31 +01:00
Laurent Destailleur
0bb304ec33
Merge pull request #16473 from frederic34/patch-3
fix variable name
2021-02-28 13:25:20 +01:00
Laurent Destailleur
dd64c00f8b
Merge pull request #16478 from frederic34/patch-5
fix missing include
2021-02-28 13:24:42 +01:00
Laurent Destailleur
5afc0e33c9
Merge pull request #16475 from frederic34/patch-4
FIX #16465
2021-02-28 13:24:29 +01:00
Laurent Destailleur
1149de1aca FIX #16485 2021-02-28 13:15:24 +01:00
Laurent Destailleur
2ce76133f4 FIX #16487 2021-02-28 12:59:58 +01:00
Laurent Destailleur
3a19cbb062 FIX #16420 #16423 #16488 #16477 2021-02-28 12:47:24 +01:00
Laurent Destailleur
0832c25b5b Look and feel v14 2021-02-28 11:48:35 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00
Laurent Destailleur
4cf2d2317f FIX Status in popup of member in widget 2021-02-27 19:16:14 +01:00
Laurent Destailleur
747acd6764 Trans 2021-02-27 18:53:27 +01:00
Laurent Destailleur
7dace2f459 Show 3 years in graph of widget by default. 2021-02-27 18:38:32 +01:00
Laurent Destailleur
3705409d56 Code change to follow modulebuilder template 2021-02-27 18:33:01 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Frédéric FRANCE
6823eabe63
add update CommandeFournisseur for api use 2021-02-27 10:10:28 +01:00
Frédéric FRANCE
8a782e1d4a
fix missing include
needed by dol_get_last_hour
2021-02-27 09:18:03 +01:00
Frédéric FRANCE
8bfa7565bd
Update commonobject.class.php 2021-02-27 08:52:40 +01:00
Frédéric FRANCE
2cc635fd09
FIX https://github.com/Dolibarr/dolibarr/issues/16465 2021-02-27 08:00:02 +01:00
Laurent Destailleur
4c7d78ffaa Look and feel v14 2021-02-27 03:06:21 +01:00
Laurent Destailleur
cf23df9f28 Fix field hidden by default (not used) 2021-02-27 03:06:05 +01:00
Laurent Destailleur
0f9d9625ad Look and feel v14 2021-02-27 02:49:24 +01:00