The following modules are merged::

addons-extra/product_procurement -> mrp module
addons-extra/inventory_merge -> stock
addons-extra/product_pricelist_print -> product
addons-extra/invoice_payment -> account

bzr revid: sahibsofia@gmail.com-20080916114513-7an9yz59hucjmjk8

1 files changed, 25 insertions, 0 deletions

diff --git a/addons/analytic_user_function/__terp__.py b/addons/analytic_user_function/__terp__.py
new file mode 100644
index 00000000000..6208cd43226
--- /dev/null
+++ b/addons/analytic_user_function/__terp__.py
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+{
+    "name" : "Analytic User Function",
+    "version" : "1.0",
+    "depends" : ["hr_timesheet_sheet"],
+    "author" : "Tiny",
+    "description": """
+
+    This module allows you to define what is the defaut function of a specific user on a given account. This is mostly used when a user encode his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
+
+    Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.
+
+    """,
+    "website" : "http://tinyerp.com/",
+    "category" : "Generic Modules/Others",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [
+            "analytic_user_function_view.xml",
+            ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+