Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

2500 Commits

Author SHA1 Message Date
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
eeb219cb55 Revert "NEW sorting elements on project overview" 2020-03-06 14:52:29 +01:00
Laurent Destailleur
48661ad88e Merge pull request #13290 from TobiasSekan/NewSortingForProjectOverview 
NEW sorting elements on project overview
 2020-03-06 14:44:48 +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
d4b67a6cef Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/core/lib/functions.lib.php
 2020-03-06 14:19:30 +01:00
Laurent Destailleur
aaf9aef5c8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/contrat/list.php
 2020-03-06 14:17:21 +01:00
Tobias Sekan
eceaf5b321 Fix Travis CI error 2020-03-06 12:09:50 +01:00
Tobias Sekan
8c115a07b0 Fix lint errors 2020-03-06 11:49:49 +01:00
stickler-ci
03b8c86c06 Fixing style errors. 2020-03-06 10:45:35 +00:00
Tobias Sekan
acd7366d64 fix not working unlink 2020-03-06 11:33:42 +01:00
Tobias Sekan
3e58cc4c02 Fix build errors 2020-03-06 11:25:02 +01:00
Tobias Sekan
05e76ba122 Fix wrong merge (new MRP things was missing) 2020-03-06 10:21:34 +00:00
ATM-Nicolas
a9d7bbc2ed FIX : Remove unexisting link 2020-03-06 09:52:19 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Tobias Sekan
a155409bc2 Add sorting for project overview columns 2020-03-05 14:16:56 +01:00
Laurent Destailleur
fc31680bd0 Several fix for chart.js graphs 2020-03-05 02:55:06 +01:00
Laurent Destailleur
aa1552dbc0 Enhance graphs 2020-03-05 00:17:16 +01:00
Laurent Destailleur
a6d340a22c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2020-03-04 19:28:15 +01:00
Christian Foellmann
55dc3d36ac fix broken categories on "contacts" tab of project 2020-03-04 19:25:48 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
a22296ca72 Trans 2020-03-03 15:19:37 +01:00
Laurent Destailleur
b587ac6936 FIX responsive 2020-03-03 15:14:27 +01:00
Laurent Destailleur
be30667dbe FIX responsive 2020-03-03 15:13:55 +01:00
Laurent Destailleur
61abfb95a5 Look and feel v12 2020-02-25 13:28:11 +01:00
Frédéric FRANCE
327b827fb4 avoid warning if not an array 
Conflicts:
	htdocs/projet/element.php
 2020-02-21 18:01:04 +01:00
Laurent Destailleur
964b8d74f6 Merge pull request #13160 from frederic34/patch-8 
avoid warning if not an array
 2020-02-21 17:58:50 +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
Frédéric FRANCE
4801117c37 avoid warning if not an array 2020-02-21 09:24:24 +01:00
Laurent Destailleur
0c571c0376 Restore common behaviour: Draft object are on left under graph. 
Open and live objects are on right
 2020-02-19 14:20:55 +01:00
Laurent Destailleur
9883c0b688 Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount 
NEW add weighted amount on project/opportunity
 2020-02-19 00:03:03 +01:00
Laurent Destailleur
973539db39 Update index.php 2020-02-18 23:59:53 +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
24bb61b5e4 FIX Usage of project not available in export. 2020-02-18 12:51:53 +01:00
Laurent Destailleur
7b4c674bdc Fix css 2020-02-17 21:43:53 +01:00
Laurent Destailleur
1d760f0e42 Add MO in project overwiew 2020-02-17 21:24:59 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Laurent Destailleur
5d04775164 Fix missing categorie class 2020-02-09 15:14:01 +01:00
Laurent Destailleur
0a912f4e8a Fix missing class 2020-02-08 18:18:22 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Laurent Destailleur
5e4e02337b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-03 02:50:44 +01:00
Laurent Destailleur
90cde17bdb FIX #12986 2020-02-03 02:48:05 +01:00
Laurent Destailleur
fc1d6c1971 Merge pull request #13001 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2020-02-02 20:26:23 +01:00
Laurent Destailleur
12b63606df Fix look and feel of v11 2020-02-02 20:21:16 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-02 18:34:09 +00:00
stickler-ci
01b1667eed Fixing style errors. 2020-02-02 08:13:09 +00:00
ATM john
fe009c3842 Fix project profit for loan part 2020-02-02 09:06:02 +01:00
ATM john
e59d118b8c Fix project loan data 2020-02-02 06:36:06 +01:00
atm-quentin
398e83d1cc FIX for stickler 2020-01-31 11:36:53 +01:00
stickler-ci
fee113bfb5 Fixing style errors. 2020-01-31 10:26:33 +00:00