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
8a67a3af10
Fix missing one param
2015-03-01 16:12:55 +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
Laurent Destailleur
e0f86f0270
Oubli sur option PROJECT_HIDE_TASKS
2015-02-02 21:33:09 +01:00
Laurent Destailleur
b36e40ee4c
Fix feature to break by email
2015-02-02 21:12:43 +01:00
Laurent Destailleur
edcf39cd58
Merge pull request #2300 from aschio/develop
...
NEW: search filter fields in list project page
2015-01-31 20:24:48 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
cla
0501153835
Update list project page: add sales rapresentatives and linked user.
2015-01-30 11:08:49 +01:00
cla
0d0c10be1f
ADD filter fields in list project page
2015-01-29 18:17:43 +01:00
Laurent Destailleur
5306220e5e
Fixed: Translation
2015-01-23 02:21:43 +01:00
Laurent Destailleur
71a8f97c89
Optimize code
2015-01-23 02:11:10 +01:00
Laurent Destailleur
eedca43cc3
New: Add option PROJECT_ADD_SUBTOTAL_LINES to group by supplier lines
...
into refering project view.
2015-01-22 21:31:00 +01:00
Laurent Destailleur
b7328caa9a
Fixed: Bad date for supplier orders
2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3
Fix: select if field is null
2015-01-22 20:10:25 +01:00
Laurent Destailleur
7b8b189bac
Fix: select if field is null
2015-01-22 20:09:57 +01:00
