Marcos García de La Fuente
2e68b51a10
Merge remote-tracking branch 'upstream/develop' into develop
2015-03-15 17:52:07 +01:00
Laurent Destailleur
97f36825df
Work on new timesheet page
2015-03-05 21:47:50 +01:00
Laurent Destailleur
d7ab3f112c
NEW: Show difference between timespent by everybody and time spent by
...
user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet
2015-03-05 13:48:57 +01:00
Laurent Destailleur
8b5dd4910f
Fix bad update of denormalized field
2015-03-05 13:02:37 +01:00
Laurent Destailleur
c36f92396b
Add navigation into the new timesheet week page.
...
Fix bad merge
2015-03-05 11:13:44 +01:00
Laurent Destailleur
596f977f7c
Merge pull request #2423 from defrance69/patch-49
...
Update index.php
2015-03-04 22:02:16 +01:00
Laurent Destailleur
09035c1fee
Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr
...
into develop
Conflicts:
htdocs/includes/tcpdi/fpdf_tpl.php
htdocs/projet/card.php
2015-03-04 20:52:54 +01:00
Laurent Destailleur
13d8f26247
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/class/project.class.php
2015-03-04 18:58:50 +01:00
Laurent Destailleur
cf3190a4ef
Bad error management
2015-03-04 18:56:57 +01:00
Laurent Destailleur
5335a6affa
NEW: Add close date and user for projects.
2015-03-04 16:28:29 +01:00
Marcos García de La Fuente
0170d409d3
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2015-03-04 10:16:25 +01:00
Laurent Destailleur
4c1d51bd39
phpcs
2015-03-04 02:28:16 +01:00
Laurent Destailleur
107a16ed75
Work on timesheet module
2015-03-04 00:53:35 +01:00
BENKE Charles
06b7f610ed
Update index.php
...
list of cossumed time more usefull if ordered by desc
2015-03-03 17:18:20 +01:00
frederic34
4af26c119f
fetch object in include file
2015-03-02 17:54:35 +01:00
Laurent Destailleur
1493e66d64
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-02 02:39:29 +01:00
Laurent Destailleur
45a90b54fe
Fix: param to set id of object into url must be id everywhere (except
...
company, it might be socid)
2015-03-02 02:14:18 +01:00
Laurent Destailleur
c0d0fa317b
Merge pull request #2404 from frederic34/patch-3
...
Update card.php
2015-03-02 02:05:40 +01:00
Laurent Destailleur
5a541c4206
Forgot to commit one file
2015-03-02 01:39:08 +01:00
Laurent Destailleur
7fc0c2b485
Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements
...
New add doc on project linked elements
2015-03-02 00:19:21 +01:00
Laurent Destailleur
a0f8b39250
Prepare code for a perday week timesheet input of time spent.
2015-03-01 17:45:36 +01:00
Laurent Destailleur
416e0a766e
Fix: we must use status to find label of status
2015-03-01 16:24:02 +01:00
Laurent Destailleur
2795d27cc9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
htdocs/projet/index.php
2015-03-01 16:13:22 +01:00
Laurent Destailleur
5f29942257
Fix link missing icon
2015-03-01 14:03:14 +01:00
Laurent Destailleur
b888a04af9
Reduce a lot of duplicate code. Move all tables of extrafields setup
...
into a tpl file.
2015-02-28 20:14:26 +01:00
Laurent Destailleur
51fff77355
Fix: time 0 must be different than time unknown.
2015-02-28 19:02:03 +01:00
Frédéric FRANCE
84b5888cd5
Update card.php
2015-02-28 10:45:48 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Marcos García de La Fuente
e3853a648f
Redundant code
2015-02-25 19:44:12 +01:00
Alexis Algoud
5bc3763945
fix supplier order element
2015-02-24 18:23:40 +01:00
Alexis Algoud
b4f3068141
NEW add PDF icon on linked element into project
2015-02-24 18:20:19 +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
ae8d090ebe
Fix No default filter by default, we miss data
2015-02-23 11:43:38 +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
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
3ca31e34cb
New: Add field "budget" (amount) on projects.
2015-02-16 10:58:05 +01:00
Laurent Destailleur
82b3f4a102
Add field budget_amount on project.
2015-02-16 10:40:09 +01:00
Laurent Destailleur
2e0b2fb012
Work on expensereport module
2015-02-15 22:49:23 +01:00
Laurent Destailleur
c5269eb0a5
Fix: back to project page
2015-02-07 04:06:38 +01:00
Laurent Destailleur
7cc9a09f99
Fix bad order
2015-02-07 04:06:30 +01:00
Laurent Destailleur
4a3e4d6ec9
Fix: back to project page
2015-02-07 04:04:56 +01:00
Laurent Destailleur
2c364dbe8c
Fix filter on status
2015-02-07 03:54:00 +01:00
Laurent Destailleur
7738478564
Fix bad order
2015-02-07 03:29:33 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
2f388949f6
Make a test with jsganttimproved
2015-02-07 03:11:35 +01:00
Laurent Destailleur
79ac620ab5
Fix label of status
2015-02-07 01:32:21 +01:00
