aspangaro
|
9dadd16724
|
FIXED: Correct problem field with note - Add note_private & use wysiwyg editor
|
2015-02-23 21:44:33 +01:00 |
|
aspangaro
|
be3fd5529a
|
FIXED: Module Expense Report - Correct init
|
2015-02-23 20:31:44 +01:00 |
|
cla
|
2ef654045b
|
ADD: new fields and relative filters in contracts list page
|
2015-02-23 20:26:34 +01:00 |
|
Laurent Destailleur
|
afa8e5c6d8
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2015-02-23 19:50:51 +01:00 |
|
Laurent Destailleur
|
4128c86035
|
Fix: Filter on statut was lost
|
2015-02-23 19:31:42 +01:00 |
|
Laurent Destailleur
|
94a5f87bd8
|
comment
|
2015-02-23 15:13:14 +01:00 |
|
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 |
|
Laurent Destailleur
|
570194b4b9
|
Fix validation of email when there is a comma separator.
|
2015-02-23 13:10:18 +01:00 |
|
Alexis Algoud
|
29e5b89352
|
erase some comments
|
2015-02-23 12:26:27 +01:00 |
|
Alexis Algoud
|
0c53121553
|
- use incdec into virtual product definition.
- improve screen of virtual product
|
2015-02-23 12:19:19 +01:00 |
|
phf
|
9eed66d998
|
[CORE] FIX : Travis phptest (#incoterm).
|
2015-02-23 11:46:39 +01:00 |
|
Laurent Destailleur
|
ae8d090ebe
|
Fix No default filter by default, we miss data
|
2015-02-23 11:43:38 +01:00 |
|
phf
|
11a0624e39
|
[CORE] FIX Travis phpcs (#incoterm).
|
2015-02-23 11:19:00 +01:00 |
|
Marcos García de La Fuente
|
7e07638fba
|
Little refactor
|
2015-02-23 10:51:43 +01:00 |
|
Alexis Algoud
|
72908c1fd3
|
Merge branch 'develop' of https://github.com/atm-gauthier/dolibarr into feature_Product_stock_subproduct_stock_independent
|
2015-02-23 10:51:41 +01:00 |
|
Marcos García de La Fuente
|
abda67adc2
|
Improved testGetBrowserInfo
|
2015-02-23 10:45:22 +01:00 |
|
phf
|
52441914de
|
Vas avec le merge précédent
|
2015-02-23 10:42:34 +01:00 |
|
Marcos García de La Fuente
|
71b98ee82b
|
Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them.
|
2015-02-23 10:42:10 +01:00 |
|
phf
|
127868899d
|
Merge branch 'develop' into incoterm
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-02-23 10:42:01 +01:00 |
|
Marcos García de La Fuente
|
102d2d9d36
|
Added IE11 test to testGetBrowserInfo
|
2015-02-23 10:39:02 +01:00 |
|
phf
|
c459794999
|
[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).
|
2015-02-23 10:36:44 +01:00 |
|
phf
|
81130634d3
|
[CORE] intégration de incoterm sur les différentes class (#incoterm).
|
2015-02-23 09:16:14 +01:00 |
|
aspangaro
|
d0cc072a58
|
Module Expense Report: reactivate conflictwith modDeplacement
|
2015-02-23 06:49:11 +01:00 |
|
aspangaro
|
95f211775b
|
Move new module Expense Report in hrm
|
2015-02-23 06:45:03 +01:00 |
|
Laurent Destailleur
|
dbaef5ca6b
|
Fix link does not return same number that nmber into link
|
2015-02-23 01:00:07 +01:00 |
|
Laurent Destailleur
|
25bb6a588f
|
Fix list of project must be restricted on opened status
|
2015-02-23 00:57:48 +01:00 |
|
Laurent Destailleur
|
1bba3a01e2
|
phpcs
|
2015-02-22 23:41:34 +01:00 |
|
Laurent Destailleur
|
b04682db4c
|
Fix Edit of extrafield on supplier invoice or order was deleteing other
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
|
2015-02-22 17:41:02 +01:00 |
|
Laurent Destailleur
|
6e10dd3cce
|
Trad
|
2015-02-22 17:10:13 +01:00 |
|
Laurent Destailleur
|
4781707fa4
|
Fix jodconverter can't work without the wrapper jodconverter.
|
2015-02-22 16:01:01 +01:00 |
|
aspangaro
|
4ba095cb5c
|
FIXED: Bankjournal is generated from id_account now
|
2015-02-22 15:04:18 +01:00 |
|
Stephen L
|
fe62e038ca
|
Fix lastrowid-*table* option when defining imports (fix extrafields fk_object value)
Signed-off-by: Stephen L. <lrq3000@gmail.com>
|
2015-02-22 14:34:51 +01:00 |
|
aspangaro
|
cda6e7adf9
|
Delete cash journal
|
2015-02-22 14:20:42 +01:00 |
|
Marcos García de La Fuente
|
702c19dab3
|
Refactored function getBrowserInfo
|
2015-02-22 13:17:57 +01:00 |
|
Laurent Destailleur
|
2bc6ac4671
|
Finished new module to manage expense reports !
Fix export to support corectly multicompany
|
2015-02-22 13:16:49 +01:00 |
|
Marcos García de La Fuente
|
ce916f3bcb
|
Better practice in getBrowserInfo
|
2015-02-22 12:35:51 +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 |
|
Laurent Destailleur
|
6d1324b463
|
Work on expense report module
|
2015-02-21 16:15:54 +01:00 |
|
aspangaro
|
3aa6c8c855
|
Correct auguria menu
|
2015-02-21 15:19:18 +01:00 |
|
Laurent Destailleur
|
30a5111c68
|
Work on expense report module
|
2015-02-21 15:18:05 +01:00 |
|
aspangaro
|
63099727d0
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2015-02-21 15:10:35 +01:00 |
|
frederic34
|
ad3e91dc9f
|
WIP
|
2015-02-21 14:06:33 +01:00 |
|
Laurent Destailleur
|
5dffe4b440
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-02-21 12:58:14 +01:00 |
|
Laurent Destailleur
|
070accd1e0
|
Work on new module expense report
|
2015-02-21 12:57:17 +01:00 |
|
Laurent Destailleur
|
d2da098336
|
Fixed example
|
2015-02-21 10:00:31 +01:00 |
|
Laurent Destailleur
|
2b045ba74a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-02-21 09:52:59 +01:00 |
|
Laurent Destailleur
|
2b4f7a41bf
|
Merge pull request #2377 from aspangaro/develop-patch5
NEW: Update PHPExcel library to 1.8.0
|
2015-02-21 00:22:21 +01:00 |
|