Commit Graph

95736 Commits

Author SHA1 Message Date
Laurent Destailleur
5e4b18ca4d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-01 19:42:10 +01:00
Laurent Destailleur
0ac5e37066 Update date of ticket in demo 2021-03-01 19:41:51 +01:00
Florian HENRY
0edae6e19a add class default values 2021-03-01 18:25:23 +01:00
Frédéric FRANCE
eb62750aab
fix typo 2021-03-01 18:06:03 +01:00
Laurent Destailleur
1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php
2021-03-01 17:46:36 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
stickler-ci
d20ba5a665 Fixing style errors. 2021-03-01 15:38:15 +00:00
Gauthier PC portable 024
861b583668 FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice 2021-03-01 16:34:42 +01:00
Juanjo Menent
96eb7a341a FIX: Bad project filter in ticket list 2021-03-01 16:14:38 +01:00
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
Florian HENRY
5ba9ffeb09 change comlumn name 2021-03-01 15:36:50 +01:00
Florian HENRY
036d1d5802 change comlumn name 2021-03-01 15:36:22 +01:00
Florian HENRY
e101ff0d6d change comlumn name 2021-03-01 15:34:02 +01:00
Laurent Destailleur
c5dac4854a
Merge pull request #16474 from bafbes/abb120370
fix:fk_region links to region code field and not to the rowid's
2021-03-01 14:16:14 +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
8bc3cf37ec
Merge pull request #16490 from frederic34/cron_code_syntax
code syntax cron directory
2021-03-01 14:03:39 +01:00
Laurent Destailleur
12f756aa7d
Merge pull request #16492 from aspangaro/14a23
Fix Code enhanced - Standardize field name
2021-03-01 14:03:27 +01:00
Laurent Destailleur
5cddd0465c Fix trans 2021-03-01 13:25:54 +01:00
Frédéric FRANCE
82aea0be9a
remove rule exception 2021-03-01 11:26:00 +01:00
Laurent Destailleur
81f1bee10c Fix option DONATION_USE_THIRDPARTIES 2021-03-01 11:18:14 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +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
lmarcouiller
b097e909a6 changes to fix pr with eldy advices 2021-03-01 09:52:34 +01:00
Hystepik
460bc2dbde
Merge branch 'develop' into develop#5 2021-03-01 09:03:38 +01:00
Frédéric FRANCE
1247ca9e02
add new rule 2021-03-01 08:38:35 +01:00
Frédéric FRANCE
683ef8d1c9
add new rule 2021-03-01 08:32:14 +01:00
Frédéric FRANCE
20aa6919e6
add doc 2021-03-01 08:14:40 +01:00
Frédéric FRANCE
40529cc8a6
add doc 2021-03-01 08:09:04 +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
d0ccdfafb4 FIX stats supplier proposal 2021-03-01 04:12:53 +01:00
Alexandre SPANGARO
abc93446bb Fix list proposal 2021-03-01 04:12:15 +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
Frédéric FRANCE
6f9c639f08
add new rule 2021-03-01 00:48:36 +01:00
Frédéric FRANCE
ed3b637d7a
add new rule 2021-03-01 00:34:15 +01:00
Frédéric FRANCE
63dad7f25c
add new rule 2021-03-01 00:22:36 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
77151bd560 Standardize tabs 2021-02-28 23:53:20 +01:00
Frédéric FRANCE
0a6f307716
code syntax cron directory 2021-02-28 23:47:30 +01:00
Laurent Destailleur
bcdfdae10c FIX #16480 2021-02-28 23:43:07 +01:00
Laurent Destailleur
f7933a6884
Merge pull request #16470 from frederic34/s_code_syntax
code syntax s... t..  dir
2021-02-28 23:37:25 +01:00
Laurent Destailleur
26c8ee170f
Merge pull request #16469 from frederic34/r_code_syntax
code syntax r... dir
2021-02-28 23:37:14 +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