Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Laurent Destailleur
e1fec958ef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/group/fiche.php
2014-09-22 23:43:22 +02:00
Alexis Algoud
de0d53a2bb
ADD extrafields on usergroup
2014-09-22 16:31:58 +02:00
Marcos García de La Fuente
ca9e33e809
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf
2014-09-21 18:00:56 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
aspangaro
6d26a7a46d
Merge remote-tracking branch 'Upstream/develop' into develop-accounting
2014-09-20 06:36:31 +02:00
Laurent Destailleur
ca3c5d9513
Fix: invalid list of params
...
Fix: loading of sql menu
2014-09-19 14:36:55 +02:00
Laurent Destailleur
2a9275d0de
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/societe/consumption.php
2014-09-19 11:09:51 +02:00
aspangaro
ab9226aab6
Delete elements have a link with old module ventilation - Replace today by module Accounting Expert
2014-09-19 05:55:54 +02:00
Raphaël Doursenaud
4296766ea9
Qual: Coding style
2014-09-19 03:07:54 +02:00
Raphaël Doursenaud
0f71b7e0b0
FIX: Typo
2014-09-19 03:07:54 +02:00
Raphaël Doursenaud
e9175d5d66
Qual: date type doesn't exist
2014-09-19 03:07:53 +02:00
Raphaël Doursenaud
eea9a76589
FIX: Variable might not be traversable
2014-09-19 03:07:52 +02:00
Raphaël Doursenaud
4c7ae3d14b
FIX: Missing parameter declaration
2014-09-19 03:05:20 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
e64e161a58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-09-18 17:54:24 +02:00
Laurent Destailleur
fd890c0b81
Merge pull request #1878 from Cubexed/develop
...
This commit adds a way to filter projects by checking if selected year is in creation/ending range.
2014-09-18 17:47:12 +02:00
Laurent Destailleur
46f117b0f9
Merge pull request #1902 from atm-maxime/mko_workonlists
...
Work on lists
2014-09-18 17:29:15 +02:00
Laurent Destailleur
ea3d091f03
Merge pull request #1900 from ndrosis/patch-5
...
Correct view greek language in PDF
2014-09-18 17:25:44 +02:00
Laurent Destailleur
49db9d1304
Fix: Avoid explode when separator : is not.
2014-09-18 17:12:51 +02:00
Laurent Destailleur
9666d5e3ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
2014-09-18 10:17:43 +02:00
Laurent Destailleur
b16b1c2ce0
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/langs/en_US/errors.lang
htdocs/product/class/product.class.php
2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036
Fix: Bad calculation of total
...
Fix: Warning message not translated
2014-09-18 10:05:37 +02:00
Maxime Kohlhaas
64fe082539
New generic functions for search pictos, to be used in every lists
2014-09-17 17:59:00 +02:00
Laurent Destailleur
f0ebd7721d
Fix: Restore sort feature. Still did not see why previous commit is a
...
bug fix of dolibarr bug.
2014-09-17 17:49:39 +02:00
Drosis Nikos
de6e1c5036
Correct view greek language in PDF
2014-09-17 18:01:59 +03:00
Regis Houssin
099daf4296
Fix: remove hook restriction !
2014-09-17 16:08:58 +02:00
Regis Houssin
f185028707
Fix: remove hook restriction !
2014-09-17 16:08:14 +02:00
Regis Houssin
d225d92c0b
Fix: remove hook restriction !
2014-09-17 16:03:21 +02:00
Marcos García de La Fuente
4b3191b64e
Removed deprecated usage of facture_pdf_create
2014-09-16 20:49:05 +02:00
Cubexed
c3b255bce9
Changed sql to be portable
2014-09-16 15:27:04 +02:00
Juanjo Menent
d1879c1b9f
Qual: Remove unused code
2014-09-16 11:19:22 +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
7fc8799c3d
Qual: Clean code from user table tr td
2014-09-15 16:18:19 +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
Laurent Destailleur
4e21891f14
Add lost PR
2014-09-14 12:06:38 +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
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
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +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
6d9cc15856
Fix: Function unaccent was not enough complete.
2014-09-06 14:40:43 +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