Juanjo Menent
d1879c1b9f
Qual: Remove unused code
2014-09-16 11:19:22 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
d8e8b34605
Fix: Removed AGENDA_DEFAULT_TYPE. There is already
...
AGENDA_DEFAULT_FILTER_TYPE.
2014-09-15 19:35:54 +02:00
Laurent Destailleur
8487913209
Fix: default setup of type of action
2014-09-15 19:27:45 +02:00
Laurent Destailleur
9ea3e33f94
Fix: Can edit status of event.
...
New: Onto event summary of elements, end date and status are visible.
2014-09-15 19:04:30 +02:00
Laurent Destailleur
19e2bd8c90
New: Add option AGENDA_DEFAULT_TYPE
...
Fix: id is not set on field.
2014-09-15 17:34:32 +02:00
Laurent Destailleur
7fc8799c3d
Qual: Clean code from user table tr td
2014-09-15 16:18:19 +02:00
Laurent Destailleur
0d6d064e7e
New: PDF event report show project and status of event
...
Fix: Can edit description of intervention
New: Show status of object on refere page.
2014-09-15 12:48:24 +02:00
Laurent Destailleur
2dbbc76645
Fix: Trigger error not reported
2014-09-15 11:48:50 +02:00
Laurent Destailleur
b94d913440
New: Add option AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS to
...
automatically set end date of event to start date + delta on creation
page.
2014-09-15 10:19:08 +02:00
Laurent Destailleur
6f718af1b6
Fix: list of interventions of thirdparties
2014-09-15 09:29:40 +02:00
Marcos García de La Fuente
7a28f8e4aa
[ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger
2014-09-14 13:59:06 +02:00
Laurent Destailleur
4e21891f14
Add lost PR
2014-09-14 12:06:38 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
2cfe088ee4
Better organization of accountancy menus
...
Fix: sql error with pgsql
2014-09-13 16:54:17 +02:00
Cubexed
68994823dd
Closed projects are greyed out in project selector
2014-09-12 18:00:55 +02:00
Cubexed
71a1857b49
Ignore dateo/datee if is a null column
2014-09-12 16:46:19 +02:00
Cubexed
c23fab267c
This commit adds a way to filter projects by checking if
...
selected year is in creation/ending range.
The year input is shown after the list, outside the table.
It's hidden by default and must be
enabled with PROJECT_LIMIT_YEAR_RANGE
2014-09-12 05:30:17 +02:00
Laurent Destailleur
744f370920
Merge remote-tracking branch 'origin/3.6' into develop
2014-09-11 17:47:58 +02:00
Laurent Destailleur
7851587a11
Merge pull request #1869 from FHenry/3.6
...
Extrafield feature select from table should try to translate multiple column when not needed
2014-09-11 17:13:28 +02:00
aspangaro
4c52a6ee6f
Add admin page into salaries to manage accountancy
2014-09-10 04:53:18 +02:00
aspangaro
8f818529a6
Remove right "accounting->access" & debug menu
2014-09-09 21:19:15 +02:00
aspangaro
7cc3fe9c95
Merge remote-tracking branch 'Upstream/develop' into develop-accounting
2014-09-09 20:41:19 +02:00
Laurent Destailleur
f19e469b5f
Work on feature to assign several users to an event.
2014-09-09 14:38:10 +02:00
Laurent Destailleur
9f2b0b4f29
Minor enhancement on agenda module.
...
Can filter on date of event.
Local calendar renamed into Internal calendar.
2014-09-09 12:28:35 +02:00
Laurent Destailleur
9e2a0cb671
Fix: debug of accountancy module
2014-09-09 09:46:57 +02:00
Laurent Destailleur
2fb806bfc2
Fix: duplicate entity encoding into select_array.
2014-09-08 23:08:59 +02:00
aspangaro
1223be1e5b
Move language key into admin.lang file
2014-09-08 21:51:40 +02:00
aspangaro
70b8ccd441
Merge remote-tracking branch 'Upstream/develop' into develop-accounting
2014-09-08 20:18:45 +02:00
Laurent Destailleur
a3bbf2aff9
Fix: Correct height of empty line for thirdparties combo list.
2014-09-08 12:05:24 +02:00
Laurent Destailleur
2f6493dabd
Sync transifex
2014-09-08 11:58:45 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
789427b75d
Upgrade phpexcel lib to 1.7.8
2014-09-07 12:12:30 +02:00
aspangaro
02f45b7f43
Merge remote-tracking branch 'Upstream/develop' into develop-accounting
2014-09-07 07:32:47 +02:00
Laurent Destailleur
63bfc093c3
Search on a specific day is possible into per user view.
2014-09-06 17:55:33 +02:00
Laurent Destailleur
bf0b578e5a
Fix: Sort at wrong place
...
Fix: sql syntax error (field were renamed)
2014-09-06 16:24:44 +02:00
Laurent Destailleur
6d9cc15856
Fix: Function unaccent was not enough complete.
2014-09-06 14:40:43 +02:00
aspangaro
f9dc25cf3f
Patch Accounting Expert Module
2014-09-06 09:50:42 +02:00
Laurent Destailleur
522b5a91bc
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:16:24 +02:00
Laurent Destailleur
a86de9b685
Work on agenda per user.
2014-09-05 21:12:01 +02:00
Laurent Destailleur
de0cf14ece
Fix: Bad position of week
2014-09-05 15:10:31 +02:00
Laurent Destailleur
0e944b0403
Fix: Pb with week position when week start on sunday.
2014-09-05 15:00:53 +02:00
Laurent Destailleur
175e3eca6b
Work on agenda view per user
2014-09-05 13:48:55 +02:00
Juanjo Menent
5b34897927
Merge pull request #1864 from aspangaro/develop-accounting
...
Patch Accounting Expert module
2014-09-05 09:06:34 +02:00
Laurent Destailleur
60c633fd8b
Qual: Generalize hook afterPDFCreation.
...
New: Add hook beforePDFCreation
2014-09-04 23:24:19 +02:00
Laurent Destailleur
e7e48f6b2b
Doxygen
...
Add constant to enable bank during proposal (not enough common).
2014-09-04 22:37:33 +02:00
Laurent Destailleur
a57e0d3505
Fix: Do not use   as value of a list
2014-09-04 19:27:59 +02:00