Laurent Destailleur
|
6d3834b3b9
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
|
2015-02-23 14:59:24 +01:00 |
|
Laurent Destailleur
|
d3a79c8724
|
Fix default entity guess
|
2015-02-23 14:44:24 +01:00 |
|
aspangaro
|
067af47955
|
Add accountancy field on creation mode and correct rowspan.
|
2015-02-22 08:35:25 +01:00 |
|
aspangaro
|
4bb524d55d
|
Also for edit user.
|
2015-02-22 08:12:40 +01:00 |
|
aspangaro
|
ce247432ee
|
FIXED: Remove condition to show accountancy field on user.
|
2015-02-22 08:05:23 +01:00 |
|
aspangaro
|
ef991e6c5d
|
HTML5 - <center> is deprecated - Need CSS - continue working
|
2014-11-24 06:43:15 +01:00 |
|
Laurent Destailleur
|
e3a8041b0d
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/facture.php
htdocs/user/fiche.php
|
2014-11-16 15:46:08 +01:00 |
|
Andrelec1
|
5742e42689
|
Fix require FormOther !
If agenda module is desable
|
2014-11-05 14:24:02 +01:00 |
|
Laurent Destailleur
|
6bbeaee8fe
|
Fix: Selection of users color was not user owner of event.
|
2014-10-18 15:35:32 +02:00 |
|
aspangaro
|
c1d016a531
|
Add field to select color of the user in user's card
|
2014-10-16 06:20:54 +02:00 |
|
Regis Houssin
|
a2446e51db
|
New: add context "globalcard" for declaring only once all cards
|
2014-10-06 07:20:58 +02:00 |
|
aspangaro
|
0b20369dd7
|
Qual: Renamed all files & links "fiche.php" into "card.php"
|
2014-09-18 21:18:25 +02:00 |
|