Laurent Destailleur
|
e827b1b9cd
|
Merge pull request #2529 from aspangaro/develop-don
NEW better integration in project for donation module
|
2015-04-02 11:42:15 +02:00 |
|
aspangaro
|
115777f05d
|
New: Module project - Elements - Show detail of amounts with a minus when the amount decrease margin
|
2015-04-02 06:54:04 +02:00 |
|
aspangaro
|
d8f56eb406
|
New: better integration in project for donation module
Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility
|
2015-04-02 06:36:32 +02:00 |
|
aspangaro
|
4918326958
|
Fixed: Wrong path to don.class in element project
|
2015-04-01 08:13:10 +02:00 |
|
Laurent Destailleur
|
73b2e0bd01
|
Merge pull request #2471 from marcosgdf/refactor
refactor
|
2015-03-29 16:17:36 +02:00 |
|
aspangaro
|
059bb40345
|
Debug
|
2015-03-26 20:43:34 +01:00 |
|
aspangaro
|
b60f1e33d6
|
Debug
|
2015-03-26 06:29:16 +01:00 |
|
aspangaro
|
9d34b40897
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
htdocs/compta/bank/account.php
|
2015-03-24 05:28:57 +01:00 |
|
Laurent Destailleur
|
cbadfa5075
|
NEW: Title of page project contains project ref and label
|
2015-03-23 12:44:41 +01:00 |
|
Marcos García de La Fuente
|
4349f27299
|
Revert "Revert "Refactor 1""
|
2015-03-23 01:39:12 +01:00 |
|
Laurent Destailleur
|
2d90256640
|
Revert "Refactor 1"
|
2015-03-22 12:51:29 +01:00 |
|
Laurent Destailleur
|
a79a779b04
|
Merge pull request #2456 from marcosgdf/refactor-1
Refactor 1
|
2015-03-22 12:47:05 +01:00 |
|
aspangaro
|
c4a580723d
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-03-20 06:36:06 +01:00 |
|
aspangaro
|
c9d31dab3a
|
Move module Dons in htdocs->donations
|
2015-03-19 05:41:13 +01:00 |
|
aspangaro
|
dbeccf7653
|
Update work
|
2015-03-18 21:56:00 +01:00 |
|
Laurent Destailleur
|
b0b88be81f
|
Sync transifex
|
2015-03-18 15:27:27 +01:00 |
|
Laurent Destailleur
|
840b047468
|
Work on new timesheet input pages.
|
2015-03-18 11:20:08 +01:00 |
|
Laurent Destailleur
|
5d4d8151c1
|
Work on new timesheet input pages.
|
2015-03-18 11:04:50 +01:00 |
|
Scrutinizer Auto-Fixer
|
b693ed3f51
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-03-16 23:21:17 +00:00 |
|
Laurent Destailleur
|
6d7b340cee
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
|
2015-03-16 18:30:30 +01:00 |
|
Marcos García de La Fuente
|
086e439543
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
|
2015-03-15 18:16:55 +01:00 |
|
Marcos García de La Fuente
|
2e68b51a10
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-03-15 17:52:07 +01:00 |
|
aspangaro
|
d69f066735
|
QUAL: Traduce terms + remove <center>
|
2015-03-15 14:04:07 +01:00 |
|
Laurent Destailleur
|
605a7dee0e
|
Fix: Deleting task do not return to correct page
|
2015-03-14 11:56:28 +01:00 |
|
Laurent Destailleur
|
a5645b626c
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
|
2015-03-11 03:55:46 +01:00 |
|
Laurent Destailleur
|
c1432eb2da
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/salaries/fiche.php
htdocs/projet/element.php
|
2015-03-11 03:29:52 +01:00 |
|
Raphaël Doursenaud
|
f8dfa61859
|
FIXED #1901: Inverted supplier order/invoice buttons in project referring objects
|
2015-03-09 16:20:51 +01:00 |
|
Laurent Destailleur
|
97f36825df
|
Work on new timesheet page
|
2015-03-05 21:47:50 +01:00 |
|
Laurent Destailleur
|
22045603b7
|
Fix bad update of denormalized field
|
2015-03-05 13:51:29 +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 |
|