merge

bzr revid: fp@tinyerp.com-20090112082457-nv1he5x22vqxfqkn

addons/account/__terp__.py

@@ -22,10 +22,11 @@
 
 
 {
-    'name': 'Accounting and financial management',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """Financial and accounting module that covers:
+    "name" : "Accounting and financial management",
+    "version" : "1.1",
+    "depends" : ["product", "base", "process"],
+    "author" : "Tiny",
+    "description": """Financial and accounting module that covers:
     General accounting
     Cost / Analytic accounting
     Third party accounting

addons/account/account.py

@@ -154,7 +154,7 @@ class account_account(osv.osv):
                 args[pos] = ('id','in',ids1)
             pos+=1
 
-        if context and context.has_key('consolidate_childs'): #add concolidated childs of accounts
+        if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
             ids = super(account_account,self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
             for consolidate_child in self.browse(cr, uid, context['account_id']).child_consol_ids:
@@ -170,7 +170,7 @@ class account_account(osv.osv):
         ids3 = []
         for rec in self.browse(cr, uid, ids2, context=context):
             for child in rec.child_consol_ids:
-                ids3.append[child.id]
+                ids3.append(child.id)
         if ids3:
             ids3 = self._get_children_and_consol(cr, uid, ids3, context)
         return ids2+ids3

addons/account/invoice.py

@@ -383,6 +383,8 @@ class account_invoice(osv.osv):
             cr.execute("DELETE FROM account_invoice_tax WHERE invoice_id=%s", (id,))
             for taxe in ait_obj.compute(cr, uid, id).values():
                 ait_obj.create(cr, uid, taxe)
+         # Update the stored value (fields.function), so we write to trigger recompute
+        self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)        
         return True
 
     def button_compute(self, cr, uid, ids, context=None, set_total=False):

addons/account_analytic_analysis/__terp__.py

@@ -28,14 +28,17 @@
     'description': """Modify account analytic view to show
 important data for project manager of services companies.
 Add menu to show relevant information for each manager.""",
-    'author': 'Camptocamp',
-    'website': 'http://www.camptocamp.com/',
-    'depends': ['account', 'hr_timesheet', 'hr_timesheet_invoice', 'project'],
-    'init_xml': [],
-    'update_xml': [
-        'security/ir.model.access.csv',
-        'account_analytic_analysis_view.xml',
-        'account_analytic_analysis_menu.xml'
+    "version" : "1.1",
+    "author" : "Camptocamp",
+    "category" : "Generic Modules/Accounting",
+    "module": "",
+    "website": "http://www.camptocamp.com/",
+    "depends" : ["account","hr_timesheet","hr_timesheet_invoice","project"],
+    "init_xml" : [],
+    "update_xml" : [
+        "security/ir.model.access.csv",
+        "account_analytic_analysis_view.xml",
+        "account_analytic_analysis_menu.xml",
     ],
     'demo_xml': [],
     'installable': True,

addons/account_payment/__terp__.py

@@ -22,10 +22,13 @@
 
 
 {
-    'name': 'Payment Management',
-    'version': '1.0',
-    'category': 'Generic Modules/Payment',
-    'description': """
+    "name": "Payment Management",
+    "version": "1.1",
+    "author": "Tiny",
+    "category": "Generic Modules/Payment",
+    "depends": ["account"],
+    "init_xml": [],
+    "description": """
     This module provide :
     * a more efficient way to manage invoice payment.
     * a basic mechanism to easily plug various automated payment.

addons/base_module_quality/speed_test/speed_test.py

@@ -50,7 +50,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need
         module_name = module_path.split('/')[-1]
         obj_list = self.get_objects(cr, uid, module_name)
         obj_counter = 0
-        score = 0
+        score = 0.0
         obj_ids = self.get_ids(cr, uid, obj_list)
         result_dict = {}
         result_dict2 = {}
@@ -63,7 +63,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need
             if size:
                 list = []
 
-                #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries) 
+                #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries)
                 pool.get(obj).read(cr, uid, [ids[0]])
                 c = cr.count
                 pool.get(obj).read(cr, uid, [ids[0]])

addons/crm_configuration/crm_bugs_view.xml

@@ -87,7 +87,7 @@
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
-                    <field name="date"/>
+                    <field name="date_action_next"/>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_revenue"/>
                     <field name="planned_cost"/>

addons/crm_configuration/crm_fund_view.xml

@@ -37,7 +37,7 @@
                     <field name="duration"/>
                     <field name="category2_id" select="1" string="Payment Mode"/>
                 </group>
-                <notebook>
+                <notebook colspan="4">
                 <page string="Funds">
                     <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
                     <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
@@ -70,7 +70,7 @@
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
-                    <field name="date"/>
+                    <field name="date_action_next"/>
                     <separator colspan="4"/>
                     <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
                         <form string="Communication history">

addons/crm_configuration/crm_jobs_view.xml

@@ -115,7 +115,7 @@
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
-                    <field name="date"/>
+                    <field name="date_action_next"/>
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>

addons/crm_configuration/crm_phonecall_view.xml

@@ -74,7 +74,6 @@
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
-                    <field name="categ_id"/>
                     <separator colspan="4"/>
                     <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
                         <form string="Communication history">

addons/hr/__terp__.py

@@ -22,10 +22,12 @@
 
 
 {
-    'name': 'Human Resources',
-    'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
-    'description': """
+    "name" : "Human Resources",
+    "version" : "1.1",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Human Resources",
+    "website" : "http://www.openerp.com",
+    "description": """
     Module for human resource management. You can manage:
     * Employees and hierarchies
     * Work hours sheets

addons/hr_holidays/__terp__.py

@@ -2,10 +2,12 @@
 
 
 {
-    'name': 'Human Resources: Holidays management',
-    'version': '0.1',
-    'category': 'Generic Modules/Human Resources',
-    'description': """Human Resources: Holidays tracking and workflow
+    "name" : "Human Resources: Holidays management",
+    "version" : "1.1",
+    "author" : "Tiny & Axelor",
+    "category" : "Generic Modules/Human Resources",
+    "website" : "http://www.openerp.com",
+    "description": """Human Ressources: Holidays tracking and workflow
 
     This module allows you to manage holidays and holidays requests. For each employee, you can also define a number of available holidays per holiday status.
 

addons/mrp/__terp__.py

@@ -22,10 +22,13 @@
 
 
 {
-    'name': 'Manufacturing Resource Planning',
-    'version': '1.0',
-    'category': 'Generic Modules/Production',
-    'description': """
+    "name" : "Manufacturing Resource Planning",
+    "version" : "1.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "category" : "Generic Modules/Production",
+    "depends" : ["stock", "hr", "purchase", "product","process"],
+    "description": """
     This is the base module to manage the manufacturing process in Open ERP.
 
     Features:

addons/mrp/wizard/wizard_orderpoint_procurement.py

@@ -41,10 +41,13 @@ parameter_fields = {
 def _procure_calculation_orderpoint(self, db_name, uid, data, context):
     db, pool = pooler.get_db_and_pool(db_name)
     cr = db.cursor()
-    proc_obj = pool.get('mrp.procurement')
-    automatic = data['form']['automatic']
-    proc_obj._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
-            use_new_cursor=cr.dbname, context=context)
+    try:
+        proc_obj = pool.get('mrp.procurement')
+        automatic = data['form']['automatic']
+        proc_obj._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
+                use_new_cursor=cr.dbname, context=context)
+    finally:
+        cr.close()
     return {}
 
 def _procure_calculation(self, cr, uid, data, context):

addons/mrp/wizard/wizard_procurement.py

@@ -35,8 +35,11 @@ parameter_fields = {
 def _procure_calculation_procure(self, db_name, uid, data, context):
     db, pool = pooler.get_db_and_pool(db_name)
     cr = db.cursor()
-    proc_obj = pool.get('mrp.procurement')
-    proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context)
+    try:
+        proc_obj = pool.get('mrp.procurement')
+        proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context)
+    finally:
+        cr.close()
     return {}
 
 def _procure_calculation(self, cr, uid, data, context):

addons/product/__terp__.py

@@ -22,10 +22,14 @@
 
 
 {
-    'name': 'Products & Pricelists',
-    'version': '1.0',
-    'category': 'Generic Modules/Inventory Control',
-    'description': """
+    "name" : "Products & Pricelists",
+    "version" : "1.1",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Inventory Control",
+    "depends" : ["base", "process"],
+    "init_xml" : [],
+    "demo_xml" : ["product_demo.xml"],
+    "description": """
     This is the base module to manage products and pricelists in Open ERP.
 
     Products support variants, different pricing methods, suppliers

addons/project/__terp__.py

@@ -22,23 +22,23 @@
 
 
 {
-    'name': 'Project Management',
-    'version': '1.0',
-    'category': 'Generic Modules/Projects & Services',
-    'description': """Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning,
-    order tasks, delegate task, print gantt chart eso.""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['product', 'account', 'hr', 'process'],
-    'init_xml': [],
-    'update_xml': [
-        'security/project_security.xml',
-        'security/ir.model.access.csv',
-        'project_data.xml',
-        'project_wizard.xml',
-        'project_view.xml',
-        'project_report.xml',
-        'process/task_process.xml'
+    "name" : "Project Management",
+    "version": "1.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "category" : "Generic Modules/Projects & Services",
+    "depends" : ["product", "account", "hr", "process"],
+    "description": "Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning, order tasks, eso.",
+    "init_xml" : [],
+    "demo_xml" : ["project_demo.xml"],
+    "update_xml": [
+        "security/project_security.xml",
+        "security/ir.model.access.csv",
+        "project_data.xml", 
+        "project_wizard.xml", 
+        "project_view.xml", 
+        "project_report.xml", 
+        "process/task_process.xml"
     ],
     'demo_xml': ['project_demo.xml'],
     'installable': True,

addons/purchase/__terp__.py

@@ -23,7 +23,7 @@
 
 {
     'name': 'Purchase Management',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Generic Modules/Sales & Purchases',
     'description': """Module for purchase management
     Request for quotation, Create Supplier Invoice, Print Order...""",

addons/stock/__terp__.py

@@ -22,31 +22,28 @@
 
 
 {
-    'name': 'Stock Management',
-    'version': '1.0',
-    'category': 'Generic Modules/Inventory Control',
-    'description': """Module provides Inventory Management, define warehouse, stock location, Pickings, 
-    Incoming products, Outgoing products, Internal movements of product, Traceability.
-    Reports for stock like lots by location, Stock Forecast, Item Labels, Picking List etc.. 
-     """,
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['product', 'account'],
-    'init_xml': [],
-    'update_xml': [
-        'stock_workflow.xml',
-        'stock_data.xml',
-        'stock_incoterms.xml',
-        'stock_wizard.xml',
-        'stock_view.xml',
-        'stock_report.xml',
-        'stock_sequence.xml',
-        'product_data.xml',
-        'product_view.xml',
-        'partner_view.xml',
-        'report_stock_view.xml',
-        'security/stock_security.xml',
-        'security/ir.model.access.csv'
+    "name" : "Stock Management",
+    "version" : "1.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["product", "account"],
+    "category" : "Generic Modules/Inventory Control",
+    "init_xml" : [],
+    "demo_xml" : ["stock_demo.xml"],
+    "update_xml" : [
+        "stock_workflow.xml", 
+        "stock_data.xml", 
+        "stock_incoterms.xml",
+        "stock_wizard.xml", 
+        "stock_view.xml", 
+        "stock_report.xml", 
+        "stock_sequence.xml", 
+        "product_data.xml",
+        "product_view.xml",
+        "partner_view.xml",
+        "report_stock_view.xml",
+        "security/stock_security.xml",
+        "security/ir.model.access.csv",
     ],
     'demo_xml': ['stock_demo.xml'],
     'installable': True,