Commit Graph

1154 Commits

Author SHA1 Message Date
Laurent Destailleur
d7fce0cd24 NEW REST api: Add apis for expense reports 2016-09-09 20:17:34 +02:00
Laurent Destailleur
748656856e Fix doxygen 2016-09-09 18:56:13 +02:00
Laurent Destailleur
616594355b NEW Can select fields on expense report list. Can make mass delete. 2016-09-09 15:36:33 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
5fdca121aa NEW Can renamed attached files on products and expense reports 2016-09-07 01:54:16 +02:00
Laurent Destailleur
10c1f02243 Extrafields for expensereports are visible on cards 2016-09-06 13:39:44 +02:00
Laurent Destailleur
8419202588 NEW Support free bottom text and watermark on expense report template 2016-09-06 12:47:18 +02:00
Laurent Destailleur
7d056f6857 NEW Use small photo of user on all user links 2016-09-01 11:29:30 +02:00
aspangaro
0467a5480d Presentation of Expense Report 2016-08-30 07:02:44 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
2016-08-05 01:15:19 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
5247faf50f Fix align 2016-08-04 10:48:19 +02:00
aspangaro
f232ae9160 Fix Expense report | VAT disable in Dolibarr, traduction of code_libelle & presentation 2016-08-02 07:47:15 +02:00
aspangaro
26f98a2ab7 Presentation 2016-08-01 06:45:29 +02:00
aspangaro
3c3df0c4f6 Fix Presentation 2016-07-29 23:52:49 +02:00
Laurent Destailleur
25a3f8a8fd Fix condition does not match workflow described into page
https://wiki.dolibarr.org/index.php/Module_Expense_Reports
2016-07-28 20:00:56 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 10:25:03 +02:00
Laurent Destailleur
918bc9cc26 Fix: If user can approve, show button to deny to. 2016-07-20 16:07:15 +02:00
Sergio Sanchis Climent
e52d6db3fd Fix #5450 2016-07-17 12:18:29 +02:00
Sergio Sanchis Climent
3b56370060 Fix #5450 2016-07-17 02:48:04 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
73f574b649 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/repair.php
2016-07-12 19:30:01 +02:00
Marcos García de La Fuente
d01796a214 FIX #5470 User of expense report in bank transactions page is not correct 2016-07-09 14:31:41 +02:00
Laurent Destailleur
c24d68a038 Picto for expense report 2016-07-03 21:14:45 +02:00
Laurent Destailleur
f7427e7366 Fix css 2016-06-29 18:15:35 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
94b7e176a6 Clean language files 2016-06-18 16:46:21 +02:00
Laurent Destailleur
49d515be7e Fix debug info was visible 2016-06-16 12:22:55 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
559c1aa010 Fix alignetment of title in some arrays 2016-06-06 16:37:18 +02:00
Laurent Destailleur
fb13225173 Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
abe84ef991 Fix rights check on expense reports 2016-06-04 18:32:00 +02:00
Juanjo Menent
8f617b196a Fix printing following the rules 2016-06-04 15:51:28 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/comm/propal.php
2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/propal.php
2016-05-18 20:40:09 +02:00
Laurent Destailleur
05cbfbb38f Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/install/mysql/migration/repair.sql
2016-05-17 01:19:49 +02:00
Laurent Destailleur
4a3083a4c1 FIX Remove PHP Warning: Creating default object from empty value. 2016-05-16 19:34:24 +02:00
Your Name
f7c9f20b16 Fix: Expensereport not compatible with multicompany. 2016-05-16 17:21:32 +02:00
Laurent Destailleur
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
3c2c9a25b8 Merge pull request #5130 from frederic34/patch-9
FIX if type fee not specified, line is invisible and can't edit it
2016-04-29 17:11:14 +02:00
Laurent Destailleur
f4224881c3 Merge pull request #5132 from frederic34/patch-11
FIX keep files attached with PROV status
2016-04-29 17:08:22 +02:00
Frédéric FRANCE
7e8aef037a Update expensereport.class.php 2016-04-29 13:23:06 +02:00
Frédéric FRANCE
a982f764fe don't change ref if ref is not prov 2016-04-29 12:26:41 +02:00
Frédéric FRANCE
ab63bdd235 keep files attached with PROV status 2016-04-28 22:30:22 +02:00
Frédéric FRANCE
c743f6cfe5 If no project, update line is impossible 2016-04-28 21:56:28 +02:00
Frédéric FRANCE
972e5e571d Update card.php 2016-04-28 21:52:23 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function"
This reverts commit 87cd6e1e40.
2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e Revert change that break compatiblity with 100% of modules 2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3 NEW Converted Form::showLinkedObjectBlock to a static function 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
7692c39879 Merge pull request #4614 from bafbes/abb-3
include expense reports in linked objects section and provide template for them in this section
2016-03-18 00:26:24 +01:00
abb
4dce09cd27 include expense reports in linked objects section and provide template for them in this section
Conflicts:
	htdocs/core/class/html.form.class.php
