lmarcouiller
|
716bb433e8
|
ajout pictogramme graph dans info box head
|
2020-12-10 15:50:18 +01:00 |
|
stickler-ci
|
0a2f656137
|
Fixing style errors.
|
2020-12-10 12:19:43 +00:00 |
|
lmarcouiller
|
4f6923442a
|
fix merge and sql synthax
|
2020-12-10 13:19:10 +01:00 |
|
Hystepik
|
a57b01e9ba
|
Update box_funnel_of_prospection.php
|
2020-12-10 11:12:33 +01:00 |
|
stickler-ci
|
492715811c
|
Fixing style errors.
|
2020-12-10 10:10:12 +00:00 |
|
Hystepik
|
14358f022d
|
Merge branch 'develop' into develop#1
|
2020-12-10 11:09:42 +01:00 |
|
Frédéric FRANCE
|
a256bfeb46
|
fix warnings
|
2020-12-09 17:50:21 +01:00 |
|
lmarcouiller
|
83286d99be
|
funnel horizontal bar
|
2020-12-09 13:31:14 +01:00 |
|
Stephane Lesage
|
3161f35971
|
Fix boxes third-parties information
|
2020-12-08 14:08:32 +01:00 |
|
lmarcouiller
|
401d61dd91
|
resolve auto import by IDE
|
2020-12-08 09:05:31 +01:00 |
|
Hystepik
|
3d674abfae
|
Merge branch 'develop' into develop#2
|
2020-12-08 09:01:20 +01:00 |
|
Laurent Destailleur
|
f21a4e8aed
|
Merge branch 'develop' into develop#3
|
2020-12-07 22:46:36 +01:00 |
|
Hystepik
|
2ac98d06f5
|
Merge branch 'develop' into develop#3
|
2020-12-07 09:03:59 +01:00 |
|
Frédéric FRANCE
|
325951877b
|
fix missing fields in box
|
2020-12-05 08:58:20 +01:00 |
|
Frédéric FRANCE
|
e9a12b5324
|
fix missing fields in box
|
2020-12-05 08:56:17 +01:00 |
|
Frédéric FRANCE
|
e3037c7e1a
|
doxygen
|
2020-12-03 17:33:22 +01:00 |
|
Laurent Destailleur
|
bfe4eb7309
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/emailcollector_card.php
htdocs/core/modules/modProduct.class.php
|
2020-12-03 11:26:53 +01:00 |
|
Laurent Destailleur
|
af4f473c93
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/boxes/box_produits.php
|
2020-12-03 11:22:34 +01:00 |
|
Laurent Destailleur
|
0ad6ee209a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-12-03 11:21:08 +01:00 |
|
lmarcouiller
|
28ac976438
|
Show won on graph
|
2020-12-03 11:14:58 +01:00 |
|
Hystepik
|
4830f4a3b4
|
Merge branch 'develop' into develop#2
|
2020-12-03 11:05:00 +01:00 |
|
lmarcouiller
|
e08f6aeb2b
|
Fix #15383
|
2020-12-03 11:00:29 +01:00 |
|
Hystepik
|
ecb5a3b028
|
Merge branch 'develop' into develop#3
|
2020-12-03 10:12:19 +01:00 |
|
lmarcouiller
|
032116b235
|
changes to not diplay won and lost and add on migration
|
2020-12-03 10:11:16 +01:00 |
|
Laurent Destailleur
|
ea1c55cf1e
|
Fix widgets that has disappeared
|
2020-12-02 15:16:20 +01:00 |
|
Laurent Destailleur
|
409b73fe2c
|
FIX #15582
|
2020-12-02 15:16:04 +01:00 |
|
lmarcouiller
|
c7a31b2458
|
new widget funnel of prospection
|
2020-12-02 14:42:56 +01:00 |
|
Laurent Destailleur
|
c8274f13eb
|
Merge pull request #15582 from Hystepik/develop
Close #15307 New Widget : Encours dépassé
|
2020-12-02 14:01:50 +01:00 |
|
stickler-ci
|
5c3c3d7608
|
Fixing style errors.
|
2020-12-01 15:05:11 +00:00 |
|
lmarcouiller
|
95bc0ff54d
|
update dolibarr_state_board bug fix
|
2020-12-01 15:59:55 +01:00 |
|
lmarcouiller
|
6b5125fed0
|
dev widget state_board, add in user class and clean index
|
2020-12-01 14:50:12 +01:00 |
|
Scrutinizer Auto-Fixer
|
6df4954b20
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-12-01 01:41:19 +00:00 |
|
lmarcouiller
|
ff30021d35
|
Close #15307 Encours dpassé with eldy suggestions
|
2020-11-30 16:50:12 +01:00 |
|
lmarcouiller
|
cee1b3cee4
|
Close : Encours dépassé #15307
|
2020-11-30 14:52:27 +01:00 |
|
lmarcouiller
|
595bb893be
|
Close : Encours dépassé #15307
|
2020-11-30 14:01:56 +01:00 |
|
lmarcouiller
|
6e9a3c05f4
|
Close : Encours dépassé #15307
|
2020-11-30 13:52:02 +01:00 |
|
lmarcouiller
|
00dca7ff9b
|
NEW : Encours dépassé #15307
|
2020-11-30 13:01:45 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
9ce6d87b83
|
Clean code
|
2020-11-27 15:04:58 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Frédéric FRANCE
|
69ea0ea791
|
Update box_produits.php
|
2020-11-23 23:44:15 +01:00 |
|
Frédéric FRANCE
|
c7d886c918
|
fix status on tooltip in box last product
|
2020-11-23 23:25:09 +01:00 |
|
Laurent Destailleur
|
6c42535eb2
|
Maxi debug v13
|
2020-11-16 12:20:18 +01:00 |
|
Laurent Destailleur
|
cbe9fec51d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/ticket/list.php
|
2020-11-15 17:29:19 +01:00 |
|
Mikaël MARTIN
|
0c37d31e04
|
Update box_supplier_orders_awaiting_reception.php
|
2020-11-14 13:01:36 +01:00 |
|
Frédéric FRANCE
|
cce6afbeea
|
fix member status in box
|
2020-11-13 22:22:51 +01:00 |
|
Laurent Destailleur
|
90884d8085
|
Fix compatibility with date_delivery
|
2020-11-11 18:08:40 +01:00 |
|
Laurent Destailleur
|
47b3b30aaa
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
|
2020-11-10 11:10:35 +01:00 |
|
Laurent Destailleur
|
73df033000
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/boxes/box_birthdays.php
|
2020-11-10 11:05:53 +01:00 |
|
atm-lena
|
047785b273
|
FIX - Don't display inactive users in birthday box and soc card
|
2020-11-06 11:58:36 +01:00 |
|