Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
84,048 Commits 36 Branches 189 Tags
50b5226d10547030c0a2cb151935251bb6ec6937
Commit Graph

639 Commits

Author SHA1 Message Date
ATM john
50b5226d10 FIX #15465 External user sees last 5 shipments to other customers in the dashboard 2021-01-06 12:40:38 +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
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
atm-lena
047785b273 FIX - Don't display inactive users in birthday box and soc card 2020-11-06 11:58:36 +01:00
Frédéric FRANCE
da4f3fab14 dol_print_date called with a bad value 2020-10-27 08:10:19 +01:00
Maxime Kohlhaas
7080c8491d Fix var name in contract box 2020-10-24 19:46:57 +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
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
Ferran Marcet
10df9777b5 FIX: Visualization rights correction on last modified contacts box 2020-08-10 09:53:20 +02:00
Maxime Kohlhaas
817e16d652 Fix birthdays boxes and filter on month 2020-04-18 20:01:18 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
altairis
6618205e6f fix missing class declaration 2020-03-12 15:05:32 +01:00
Laurent Destailleur
4903287204 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-03-11 17:04:28 +01:00
Laurent Destailleur
13ffc186b7 Merge pull request #13324 from atm-florianm/FIX_10.0_status_column_empty_in_invoices_box_when_using_MAIN_STATUS_USES_CSS 
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
 2020-03-11 16:41:24 +01:00
Laurent Destailleur
8808b7df87 Merge pull request #13325 from atm-florianm/FIX_10.0_load_langs_in_box_commandes 
FIX 10.0 - missing translations for "orders" homepage "orders" box
 2020-03-11 16:39:43 +01:00
Florian Mortgat
ce01cf278d FIX 10.0 - translations for "orders" not loaded in the homepage box 2020-03-11 11:45:57 +01:00
Florian Mortgat
6d1f62c1d9 FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS 2020-03-11 11:03:19 +01:00
Laurent Destailleur
5ff4b638a5 FIX empty of series in graph of product distribution 2020-03-06 12:00:40 +01:00
Laurent Destailleur
9c1c0ee08f Fix for nojs interface 2020-02-26 16:17:31 +01:00
Laurent Destailleur
3075e40f8c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/boxes/box_contacts.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/security.lib.php
 2020-02-23 23:37:46 +01:00
Laurent Destailleur
5919570b34 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-23 23:31:51 +01:00
Laurent Destailleur
11ff3f6562 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-23 23:31:03 +01:00
Ferran Marcet
9ff424e23b FIX: Visualization rights correction on last modified contacts box 2020-02-20 11:45:46 +01:00
Laurent Destailleur
2cfca2a45e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/index.php
	htdocs/core/boxes/box_fournisseurs.php
	htdocs/core/boxes/box_propales.php
	htdocs/societe/index.php
 2020-02-20 00:18:58 +01:00
Laurent Destailleur
b6be42e103 FIX List of viewed projects too large in task widget 2020-02-18 12:40:50 +01:00
Pierre Ardoin
f8e18a3826 Fix Not displayed email 2020-02-17 19:25:25 +01:00
Pierre Ardoin
a773b86ad1 Fix not displayed value 2020-02-17 19:23:48 +01:00
Pierre Ardoin
29cfd6d857 Fix issue with Multicompany 
Before : can't find photo

Now : ok
 2020-02-17 19:18:22 +01:00
Pierre Ardoin
f1bbe1c64d Fix issue not show photo. 2020-02-17 19:09:58 +01:00
Laurent Destailleur
1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php
 2020-02-05 14:38:19 +01:00
Laurent Destailleur
63ba601906 Update box_project.php 2020-02-05 12:39:00 +01:00
Pierre Ardoin
81ed70ffc7 Update box_project.php 2020-02-05 09:18:39 +01:00
Pierre Ardoin
d5b74a8ca3 Update box_project.php 2020-02-05 09:06:43 +01:00
Pierre Ardoin
262d889700 Update box_project.php 2020-02-05 08:50:51 +01:00
Pierre Ardoin
d93a597a1e Fix Compatbility with Multicompany 
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
 2020-02-04 09:17:02 +01:00
Laurent Destailleur
fa305a1471 Update box_factures_imp.php 2020-01-23 11:14:27 +01:00
AdrianDominik
cc96da2741 Fix: strict mode mysql compatibility 2020-01-23 10:47:52 +01:00