lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,517 Commits 43 Branches 150 Tags 886 MiB
f219c9454a
Commit Graph

95517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f219c9454a
Merge pull request #16251 from Hystepik/develop#5 
Close #16218 : new button sitemap file
 2021-03-02 14:56:10 +01:00
Laurent Destailleur
13e1ccb795
Update index.php 2021-03-02 14:55:42 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus 
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
 2021-03-02 14:45:05 +01:00
Laurent Destailleur
3a00952cd1
Update user.class.php 2021-03-02 14:44:31 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
Laurent Destailleur
2d200a523d
Merge pull request #16505 from frederic34/fixmerge 
fix merge
 2021-03-02 12:42:12 +01:00
Laurent Destailleur
25b2de4874 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-02 12:40:00 +01:00
Laurent Destailleur
ba04c94b2d
Merge pull request #16502 from frederic34/patch-3 
fix typo
 2021-03-02 12:39:26 +01:00
Laurent Destailleur
a161edefb1 Look and feel v14 2021-03-02 12:33:55 +01:00
Florian HENRY
812d3279b3 Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:05:20 +01:00
Frédéric FRANCE
883faf6f43
Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-02 08:13:33 +01:00
Laurent Destailleur
07aa533add Disable box not related to page 2021-03-02 03:08:29 +01:00
Laurent Destailleur
d6b81b21f1 fix phpcs 2021-03-02 03:03:41 +01:00
Laurent Destailleur
7f209f7cc7 Clean code 2021-03-02 02:55:24 +01:00
Laurent Destailleur
592dacd849 Fix phpcs 2021-03-02 02:45:39 +01:00
Laurent Destailleur
5d6ada77ca Fix test 2021-03-02 02:42:04 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Laurent Destailleur
ebc3210308 FIX #16343 2021-03-02 01:58:36 +01:00
Laurent Destailleur
f1f950e8b7 Close #16395 - Can filter on proposal source in list 2021-03-02 00:11:15 +01:00
Frédéric FRANCE
c54a61bb67
fix 2021-03-01 23:54:03 +01:00
Frédéric FRANCE
284cdaf845
Merge remote-tracking branch 'upstream/develop' into patch-3 2021-03-01 23:43:47 +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
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
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
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
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