Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,585 Commits 36 Branches 190 Tags
71e22ee11b04f70e3b51b10cf4d9cd84b2877832
Commit Graph

632 Commits

Author SHA1 Message Date
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
altairis
6618205e6f fix missing class declaration 2020-03-12 15:05:32 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
fc05e8d768 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/other.lang
 2020-03-11 18:03:15 +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
d0f22c7bff Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_graph_product_distribution.php
 2020-03-06 14:22:42 +01:00
Laurent Destailleur
ad9d0a3472 Fix graph of product distribution when too much record 2020-03-06 12:45:02 +01:00
Laurent Destailleur
5ff4b638a5 FIX empty of series in graph of product distribution 2020-03-06 12:00:40 +01:00
Laurent Destailleur
8e9d4e408f FIX empty of series in graph of product distribution 2020-03-06 11:59:06 +01:00
Laurent Destailleur
e2396919d4 FIX chart of product distribution 2020-03-06 11:52:32 +01:00
Laurent Destailleur
fc31680bd0 Several fix for chart.js graphs 2020-03-05 02:55:06 +01:00
Laurent Destailleur
0646b1a7a9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
 2020-02-26 17:04:14 +01:00
Laurent Destailleur
9c1c0ee08f Fix for nojs interface 2020-02-26 16:17:31 +01:00
Laurent Destailleur
8ebc157316 Test color magenta for titles 2020-02-24 06:55:08 +01:00
Laurent Destailleur
096a568e83 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-02-23 23:42:23 +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
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Ferran Marcet
9ff424e23b FIX: Visualization rights correction on last modified contacts box 2020-02-20 11:45:46 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +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
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
 2020-02-18 22:40:43 +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
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +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
4765198af2 Clean code from using deprecated field amount 2020-02-02 19:03:37 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00: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
Frédéric FRANCE
9fdd1357d0 The variable $num does not seem to be defined for all execution paths 2019-12-16 20:21:06 +01:00
Frédéric FRANCE
9357bfd98e doxygen 2019-12-12 08:17:14 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Laurent Destailleur
3a687b1dae Fix box of task hidden if tasks are not used 2019-11-26 17:44:21 +01:00
Alexandre SPANGARO
f4e1361d06 NEW small fix 2019-11-22 06:53:05 +01:00