Laurent Destailleur
|
8a62d97b89
|
Remove one thousand of useless files
|
2021-04-12 15:57:16 +02:00 |
|
Alexandre SPANGARO
|
2a1a22763d
|
Work on split module fournisseur
|
2021-04-12 06:51:00 +02:00 |
|
Laurent Destailleur
|
1e1b963ca7
|
Restriction on name of files
|
2021-04-07 19:38:54 +02:00 |
|
Alexandre SPANGARO
|
f64d0377c5
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-04-04 06:03:41 +02:00 |
|
Givriz
|
5ed01f6733
|
Fix errors phpv8
|
2021-04-03 17:09:14 +02:00 |
|
Laurent Destailleur
|
cadef101db
|
Fix var name
|
2021-04-02 21:40:33 +02:00 |
|
Laurent Destailleur
|
32287d8734
|
Merge pull request #17036 from dolibit-ut/patch-196
Update box_supplier_orders_awaiting_reception.php
|
2021-03-30 19:18:20 +02:00 |
|
UT from dolibit
|
479421d923
|
Update box_supplier_orders_awaiting_reception.php
https://
|
2021-03-30 18:30:07 +02:00 |
|
UT from dolibit
|
0203eab0b0
|
Update box_accountancy_suspense_account.php
https://
|
2021-03-30 18:28:07 +02:00 |
|
Laurent Destailleur
|
3744bc6a7a
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 18:17:13 +02:00 |
|
Laurent Destailleur
|
a4987c6e4f
|
Merge branch 'develop' into 14a22
|
2021-03-29 20:35:35 +02:00 |
|
Laurent Destailleur
|
a23a2a0119
|
Merge pull request #16988 from daraelmin/daraelmin-patch-excluded
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
|
2021-03-29 17:39:58 +02:00 |
|
daraelmin
|
8a43d65476
|
Copyright box_members_by_type.php
|
2021-03-29 07:49:15 +02:00 |
|
Alexandre SPANGARO
|
2a1cc04b66
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-28 06:16:33 +02:00 |
|
stickler-ci
|
6a9d6a8634
|
Fixing style errors.
|
2021-03-27 12:44:34 +00:00 |
|
daraelmin
|
bad5aa6468
|
fix excluded member color in graph
|
2021-03-27 13:39:15 +01:00 |
|
daraelmin
|
c8a455edf4
|
add excluded memer on graph
|
2021-03-27 13:14:59 +01:00 |
|
Laurent Destailleur
|
01c1101b29
|
Look and feel v14
|
2021-03-26 18:16:12 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
Laurent Destailleur
|
4ac5d32c48
|
Fix picto
|
2021-03-21 22:27:12 +01:00 |
|
Laurent Destailleur
|
9d1dcccb86
|
Fix css
|
2021-03-21 22:15:37 +01:00 |
|
Laurent Destailleur
|
e334e83a64
|
Merge branch 'develop' into 14a22
|
2021-03-20 13:42:54 +01:00 |
|
Regis Houssin
|
573ca669da
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8
|
2021-03-20 12:11:12 +01:00 |
|
Laurent Destailleur
|
ee84bef3b2
|
Merge pull request #16828 from frederic34/membersboxfix
fix new boxes add
|
2021-03-20 11:52:19 +01:00 |
|
Laurent Destailleur
|
810b15f73a
|
Merge pull request #16875 from frederic34/patch-25
fix doxygen
|
2021-03-20 11:14:57 +01:00 |
|
Frédéric FRANCE
|
65c3dced1c
|
fix doxygen
|
2021-03-20 10:34:23 +01:00 |
|
Frédéric FRANCE
|
5da597d947
|
fix doxygen
|
2021-03-20 10:32:18 +01:00 |
|
Laurent Destailleur
|
b5264e978b
|
Merge pull request #16776 from frederic34/boxticket
fix php8 warnings
|
2021-03-20 10:14:34 +01:00 |
|
Regis Houssin
|
43e1dbb9ef
|
FIX avoid php8 warning with multicompany
|
2021-03-19 11:27:31 +01:00 |
|
Frédéric FRANCE
|
7183bfeb94
|
fix new boxes add
|
2021-03-19 09:15:35 +01:00 |
|
Laurent Destailleur
|
b9aacca771
|
Fix css
|
2021-03-19 00:04:43 +01:00 |
|
Laurent Destailleur
|
27c7950417
|
Fix migration of boxes
|
2021-03-18 23:39:19 +01:00 |
|
Frédéric FRANCE
|
5b253eeb47
|
fix the fix
|
2021-03-18 23:30:42 +01:00 |
|
Frédéric FRANCE
|
0080d42b66
|
fix php8 warnings
|
2021-03-17 21:49:05 +01:00 |
|
Frédéric FRANCE
|
e1ad7013d9
|
fix php8
|
2021-03-16 17:47:24 +01:00 |
|
Alexandre SPANGARO
|
6e17a588bb
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-16 03:26:28 +01:00 |
|
Frédéric FRANCE
|
c437b2d5c9
|
fix php8 warning
Undefined property: stdClass::$fin_validite
Undefined property: stdClass::$date_cloture
$dateterm, $dateclose, $late not used
|
2021-03-15 20:28:37 +01:00 |
|
Frédéric FRANCE
|
0cbf57327b
|
fiw php8 warnings
|
2021-03-14 18:18:21 +01:00 |
|
Laurent Destailleur
|
82d5c7289d
|
Add property widgettype
|
2021-03-10 17:02:39 +01:00 |
|
Laurent Destailleur
|
521e3b20dc
|
Rename widget
|
2021-03-10 16:44:46 +01:00 |
|
Laurent Destailleur
|
c2200e6ffd
|
Clean code
|
2021-03-10 16:41:48 +01:00 |
|
Laurent Destailleur
|
514a9fb96a
|
Merge pull request #16561 from Hystepik/develop#1
Close #15917 : Improvement to ticket module
|
2021-03-10 15:49:20 +01:00 |
|
Frédéric FRANCE
|
de1cf54e2f
|
Update box_members_by_type.php
|
2021-03-09 00:20:28 +01:00 |
|
lmarcouiller
|
b71a8c5d6f
|
Close #15917 : boxes on ticket index
|
2021-03-08 15:26:35 +01:00 |
|
lmarcouiller
|
d8a74bad93
|
update for continuous integration
|
2021-03-08 13:58:23 +01:00 |
|
lmarcouiller
|
8c7764ed5d
|
Move of 2 graph in boxes
|
2021-03-08 12:18:55 +01:00 |
|
Frédéric FRANCE
|
22bc3b879b
|
new box replace
|
2021-03-02 22:21:34 +01:00 |
|
Frédéric FRANCE
|
d68de8617b
|
new box replace
|
2021-03-02 22:00:09 +01:00 |
|
Frédéric FRANCE
|
742c12f9d6
|
rename new boxes
|
2021-03-02 20:58:21 +01:00 |
|
Frédéric FRANCE
|
6cf8a46095
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-03-02 20:41:01 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Frédéric FRANCE
|
8c45137b37
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-03-01 12:55:45 +01:00 |
|
Alexandre SPANGARO
|
7a3dfda8ee
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 21:30:25 +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 |
|
Alexandre SPANGARO
|
ca7958f273
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-28 07:32:23 +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
|
7dace2f459
|
Show 3 years in graph of widget by default.
|
2021-02-27 18:38:32 +01:00 |
|
Frédéric FRANCE
|
554e449e40
|
code syntax core directory
|
2021-02-23 22:03:23 +01:00 |
|
Alexandre SPANGARO
|
d9e03e1373
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-22 14:10:38 +01:00 |
|
Frédéric FRANCE
|
84a5f69834
|
fix propal sqls
|
2021-02-22 13:14:13 +01:00 |
|
Frédéric FRANCE
|
58f301389c
|
fix box activity
|
2021-02-22 12:08:22 +01:00 |
|
Alexandre SPANGARO
|
22c936ba19
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-02-22 11:28:36 +01:00 |
|
Alexandre SPANGARO
|
ae4fc565e1
|
Widget & commonobject
|
2021-02-22 05:38:31 +01:00 |
|
Alexandre SPANGARO
|
ddea3f8a92
|
Code enhanced - Standardize field name #14697
|
2021-02-21 21:47:26 +01:00 |
|
Laurent Destailleur
|
e3419df36e
|
Merge branch 'develop' into 14a20
|
2021-02-21 20:28:06 +01:00 |
|
Frédéric FRANCE
|
997dee67af
|
fix propal box
|
2021-02-20 17:42:51 +01:00 |
|
Alexandre SPANGARO
|
3dcfe40e71
|
Code enhanced - Standardize field name #14697
|
2021-02-20 08:00:27 +01:00 |
|
Laurent Destailleur
|
026259ebd7
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
|
2021-02-15 13:12:27 +01:00 |
|
Laurent Destailleur
|
4c3a96da08
|
FIX #16150
|
2021-02-10 02:57:08 +01:00 |
|
Laurent Destailleur
|
5966e63120
|
Fix css
|
2021-02-08 20:01:10 +01:00 |
|
Laurent Destailleur
|
925d81d1b3
|
Merge pull request #16002 from Hystepik/develop#1
New update of funnel of prospection
|
2021-02-08 18:05:48 +01:00 |
|
Frédéric FRANCE
|
dbe5c23ed5
|
Update box_produits_alerte_stock.php
|
2021-02-07 19:45:18 +01:00 |
|
Frédéric FRANCE
|
58a39a263b
|
Update box_produits.php
|
2021-02-07 19:44:09 +01:00 |
|
Frédéric FRANCE
|
ebe7e1464a
|
fix html
|
2021-02-07 19:38:46 +01:00 |
|
Laurent Destailleur
|
f301635681
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2021-02-03 21:02:32 +01:00 |
|
Laurent Destailleur
|
348fd0fcb5
|
FIX #16160
|
2021-02-03 19:36:10 +01:00 |
|
Laurent Destailleur
|
4d029194d3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/ajax.lib.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
|
2021-02-02 13:22:23 +01:00 |
|
Laurent Destailleur
|
1fd2f12673
|
Fix responsive
|
2021-02-02 11:16:25 +01:00 |
|
Laurent Destailleur
|
3b9bd3cc40
|
Fix responsive
|
2021-02-02 11:15:16 +01:00 |
|
Laurent Destailleur
|
218a76ee63
|
FIX SQL Error with postgres or mysql strict mode
|
2021-02-02 11:06:58 +01:00 |
|
Laurent Destailleur
|
a4c0459c1e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/user/list.php
|
2021-01-27 21:09:01 +01:00 |
|
Frédéric FRANCE
|
22522f5aa2
|
fix include
|
2021-01-25 17:06:25 +01:00 |
|
Frédéric FRANCE
|
e8c4db2188
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-01-19 11:36:59 +01:00 |
|
lmarcouiller
|
afab5a977a
|
dolgrap.class.php with frederic34 advices 2
|
2021-01-19 09:43:06 +01:00 |
|
lmarcouiller
|
fd888be5e5
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
|
2021-01-19 09:05:08 +01:00 |
|
Laurent Destailleur
|
f95bf56c15
|
Fix translation
|
2021-01-18 15:24:50 +01:00 |
|
lmarcouiller
|
383281e5f3
|
New update of funnel of prospection
|
2021-01-18 11:32:02 +01:00 |
|
Frédéric FRANCE
|
83b7e3c678
|
fix unknown variable
|
2021-01-18 08:01:18 +01:00 |
|
Frédéric FRANCE
|
c8d1410e33
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-01-16 21:06:12 +01:00 |
|
Laurent Destailleur
|
a4109d3fd0
|
Merge pull request #15600 from Hystepik/develop#2
Close #15384 : New widget stat database
|
2021-01-16 18:42:50 +01:00 |
|
Frédéric FRANCE
|
216da52972
|
Merge remote-tracking branch 'upstream/develop' into patch-8
|
2021-01-16 14:00:05 +01:00 |
|
Frédéric FRANCE
|
871f762546
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-01-16 13:58:27 +01:00 |
|
Laurent Destailleur
|
c7c74e8ed1
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/facture/card.php
|
2021-01-15 19:53:46 +01:00 |
|
Laurent Destailleur
|
ea266c1f2d
|
Fix missing alias
|
2021-01-15 17:59:08 +01:00 |
|
Frédéric FRANCE
|
225c68d5e6
|
Update box_members.php
|
2021-01-13 22:00:40 +01:00 |
|
Laurent Destailleur
|
7f04307adf
|
Merge branch 'develop' into develop#2
|
2021-01-13 17:40:21 +01:00 |
|
Frédéric FRANCE
|
e2c57584b7
|
Merge remote-tracking branch 'upstream/develop' into boxindex
|
2021-01-12 23:47:24 +01:00 |
|
Laurent Destailleur
|
f411b29b28
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/accountancy.lang
|
2021-01-09 02:34:43 +01:00 |
|
Laurent Destailleur
|
b3461161ec
|
Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH
|
2021-01-09 02:28:50 +01:00 |
|