Florian HENRY
|
0f7144a391
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus
|
2021-03-02 11:05:20 +01:00 |
|
Florian HENRY
|
0f51072222
|
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2021-03-02 11:01:02 +01:00 |
|
Florian HENRY
|
17c8a32780
|
fix civility createion PK
|
2021-03-02 11:00:16 +01:00 |
|
Florian HENRY
|
593ae78761
|
avoid php wrning
|
2021-03-02 10:55:23 +01:00 |
|
atm-lena
|
2d2e76ee7f
|
Affichage conf
|
2021-03-02 10:07:23 +01:00 |
|
Florian HENRY
|
d063533efb
|
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
|
2021-03-02 09:46:05 +01:00 |
|
Florian HENRY
|
d7500b1609
|
fix php warning
|
2021-03-02 09:45:49 +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
|
23e8401e61
|
FIX #16296
|
2021-03-02 01:22:23 +01:00 |
|
Laurent Destailleur
|
cffea1889f
|
FIX #16325
|
2021-03-02 01:17:28 +01:00 |
|
Laurent Destailleur
|
88a3454ba8
|
FIX #16366
|
2021-03-02 00:48:02 +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
|
3b428004d8
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-03-02 00:09:44 +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 |
|
andreubisquerra
|
5bb7c521aa
|
Update dolreceiptprinter.class.php
|
2021-03-01 23:30:38 +01:00 |
|
andreubisquerra
|
15cc0f8775
|
Avoid php errors if negative var in Receipt Module
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
|
2021-03-01 23:09:07 +01:00 |
|
Laurent Destailleur
|
b8bd5cd0ee
|
FIX Protection to avoid #16504
|
2021-03-01 23:08:03 +01:00 |
|
Laurent Destailleur
|
fb0eda446e
|
Fix bad break
|
2021-03-01 22:00:48 +01:00 |
|
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 |
|