2016-02-13 00:37:38 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
82cc0b409c Merge pull request #4546 from bafbes/bra
provide link section in expense reports and add option for intervention
2016-02-02 16:17:25 +01:00
Laurent Destailleur
687afeaffe FIX No project fields if module disabled 2016-02-02 15:09:01 +01:00
abb
773ee5c0ea provide link section in expenses and add option for intervention 2016-01-31 19:59:47 +01:00
Bahfir Abbes
2a1ab9a8d4 Update card.php
delete empty row in select list of vats in expenses as this value is not accepted
2016-01-30 16:43:35 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
2016-01-30 16:13:06 +01:00
bobby
72e8680f7c FIX : set column paid on expense report when expense is paid 2016-01-28 13:57:40 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
3903ced5b4 Fix: link to add at wrong place 2016-01-23 11:30:06 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
6bccac5691 NEW Add Expense report to approve into workboard
NEW Selection of boxes is move on top
2016-01-18 11:35:45 +01:00
aspangaro
7552fa20eb Fix: #4394 Untranslated label in list of expense reports 2016-01-11 21:18:12 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page
Fix Missing translations
2015-12-21 00:47:44 +01:00
Laurent Destailleur
fa277ef634 Fix duplicate translation 2015-12-20 20:11:29 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Raphaël Doursenaud
5aaafc3f8a [Qual] OOP constructor
Using class name as constructor method is deprecated in PHP 7
2015-12-10 16:37:37 +01:00
Laurent Destailleur
939a36428c Merge pull request #4156 from grandoc/develop
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
d4268c079f Fix syntax error 2015-12-06 12:23:49 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
9d3451b31d NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:31:32 +01:00
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +01:00
philippe grand
f640486c8b [Qual] Uniformize code 2015-12-04 22:50:03 +01:00
philippe grand
94fe00fe8d [Qual] Uniformize code 2015-12-04 19:45:39 +01:00
Frédéric FRANCE
6d7e360498 Update list.php 2015-11-28 20:33:18 +01:00
Laurent Destailleur
3485e351a4 Fix do not jump to top of page when clicking on "Link to order" 2015-11-28 15:46:20 +01:00
Laurent Destailleur
826c4de26b Uniformize and debug module expense report. 2015-11-28 15:28:59 +01:00
Laurent Destailleur
295eb533f8 FIX Bad picto for expense report 2015-10-25 20:16:40 +01:00
Laurent Destailleur
54883f2d84 FIX Bad picto for expense report 2015-10-25 20:14:57 +01:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
b748c4e328 Uniformize code 2015-10-17 02:03:59 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must
include a print before. It is no more included into function.
2015-10-17 02:01:13 +02:00
Laurent Destailleur
7fd6d8839a Uniformize code and use a new generic search architecture 2015-10-17 01:40:46 +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
aspangaro
425e7ce808 Fix : ER Show date in english format 2015-10-07 22:31:23 +02:00
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Laurent Destailleur
e444cb57d4 Fix bad print 2015-10-03 00:35:26 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
ad1a4c7e15 Merge pull request #3598 from GPCsolutions/formconfirm
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Juanjo Menent
c726afe3bc Merge pull request #3592 from GPCsolutions/select_users
[Qual] Replaced deprecated select_users()
2015-09-26 08:44:34 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
b0b552c378 [Qual] Replaced deprecated select_users() 2015-09-24 20:32:35 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
aspangaro
a805cb9374 Fix: ER payments are on the bank credit 2015-09-13 16:33:02 +02:00
Laurent Destailleur
a5c6582bc1 Fix duplicate translation/encoding on setEventMessage
Conflicts:
	htdocs/ftp/index.php
