Commit Graph

211 Commits

Author SHA1 Message Date
Laurent Destailleur
9f0528f5f1 Complete work on dol_banner 2016-12-14 00:06:50 +01:00
aspangaro
eef245d23b Expense report - Hidden button to generate files in create mode 2016-12-08 22:17:03 +01:00
aspangaro
0d5c035034 Expense report - Remove filed note_private and note_public in card. Already in tab Notes 2016-12-08 22:12:16 +01:00
Laurent Destailleur
db9af0118c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modAdherent.class.php
2016-12-06 14:08:43 +01:00
Laurent Destailleur
fe54673a87 FIX List of people able to validate an expense report was not complete. 2016-12-03 18:13:23 +01:00
Laurent Destailleur
81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
Laurent Destailleur
411e82b7a3 Fix button set to paid not always visible when it should. 2016-12-02 14:52:38 +01:00
Laurent Destailleur
d197a0e0aa NEW Can create expense report for someone else (advanced permission)
NEW Can clone an expense report
2016-11-13 22:01:22 +01:00
Laurent Destailleur
04063a62a8 Better responsive 2016-11-12 15:18:38 +01:00
Laurent Destailleur
a54a610a05 Uniformize code 2016-10-14 17:44:41 +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
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
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
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
918bc9cc26 Fix: If user can approve, show button to deny to. 2016-07-20 16:07:15 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
f7427e7366 Fix css 2016-06-29 18:15:35 +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
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
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
Frédéric FRANCE
972e5e571d Update card.php 2016-04-28 21:52:23 +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
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
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
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
philippe grand
94fe00fe8d [Qual] Uniformize code 2015-12-04 19:45:39 +01:00