Alexis Algoud
|
a2c8c7c20e
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
|
2015-11-12 09:05:26 +01:00 |
|
aspangaro
|
30c4f1c896
|
HRM : language
|
2015-11-12 07:40:46 +01:00 |
|
aspangaro
|
bedba7ffb7
|
HRM: add a mode 'employee' for development to show tab
|
2015-11-12 07:26:51 +01:00 |
|
aspangaro
|
7693b407e8
|
HRM: Begin to work on employee card
|
2015-11-12 06:59:40 +01:00 |
|
aspangaro
|
20872498ba
|
HRM: Add a tab for holiday module in employee card
|
2015-11-12 06:58:26 +01:00 |
|
Laurent Destailleur
|
2bd0f04d8f
|
Add feature to get nb of top menu entrie
Fix translation of units
|
2015-11-12 00:48:37 +01:00 |
|
Laurent Destailleur
|
1f4742b77b
|
Remove useles html generated code. More code comment.
|
2015-11-11 19:38:19 +01:00 |
|
frederic34
|
cd738ef483
|
Merge remote branch 'upstream/develop' into fccard
Conflicts:
htdocs/commande/card.php
|
2015-11-11 17:23:37 +01:00 |
|
frederic34
|
01d4bd6cf5
|
bad invert
|
2015-11-11 17:19:53 +01:00 |
|
Laurent Destailleur
|
e673b18871
|
Merge pull request #3949 from marcosgdf/bug-3865
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
|
2015-11-11 15:36:34 +01:00 |
|
Laurent Destailleur
|
98c32fa1ec
|
FIX The label hidden was not supported when using jmobile
|
2015-11-10 00:36:33 +01:00 |
|
Alexis Algoud
|
99513ac9f3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
|
2015-11-09 18:31:21 +01:00 |
|
frederic34
|
b8a84d68ec
|
add messages
|
2015-11-09 18:19:10 +01:00 |
|
Alexis Algoud
|
68cbd4699b
|
NEW multi event type for filter and get form in order to allow bookmark
|
2015-11-09 17:18:23 +01:00 |
|
Laurent Destailleur
|
71fa347e8e
|
FIX Better compatibility for users that used the not supported option
MAIN_USE_JQUERY_MULTISELECT set to 1.
|
2015-11-08 18:40:12 +01:00 |
|
Marcos García de La Fuente
|
7ebe032d6f
|
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
Close #3865
|
2015-11-08 16:01:12 +01:00 |
|
Laurent Destailleur
|
6ec33a94c6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-08 15:39:10 +01:00 |
|
Laurent Destailleur
|
bd56396394
|
Fix migration error
|
2015-11-08 15:38:57 +01:00 |
|
Laurent Destailleur
|
e6ab6bdb8e
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-11-08 14:38:01 +01:00 |
|
Laurent Destailleur
|
7a0206adce
|
FIX Missing to set context into workflow actions, so triggers can't know
we are creating an invoice from order or an order from a proposal.
|
2015-11-08 14:37:50 +01:00 |
|
Juanjo Menent
|
59b3124d7d
|
Merge pull request #3938 from marcosgdf/fr-3876
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
|
2015-11-08 11:20:36 +01:00 |
|
Juanjo Menent
|
509b45a0d0
|
Merge pull request #3936 from marcosgdf/bug-3931
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
|
2015-11-08 11:19:13 +01:00 |
|
Juanjo Menent
|
77284982d5
|
Merge pull request #3935 from marcosgdf/bug-3897
FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
|
2015-11-08 11:18:29 +01:00 |
|
Laurent Destailleur
|
24dff1d842
|
NEW Statistic graphs on products offer a filter on product type (product
/ service or both)
|
2015-11-08 00:35:30 +01:00 |
|
Laurent Destailleur
|
3906cb79c5
|
NEW: Add parameter to add a link to use "date of invoice" in one click
when fille a payment card.
|
2015-11-07 23:46:07 +01:00 |
|
Laurent Destailleur
|
4e64230ac9
|
NEW Add chart of product statistics
|
2015-11-07 16:25:14 +01:00 |
|
Laurent Destailleur
|
57e162d7f8
|
The component selectAjaxArray can return javascript part into a global
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
|
2015-11-07 15:46:06 +01:00 |
|
Marcos García de La Fuente
|
4a52d3c1b1
|
Removed unwanted change
|
2015-11-07 15:35:00 +01:00 |
|
Marcos García de La Fuente
|
84a152dc2e
|
FIX #3836 Unable to upload a document to an invoice under some circunstances
|
2015-11-07 15:33:48 +01:00 |
|
Marcos García de La Fuente
|
75b4cb4727
|
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
|
2015-11-07 14:37:47 +01:00 |
|
Marcos García de La Fuente
|
0451cc1e73
|
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
Close #3931
|
2015-11-07 14:31:12 +01:00 |
|
Marcos García de La Fuente
|
8ccb8c92e0
|
FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
Close #3897
|
2015-11-07 14:29:38 +01:00 |
|
Laurent Destailleur
|
350ef610e9
|
Fix beluga pdf for projects. Add missing expense reports.
|
2015-11-07 12:36:34 +01:00 |
|
Laurent Destailleur
|
99f5211070
|
NEW Can use the * as a joker characters into search boxes of lists
|
2015-11-07 11:48:35 +01:00 |
|
Laurent Destailleur
|
b2d9f21253
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-06 18:57:46 +01:00 |
|
Laurent Destailleur
|
d0e6db7f89
|
Use the new banner for first tab of products.
|
2015-11-06 18:57:35 +01:00 |
|
Maxime Kohlhaas
|
dac0a7bc50
|
Fix : finally, autofocus on product search field is a bad idea
|
2015-11-06 11:09:54 +01:00 |
|
philippe grand
|
5f74a0f1c0
|
Traduction
|
2015-11-06 09:46:18 +01:00 |
|
Laurent Destailleur
|
0f358eea49
|
Fix path definition of thumbs with the new function
|
2015-11-06 01:56:56 +01:00 |
|
Laurent Destailleur
|
2dc644da30
|
Debug Direct print module using the OAuth setup.
|
2015-11-06 01:33:49 +01:00 |
|
Laurent Destailleur
|
04664c203d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
|
2015-11-05 22:13:08 +01:00 |
|
Laurent Destailleur
|
58cac2d895
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
|
2015-11-05 22:09:54 +01:00 |
|
Laurent Destailleur
|
fe78996026
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
|
2015-11-05 22:04:18 +01:00 |
|
Laurent Destailleur
|
e4bd99aaf3
|
Merge pull request #3904 from frederic34/printgcp
Google Cloud Print
|
2015-11-05 21:57:08 +01:00 |
|
Laurent Destailleur
|
a7cea65710
|
Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement
NEW add an option to use standard ISO location for bill in crabe model
|
2015-11-05 21:51:38 +01:00 |
|
Laurent Destailleur
|
64fb4a30bb
|
Merge pull request #3899 from grandoc/develop
Typo
|
2015-11-05 21:46:33 +01:00 |
|
Laurent Destailleur
|
f3b8df3ea5
|
Merge pull request #3889 from frederic34/escpos
Receipt Printer conf and lang
|
2015-11-05 21:32:43 +01:00 |
|
frederic34
|
55dfa4859f
|
Install lib with composer
|
2015-11-05 21:09:14 +01:00 |
|
frederic34
|
3ef6a92bb1
|
Google Cloud Print
|
2015-11-05 18:04:00 +01:00 |
|
frederic34
|
8a765bf5fd
|
wip
|
2015-11-05 16:20:35 +01:00 |
|