2015-09-12 12:55:20 +02:00
Laurent Destailleur
942723ff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-31 12:13:35 +02:00
Laurent Destailleur
47ea834516 Fix debug module expense report 2015-08-28 20:11:16 +02:00
Laurent Destailleur
4377a2d013 Fix style and sql error for field fde.ref not found 2015-08-28 18:20:51 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
Laurent Destailleur
0c6cb1c444 Fix bad translation 2015-07-30 14:47:56 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
eec1f4dcdf Merge pull request #3267 from Dolibarr/3.8
fix user role and uk_user_api_key if api module not enabled
2015-07-18 23:51:51 +02:00
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
aspangaro
23673cf464 Fix: ER vat rate don't show in pdf 2015-07-16 20:51:22 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
aspangaro
8b6a6d1da1 Fix: ER payment type don't show in card 2015-07-15 20:22:40 +02:00
aspangaro
fde252ca0e ER: Show ref instead of id in index 2015-07-15 20:04:37 +02:00
Laurent Destailleur
e571f681a0 Fix can refuse expense report 2015-07-15 15:39:50 +02:00
Laurent Destailleur
66fcbeaf8d Fix: Translation missing 2015-07-15 15:11:23 +02:00
Laurent Destailleur
f48128baf7 Fix: default value of new expense report is not correctly set 2015-07-15 15:04:44 +02:00
Marcos García de La Fuente
b7809c788a FIX #2832: Fixed a problem with special characters in expense report PDF model 2015-07-07 12:27:36 +02:00
Laurent Destailleur
a49c9c299e Merge pull request #3102 from aspangaro/develop-patch42
HRM area : Show Ref instead of id for expense report
2015-07-04 03:40:13 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
aspangaro
7e54840cb6 Replace tabs with spaces 2015-06-29 13:12:37 +02:00
aspangaro
279d1d4320 Correct travis 2015-06-29 12:59:55 +02:00
aspangaro
cb0aa41386 Debug 2015-06-29 06:48:39 +02:00
aspangaro
768042513d Merge remote-tracking branch 'Upstream/develop' into develop-42 2015-06-29 06:45:24 +02:00
aspangaro
cff82a5226 Use ref instead of rowid for expense report 2015-06-29 06:41:24 +02:00
Laurent Destailleur
be92f5e7a0 Fix syntax error 2015-06-27 02:31:26 +02:00
Juanjo Menent
759aec3925 Merge pull request #3084 from aspangaro/develop-patch37
Fix: ER button set_paid & merge with old option setPaid
2015-06-24 18:27:25 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
2015-06-23 18:34:39 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
aspangaro
385857380b Remove old field 2015-06-23 06:39:55 +02:00
aspangaro
134cea194d Debug 2015-06-22 06:53:43 +02:00
aspangaro
e0ae7bd430 Merge remote-tracking branch 'Upstream/develop' into develop-37 2015-06-21 21:09:55 +02:00
aspangaro
f0a3057221 Fix: ER button set_paid & merge with old option setPaid 2015-06-21 08:07:06 +02:00
aspangaro
0ff97da1ea Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT 2015-06-20 09:06:20 +02:00
aspangaro
f60ca03140 Fix travis 2015-06-19 06:11:32 +02:00
aspangaro
7539ad88fa Debug 2015-06-18 06:30:48 +02:00
aspangaro
9cf06ec21c Add function set_paid 2015-06-18 06:12:05 +02:00
aspangaro
50aa36502c Merge remote-tracking branch 'Upstream/develop' into develop-32
Conflicts:
	htdocs/expensereport/card.php
