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

813 Commits

Author SHA1 Message Date
Stephane Lesage
3161f35971 Fix boxes third-parties information 2020-12-08 14:08:32 +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
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
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
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
aafac6f989 Fix box of events 2020-10-30 18:58:40 +01:00
Laurent Destailleur
45477aba0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:50 +01:00
Laurent Destailleur
c187b41714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:39 +01:00
Laurent Destailleur
ee4a827627 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/db/DoliDB.class.php
 2020-10-29 13:10:10 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Frédéric FRANCE
6fc4b1b839
add small photo in box members 2020-10-27 08:17:12 +01:00
Frédéric FRANCE
da4f3fab14
dol_print_date called with a bad value 2020-10-27 08:10:19 +01:00
Laurent Destailleur
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-26 18:17:23 +01:00
Laurent Destailleur
9dfc08d2bd Fix bad var name 2020-10-25 21:11:05 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Maxime Kohlhaas
7080c8491d Fix var name in contract box 2020-10-24 19:46:57 +02:00
Regis Houssin
c0981128ff FIX wrong object name 2020-10-19 17:10:38 +02:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Laurent Destailleur
3d68ab4059
Update box_services_contracts.php 2020-10-15 20:28:27 +02:00
Alfredo Altamirano
4a3ffbb6d4 FIX #14927 Change ContratLigne property type to product_type 
This bug is produced because the ContratLigne class gives a property type instead of a product_type
 2020-10-14 22:17:50 -05:00
Alexandre SPANGARO
8876457b54 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-10 06:47:05 +02:00
Laurent Destailleur
28e462e507 Debug a box with sql and performance errors 2020-10-09 16:49:23 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Laurent Destailleur
254d9edbb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 13:18:58 +02:00
Aurélien
5571a166c6
change variable #14697 2020-10-06 11:37:55 +02:00
Laurent Destailleur
63415e9728 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_shipments.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2020-10-04 23:27:52 +02:00
ptibogxiv
4aafe72bf2
Fix multicompany in activity box 2020-10-04 14:19:53 +02:00
Laurent Destailleur
f217959740 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-03 14:51:30 +02:00
Laurent Destailleur
ca0dcb4db0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_supplier_orders.php
 2020-10-03 14:51:18 +02:00
Laurent Destailleur
9e48920e1d
Merge pull request #14902 from ptibogxiv/patch-368 
Fix multicompany in order box
 2020-10-03 14:15:11 +02:00
Laurent Destailleur
08afb586f8
Merge pull request #14903 from ptibogxiv/patch-369 
Fix multicompany in propal box
 2020-10-03 14:13:29 +02:00
Laurent Destailleur
71ab4c4a70
Merge pull request #14905 from ptibogxiv/patch-371 
Fix multicompany in supplier order awaiting box
 2020-10-03 14:12:57 +02:00
ptibogxiv
af2bd76500
Fix multicompany in shipment box 2020-10-03 14:06:33 +02:00
ptibogxiv
69660d1a9d
Update box_supplier_orders.php 2020-10-03 14:02:59 +02:00
ptibogxiv
331db5e367
Fix multicompany in supplier order awaiting box 2020-10-03 14:01:46 +02:00
ptibogxiv
26a2fea8c7
Fix multicompany in supplier order box 2020-10-03 14:00:23 +02:00
ptibogxiv
e9c101349b
Fix multicompany in propal box 2020-10-03 13:57:37 +02:00
ptibogxiv
3840d6c0a7
Fix entity in ordre box 2020-10-03 13:52:52 +02:00
Laurent Destailleur
1a535dc77b Clean code 2020-10-02 19:00:15 +02:00
Laurent Destailleur
ed2dd3f55f Clean code 2020-09-24 22:02:10 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
d75e1e5771 Fix #yogosha4525 2020-09-18 16:10:11 +02:00
Laurent Destailleur
eae5410ced Protect md file 2020-09-17 16:57:39 +02:00
Laurent Destailleur
1bdd4cae9b
Merge pull request #14699 from atm-adrien/NEW_add_widget_empty_tasks 
New add widget empty tasks
 2020-09-12 01:18:50 +02:00
Laurent Destailleur
ead320642e Fix removed some non used sql requests on widgets 2020-09-12 00:58:06 +02:00
Laurent Destailleur
753396ec20 Look and feel v13 2020-09-11 12:19:40 +02:00
Laurent Destailleur
7cd437b2d7 CSS 2020-09-11 12:16:54 +02:00
stickler-ci
0fc24366e1 Fixing style errors. 2020-09-10 09:28:05 +00:00
Adrien Raze
419b2b71a9 FIX : modif requete SQL, prise en compte user connecté pour saisie des temps 2020-09-10 11:16:52 +02:00
Adrien Raze
acfae190c3 FIX : suppression lien nbTâche 2020-09-10 11:15:56 +02:00
Adrien Raze
5a30165947 FIX : correction redirection pour nbTache 2020-09-10 11:15:12 +02:00
Adrien Raze
343b39e31f FIX : lien cliquable tiers 2020-09-10 11:14:27 +02:00
Adrien Raze
281b52db75 lien cliquable nbTache vers liste tache filtrée 2020-09-10 11:13:46 +02:00
Adrien Raze
76d5ce18ca Titres + lien cliquable client + traductions 2020-09-10 11:12:04 +02:00
Adrien Raze
c9833c501d SQL + insertion champs dans box 2020-09-10 11:10:06 +02:00
Adrien Raze
912999a6b6 Creation box 2020-09-10 11:09:49 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2020-08-17 19:59:17 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Ferran Marcet
10df9777b5 FIX: Visualization rights correction on last modified contacts box 2020-08-10 09:53:20 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00