lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97,383 Commits 43 Branches 150 Tags 886 MiB
904dca335a
Commit Graph

97383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f64f53e460 Reduce errors 2021-03-01 21:57:45 +01:00
Laurent Destailleur
5b771eb798 Fix merge of 2 record. 2021-03-01 21:56:14 +01:00
Frédéric FRANCE
13c9a96107
fix phpcs 2021-03-01 21:44:59 +01:00
Frédéric FRANCE
287b215ef0
use tabs 2021-03-01 21:40:22 +01:00
Frédéric FRANCE
f2cdbf6bb2
Merge remote-tracking branch 'upstream/develop' into add_rule 2021-03-01 21:22:34 +01:00
Frédéric FRANCE
b54d9751f5
Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-01 21:19:39 +01:00
Laurent Destailleur
d4512c48cd Fix regression 2021-03-01 21:11:55 +01:00
Frédéric FRANCE
a5974bcf57
fix merge 2021-03-01 21:10:06 +01:00
Laurent Destailleur
b2cb087013 Add DCO file. 2021-03-01 21:01:07 +01:00
Laurent Destailleur
bc5c762b8f Add DCO file. 2021-03-01 21:00:44 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00:00
Florian HENRY
32ef55cd9e working default status/percent for event actioncomm 2021-03-01 20:58:02 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab default envent status 2021-03-01 19:54:30 +01:00
Laurent Destailleur
6e61ae8e56 Fix responsive 2021-03-01 19:50:35 +01:00
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
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +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