2015-06-17 07:21:43 +02:00
aspangaro
8d0e7261f5 Debug 2015-06-17 07:19:25 +02:00
aspangaro
2979815223 Update work on expensereport card 2015-06-16 06:56:58 +02:00
aspangaro
a1e383dafa Fix: ER Missing language key 2015-06-16 06:18:43 +02:00
aspangaro
2fb27b50ec Add payment page & class 2015-06-16 05:47:22 +02:00
Laurent Destailleur
4a18b730b5 Fix: Avoid warning in expense report validation
Fix: navigation in expense report
2015-06-08 13:49:09 +02:00
aspangaro
a8c49f11ca ER add key language 2015-05-28 06:16:58 +02:00
aspangaro
40b65a642d Fix: ER list don't respect $conf->liste_limit 2015-05-19 22:22:18 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Laurent Destailleur
49a13f5e72 Debug of module expense report 2015-05-15 03:52:29 +02:00
Laurent Destailleur
3f5215169a Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr
into aspangaro-develop-ER_badge

Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
2015-05-15 02:44:43 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
Laurent Destailleur
3e94cc07d2 Fight against valign="top". Minor css fixes. 2015-05-14 16:47:15 +02:00
Laurent Destailleur
74607218ea Fight against key tva_taux. Removed completely. 2015-05-14 15:59:09 +02:00
aspangaro
766c58724a ER: Review & add a totalVAT in pdf 2015-05-14 08:26:41 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
aspangaro
c502dabd76 Merge remote-tracking branch 'Upstream/develop' into develop-ER_project 2015-05-03 14:31:15 +02:00
aspangaro
c6306260c5 Fix: ER Search mode doesn't work 2015-05-03 14:25:37 +02:00
aspangaro
da272c6aac ER Typo 2015-05-03 14:24:20 +02:00
aspangaro
be302ce5ae New: ER Add filter on amounts 2015-05-03 08:10:22 +02:00
aspangaro
55eecf3f25 ER add price format in total of list 2015-05-03 07:05:19 +02:00
aspangaro
b03a9dffeb Fix : ER Correct Link 2015-05-01 07:18:19 +02:00
aspangaro
95058607a4 Fix : ER Typo on all variable $_SERVER & traduce of button "Edit" not works 2015-05-01 07:13:04 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
6e251690ab Doxygen 2015-03-17 11:23:45 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
aspangaro
69dc3cdd61 Correct fk_statut & work en list 2015-03-08 08:21:49 +01:00
aspangaro
f3258d59c6 Uniformize status & add price() 2015-03-08 07:21:07 +01:00
aspangaro
26b1f69025 Add traduction on type label 2015-03-07 15:47:08 +01:00
aspangaro
55db57d10c Path 2015-03-07 15:41:30 +01:00
aspangaro
2c738df197 Add GPLV3 & Copyright 2015-03-07 15:34:58 +01:00
aspangaro
1baf71874c Sql & $_SERVER["PHP_SELF"] 2015-03-07 15:31:23 +01:00
aspangaro
f780e908f4 Add index.html 2015-03-07 15:14:51 +01:00
aspangaro
105dcde7aa Key language 2015-02-28 08:50:47 +01:00
aspangaro
78af862c19 NEW: Add a search field and report on hrm area 2015-02-28 08:46:40 +01:00
Laurent Destailleur
84581212db Merge pull request #2395 from aspangaro/develop-patch13
NEW: Add button to purge search criteria into list of expense report
2015-02-24 17:02:08 +01:00
Laurent Destailleur
57ecb543ae Merge pull request #2393 from aspangaro/develop-patch11
FIXED: Correct field note - Add note_private & use wysiwyg editor
2015-02-24 17:01:53 +01:00
aspangaro
15aac509d2 NEW: Add button to purge search criteria into list 2015-02-23 22:36:26 +01:00
aspangaro
6436179fb6 Correct 2015-02-23 22:18:39 +01:00
aspangaro
c1069eea47 FIXED: Update licence to GPLv3 2015-02-23 22:04:01 +01:00
aspangaro
40fa32509c Add doleditor & typo 2015-02-23 21:51:29 +01:00
aspangaro
9dadd16724 FIXED: Correct problem field with note - Add note_private & use wysiwyg editor 2015-02-23 21:44:33 +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
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
a64cd69639 phpcs 2015-02-17 09:56:19 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +01:00
Laurent Destailleur
2a266b3a7e Clean code 2015-02-15 19:47:55 +01:00
Laurent Destailleur
b00de9707a Work on expensereport module 2015-02-15 19:13:16 +01:00
Laurent Destailleur
09ef15ea24 phpcs 2015-02-15 13:42:21 +01:00
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr
standard to replace current one.
2015-02-14 18:39:45 +01:00