Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

2751 Commits

Author SHA1 Message Date
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
aspangaro
aac88519de Merge remote-tracking branch 'Upstream/develop' into develop-hrm 
Conflicts:
	htdocs/user/card.php
 2015-10-17 07:19:46 +02:00
Laurent Destailleur
df0c6aa5cf Use the new card banner for members 2015-10-16 16:14:33 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Laurent Destailleur
8a32041f16 Clean CSS when option MAIN_MAXTABS_IN_CARD is set 2015-10-15 13:31:44 +02:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
Laurent Destailleur
00c8b27baf Add code comment 2015-10-14 22:04:54 +02:00
Laurent Destailleur
6520ed7a08 Use css not bold title. 
Add missing badge (count of draft records) on draft list.
 2015-10-13 14:09:14 +02:00
Laurent Destailleur
a84ec64ece The new banner tab is available on all tabs of thirdparty. 2015-10-13 13:06:32 +02:00
Laurent Destailleur
918d9b7c18 Fix filter was lost if nothing found 2015-10-13 12:05:24 +02:00
aspangaro
0b54cc4509 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-10-11 21:05:15 +02:00
Laurent Destailleur
618e5f0419 FIX no need to remove file into mail form #3573 2015-10-11 20:47:31 +02:00
Laurent Destailleur
87fad70f4a Revert "FIX no need to remove file into mail form" 2015-10-11 20:42:49 +02:00
Laurent Destailleur
62dd936b08 Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file 
FIX no need to remove file into mail form
 2015-10-11 20:42:42 +02:00
Laurent Destailleur
9a6ac4f457 CSS enhancement 2015-10-11 16:32:46 +02:00
Laurent Destailleur
7fae9450a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-11 15:21:45 +02:00
Laurent Destailleur
bd48ad265d The new banner tab is also on user card now 2015-10-11 15:21:21 +02:00
Laurent Destailleur
0ba6bdb7c2 CSS enhancement 2015-10-11 13:26:22 +02:00
Marcos García de La Fuente
4e9a378f0d Merge branch '3.6' into bug-1776 2015-10-11 12:37:41 +02:00
Laurent Destailleur
6ec77e2ca0 New banner card on contact card. 2015-10-11 12:27:04 +02:00
Laurent Destailleur
fb50daaa40 Fix bad parameter 2015-10-10 16:09:01 +02:00
Laurent Destailleur
0222867a94 The new banner for tab is moved into a shared functions 2015-10-10 12:01:09 +02:00
aspangaro
cd7c5645c7 Add library 2015-10-10 06:38:42 +02:00
Laurent Destailleur
f4f7629037 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511 Start to work on a common banner for tabs (goal is to have a nicer and 
generic part for all element)
 2015-10-10 01:51:12 +02:00
Laurent Destailleur
82428fea68 NEW: Only arrow of current sorted field is visible into table views. 
This save a lot of spaces. You can click on the column title to sort.
This make clickable area larger and click to sort is easier.
 2015-10-09 13:01:50 +02:00
Laurent Destailleur
2fc11a289e When there is no contact, no need to show filters 2015-10-09 00:30:02 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
Laurent Destailleur
6ea05aa311 FIX Bad translation key for project "Overview" 2015-10-06 16:03:47 +02:00
Laurent Destailleur
d92604f646 FIX Link of project must be cickable if user has permission to read all 
projects
FIX Missing information into the alt of project picto
 2015-10-06 00:46:26 +02:00
Laurent Destailleur
17416dba89 Merge pull request #3651 from frederic34/patch-20 
Add badge for number of files in bank's tab
 2015-10-04 20:03:41 +02:00
Frédéric FRANCE
780a5a1996 Update files.lib.php 2015-10-04 19:59:26 +02:00
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
Juanjo Menent
92f4c0d015 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-10-03 16:01:24 +02:00
Juanjo Menent
5d10fc2c77 Merge pull request #3644 from frederic34/patch-14 
can't access documents for bank
 2015-10-03 15:57:58 +02:00
Juanjo Menent
67d28d6991 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-03 14:59:56 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Frédéric FRANCE
7da49a3592 Add badge for number of files in bank's tab 2015-10-03 12:09:42 +02:00
Laurent Destailleur
10b481f47f Fix colspan 2015-10-03 11:15:12 +02:00
Frédéric FRANCE
d451051d97 can't access documents for bank 2015-10-02 16:29:54 +02:00
Laurent Destailleur
43f09dfccf Work on theme 2015-10-02 16:26:08 +02:00
Laurent Destailleur
34adc60d26 Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company 
FIX error in SQL due to a previous fix
 2015-10-01 10:35:07 +02:00
Laurent Destailleur
d4b5256f18 Merge pull request #3611 from atm-alexis/develop 
FIX there is no way to hide or change qty by hook
 2015-10-01 10:27:26 +02:00
Laurent Destailleur
747c49862c Try to solve a flush pb 2015-09-30 19:15:45 +02:00
Laurent Destailleur
1108656d19 NEW Can set color of the highlight hover line 2015-09-29 15:58:24 +02:00
Alexis ALGOUD
453ed8a05e FIX error in SQL due to a previous fix 2015-09-28 15:36:27 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00