[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd

addons/account/__openerp__.py

@@ -19,11 +19,11 @@
 #
 ##############################################################################
 {
-    "name" : "eInvoicing",
+    'name' : 'eInvoicing',
-    "version" : "1.1",
+    'version' : '1.1',
-    "author" : "OpenERP SA",
+    'author' : 'OpenERP SA',
-    "category": 'Accounting & Finance',
+    'category' : 'Accounting & Finance',
-    "description": """
+    'description' : """
 Accounting and Financial Management.
 ====================================
 
@@ -44,14 +44,13 @@ Creates a dashboard for accountants that includes:
     * Company Analysis
     * Graph of Treasury
 
-The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) for a particular
+The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) 
-financial year and for preparation of vouchers there is a module named account_voucher.
+for a particular financial year and for preparation of vouchers there is a module named account_voucher.
     """,
     'website': 'http://www.openerp.com',
     'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
-    'init_xml': [],
+    'depends' : ['base_setup', 'product', 'analytic', 'process', 'board', 'edi'],
-    "depends" : ["base_setup", "product", "analytic", "process", "board", "edi"],
+    'data': [
-    'update_xml': [
         'security/account_security.xml',
         'security/ir.model.access.csv',
         'account_menuitem.xml',
@@ -122,12 +121,12 @@ financial year and for preparation of vouchers there is a module named account_v
         'ir_sequence_view.xml',
         'company_view.xml',
         'board_account_view.xml',
-        "edi/invoice_action_data.xml",
+        'edi/invoice_action_data.xml',
-        "account_bank_view.xml",
+        'account_bank_view.xml',
-        "res_config_view.xml",
+        'res_config_view.xml',
-        "account_pre_install.yml"
+        'account_pre_install.yml'
     ],
-    'demo_xml': [
+    'demo': [
         'demo/account_demo.xml',
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',

addons/account/account.py

@@ -582,6 +582,8 @@ class account_account(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
+        if isinstance(ids, (int, long)):
+                    ids = [ids]
         reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
         res = []
         for record in reads:

addons/account/account_invoice.py

@@ -1127,7 +1127,7 @@ class account_invoice(osv.osv):
         return map(lambda x: (0,0,x), lines)
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
-        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id'])
         obj_invoice_line = self.pool.get('account.invoice.line')
         obj_invoice_tax = self.pool.get('account.invoice.tax')
         obj_journal = self.pool.get('account.journal')
@@ -1175,7 +1175,7 @@ class account_invoice(osv.osv):
                     'name': description,
                 })
             # take the id part of the tuple returned for many2one fields
-            for field in ('partner_id',
+            for field in ('partner_id', 'company_id',
                     'account_id', 'currency_id', 'payment_term', 'journal_id'):
                 invoice[field] = invoice[field] and invoice[field][0]
             # create the new invoice

addons/account/test/account_change_currency.yml

@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account/test/account_invoice_state.yml

@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account/test/account_sequence_test.yml

@@ -20,7 +20,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC3] Medium PC'
+        name: '[PC-DEM] PC on Demand'
         price_unit: 900.0
         quantity: 10.0
         product_id: product.product_product_5

addons/account/test/account_supplier_invoice.yml

@@ -28,7 +28,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 300.0
         product_id: product.product_product_3
         quantity: 10.0

addons/account/test/test_edi_invoice.yml

@@ -24,7 +24,7 @@
         uos_id: 1
         quantity: 5.0
         price_unit: 100.0
-        name: 'Medium PC'
+        name: 'PC on Demand'
         account_id: account.a_pay
     tax_line:
       - name: sale tax
@@ -104,9 +104,9 @@
                 "__model": "account.invoice.line",
                 "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-1RP3so",
                 "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"],
-                "name": "Basic PC",
+                "name": "PC Assemble SC234",
                 "price_unit": 10.0,
-                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PC1] Basic PC"],
+                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
                 "quantity": 1.0
         },
         {
@@ -114,9 +114,9 @@
                 "__model": "account.invoice.line",
                 "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-u2XV5",
                 "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"],
-                "name": "Medium PC",
+                "name": "PC on Demand",
                 "price_unit": 100.0,
-                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC3] Medium PC"],
+                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
                 "quantity": 5.0
         }]
     }
@@ -137,12 +137,12 @@
     assert invoice_new.type == 'in_invoice', "Invoice type was not set properly"
     assert len(invoice_new.invoice_line) == 2, "invoice lines are not same"
     for inv_line in invoice_new.invoice_line:
-        if inv_line.name == 'Basic PC':
+        if inv_line.name == 'PC Assemble SC234':
             assert inv_line.uos_id.name == "Unit" , "uom is not same"
             assert inv_line.price_unit == 10 , "price unit is not same"
             assert inv_line.quantity == 1 , "product qty is not same"
             assert inv_line.price_subtotal == 10, "price sub total is not same"
-        elif inv_line.name == 'Medium PC':
+        elif inv_line.name == 'PC on Demand':
             assert inv_line.uos_id.name == "Unit" , "uom is not same"
             assert inv_line.price_unit == 100 , "price unit is not same"
             assert inv_line.quantity == 5 , "product qty is not same"

addons/account_accountant/__openerp__.py

@@ -19,13 +19,13 @@
 #
 ##############################################################################
 {
-    "name" : "Accounting and Finance",
+    'name' : 'Accounting and Finance',
-    "version" : "1.1",
+    'version' : '1.1',
-    "author" : "OpenERP SA",
+    'author' : 'OpenERP SA',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
-    "sequence": 10,
+    'sequence': 10,
-    "summary": "Financial and Analytic Accounting",
+    'summary': 'Financial and Analytic Accounting',
-    "description": """
+    'description': """
 Accounting Access Rights.
 =========================
 
@@ -36,13 +36,12 @@ It assigns manager and user access rights to the Administrator and only
 user rights to Demo user.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
+    'depends' : ['account_voucher'],
-    "depends" : ["account_voucher"],
+    'data': [
-    'update_xml': [
         'security/account_security.xml',
         'account_accountant_data.xml'
     ],
-    'demo_xml': ['account_accountant_demo.xml'],
+    'demo': ['account_accountant_demo.xml'],
     'test': [],
     'installable': True,
     'auto_install': False,

addons/account_accountant/account_accountant_data.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- rename root menu "Accounting" -->
+        <!-- Rename root menu "Accounting" -->
-        <record id="account.menu_finance" model="ir.ui.menu">
+        <!-- Top menu item -->
-            <field name="name">Accounting</field>
+        <menuitem name="Accounting"
-        </record>
+            id="account.menu_finance"/>
     </data>
 
     <data noupdate="1">
@@ -19,10 +19,8 @@
             <field name="type">automatic</field>
             <field name="sequence">100</field>
         </record>
-    </data>
 
-    <data noupdate="1">
+        <!-- Notify all employees of module installation -->
-        <!-- notify all employees of module installation -->
         <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>

addons/account_analytic_analysis/__openerp__.py

@@ -28,22 +28,19 @@
 This module is for modifying account analytic view to show important data to project manager of services companies.
 ===================================================================================================================
 
-Adds menu to show relevant information to each manager.
+Adds menu to show relevant information to each manager.You can also view the report of account analytic summary user-wise as well as month-wise.
-You can also view the report of account analytic summary
-user-wise as well as month-wise.
 """,
-    "author": "Camptocamp",
+    'author': 'Camptocamp',
-    "website": "http://www.camptocamp.com/",
+    'website': 'http://www.camptocamp.com/',
-    "images": ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"],
+    'images': ['images/bill_tasks_works.jpeg','images/overpassed_accounts.jpeg'],
-    "depends": ["hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
+    'depends': ['hr_timesheet_invoice', 'sale'], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
-    "init_xml": [],
+    'data': [
-    "update_xml": [
+        'security/ir.model.access.csv',
-                    "security/ir.model.access.csv",
+        'account_analytic_analysis_view.xml',
-                    "account_analytic_analysis_view.xml",
+        'account_analytic_analysis_menu.xml',
-                    "account_analytic_analysis_menu.xml",
+        'account_analytic_analysis_cron.xml',
-                    "account_analytic_analysis_cron.xml",
+    ],
-                    ],
+    'demo': [],
-    'demo_xml': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0042927202589',

addons/account_analytic_default/__openerp__.py

@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    'name'      : 'Account Analytic Defaults',
+    'name': 'Account Analytic Defaults',
-    'version'   : '1.0',
+    'version': '1.0',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
     'description': """
 Set default values for your analytic accounts.
-=============================================
+==============================================
 
 Allows to automatically select analytic accounts based on criterions:
 ---------------------------------------------------------------------
@@ -35,17 +35,16 @@ Allows to automatically select analytic accounts based on criterions:
     * Company
     * Date
     """,
-    'author'    : 'OpenERP SA',
+    'author': 'OpenERP SA',
-    'website'   : 'http://www.openerp.com',
+    'website': 'http://www.openerp.com',
-    'images'   : ['images/analytic_defaults.jpeg'],
+    'images': ['images/analytic_defaults.jpeg'],
-    'depends'   : ['sale'],
+    'depends': ['sale'],
-    'init_xml'  : [],
+    'data': [
-    'update_xml': [
         'security/ir.model.access.csv', 
         'security/account_analytic_default_security.xml', 
         'account_analytic_default_view.xml'
     ],
-    'demo_xml'  : [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0074229833581',

addons/account_analytic_plans/__openerp__.py

@@ -26,45 +26,48 @@
     'category': 'Accounting & Finance',
     'description': """
 This module allows to use several analytic plans according to the general journal.
-===================================================================================
+==================================================================================
 
 Here multiple analytic lines are created when the invoice or the entries
 are confirmed.
 
 For example, you can define the following analytic structure:
-  Projects
+-------------------------------------------------------------
-      Project 1
+  * **Projects**
-          SubProj 1.1
+      * Project 1
-          SubProj 1.2
+          + SubProj 1.1
+          
+          + SubProj 1.2
 
-      Project 2
+      * Project 2
-  Salesman
+      
-      Eric
+  * **Salesman**
-      Fabien
+      * Eric
+      
+      * Fabien
 
-Here, we have two plans: Projects and Salesman. An invoice line must
+Here, we have two plans: Projects and Salesman. An invoice line must be able to write analytic entries in the 2 plans: SubProj 1.1 and Fabien. The amount can also be split.
-be able to write analytic entries in the 2 plans: SubProj 1.1 and
+ 
-Fabien. The amount can also be split. The following example is for
+The following example is for an invoice that touches the two subprojects and assigned to one salesman:
-an invoice that touches the two subproject and assigned to one salesman:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Plan1:**
 
-Plan1:
+    * SubProject 1.1 : 50%
-    SubProject 1.1 : 50%
+    
-    SubProject 1.2 : 50%
+    * SubProject 1.2 : 50%
-Plan2:
+    
+**Plan2:**
     Eric: 100%
 
-So when this line of invoice will be confirmed, it will generate 3 analytic lines,
+So when this line of invoice will be confirmed, it will generate 3 analytic lines,for one account entry.
-for one account entry.
 
-The analytic plan validates the minimum and maximum percentage at the time of creation
+The analytic plan validates the minimum and maximum percentage at the time of creation of distribution models.
-of distribution models.
         """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/analytic_plan.jpeg'],
     'depends': ['account', 'account_analytic_default'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'security/account_analytic_plan_security.xml',
         'security/ir.model.access.csv',
         'account_analytic_plans_view.xml',
@@ -72,7 +75,7 @@ of distribution models.
         'wizard/analytic_plan_create_model_view.xml',
         'wizard/account_crossovered_analytic_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': ['test/acount_analytic_plans_report.yml'],
     'installable': True,
     'auto_install': False,

addons/account_anglo_saxon/__openerp__.py

@@ -19,32 +19,34 @@
 ##############################################################################
 
 {
-    "name": "Anglo-Saxon Accounting",
+    'name': 'Anglo-Saxon Accounting',
-    "version": "1.2",
+    'version': '1.2',
-    "author": "OpenERP SA, Veritos",
+    'author': 'OpenERP SA, Veritos',
-    "website": "http://openerp.com - http://veritos.nl",
+    'website': 'http://openerp.com - http://veritos.nl',
-    "description": """
+    'description': """
 This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions.
 =====================================================================================================================
 
-The difference between the Anglo-Saxon accounting countries and the Rhine (or also called 
+The difference between the Anglo-Saxon accounting countries and the Rhine 
-Continental accounting) countries is the moment of taking the Cost of Goods Sold versus 
+(or also called Continental accounting) countries is the moment of taking 
-Cost of Sales. Anglo-Saxons accounting does take the cost when sales invoice is created, 
+the Cost of Goods Sold versus Cost of Sales. Anglo-Saxons accounting does 
-Continental accounting will take the cost at the moment the goods are shipped.
+take the cost when sales invoice is created, Continental accounting will 
+take the cost at the moment the goods are shipped.
 
-This module will add this functionality by using a interim account, to store the value of 
+This module will add this functionality by using a interim account, to 
-shipped goods and will contra book this interim account when the invoice is created to 
+store the value of shipped goods and will contra book this interim 
-transfer this amount to the debtor or creditor account. Secondly, price differences between 
+account when the invoice is created to transfer this amount to the 
-actual purchase price and fixed product standard price are booked on a separate account.""",
+debtor or creditor account. Secondly, price differences between actual 
-    "images": ["images/account_anglo_saxon.jpeg"],
+purchase price and fixed product standard price are booked on a separate 
-    "depends": ["product", "purchase"],
+account.""",
-    "category": "Accounting & Finance",
+    'images': ['images/account_anglo_saxon.jpeg'],
-    "init_xml": [],
+    'depends': ['product', 'purchase'],
-    "demo_xml": [],
+    'category': 'Accounting & Finance',
-    "update_xml": ["product_view.xml",],
+    'demo': [],
-    "auto_install": False,
+    'data': ['product_view.xml',],
-    "installable": True,
+    'auto_install': False,
-    "certificate":"00557423080410733581",
+    'installable': True,
+    'certificate':'00557423080410733581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_asset/__openerp__.py

@@ -20,42 +20,40 @@
 ##############################################################################
 
 {
-    "name" : "Assets Management",
+    'name': 'Assets Management',
-    "version" : "1.0",
+    'version': '1.0',
-    "depends" : ["account"],
+    'depends': ['account'],
-    "author" : "OpenERP S.A.",
+    'author': 'OpenERP S.A.',
-    "description": """
+    'description': """
 Financial and accounting asset management.
 ==========================================
 
-This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on those assets.
+This Module manages the assets owned by a company or an individual. It will keep 
-And it allows to create Move's of the depreciation lines.
+track of depreciation's occurred on those assets. And it allows to create Move's 
+of the depreciation lines.
 
     """,
-    "website" : "http://www.openerp.com",
+    'website': 'http://www.openerp.com',
-    "category" : "Accounting & Finance",
+    'category': 'Accounting & Finance',
-    "sequence": 32,
+    'sequence': 32,
-    "init_xml" : [
+    'demo': [ 'account_asset_demo.xml'],
-    ],
-    "demo_xml" : [ 'account_asset_demo.xml'
-    ],
     'test': [
         'test/account_asset_demo.yml',
         'test/account_asset.yml',
         'test/account_asset_wizard.yml',
     ],
-    "update_xml" : [
+    'data': [
-        "security/account_asset_security.xml",
+        'security/account_asset_security.xml',
-        "security/ir.model.access.csv",
+        'security/ir.model.access.csv',
-        "wizard/account_asset_change_duration_view.xml",
+        'wizard/account_asset_change_duration_view.xml',
-        "wizard/wizard_asset_compute_view.xml",
+        'wizard/wizard_asset_compute_view.xml',
-        "account_asset_view.xml",
+        'account_asset_view.xml',
-        "account_asset_invoice_view.xml",
+        'account_asset_invoice_view.xml',
-        "report/account_asset_report_view.xml",
+        'report/account_asset_report_view.xml',
     ],
-    "auto_install": False,
+    'auto_install': False,
-    "installable": True,
+    'installable': True,
-    "application": False,
+    'application': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/account_bank_statement_extensions/__openerp__.py

@@ -30,19 +30,20 @@ Module that extends the standard account_bank_statement_line object for improved
 ===================================================================================================
 
 This module adds:
+-----------------
     - valuta date
     - batch payments
     - traceability of changes to bank statement lines
     - bank statement line views
     - bank statements balances report
-    - performance improvements for digital import of bank statement (via 'ebanking_import' context flag)
+    - performance improvements for digital import of bank statement (via 
-    - name_search on res.partner.bank enhanced to allow search on bank and iban account numbers
+      'ebanking_import' context flag)
+    - name_search on res.partner.bank enhanced to allow search on bank 
+      and iban account numbers
     ''',
     'depends': ['account'],
-    'demo_xml': [],
+    'demo': [],
-    'init_xml': [
+    'data' : [
-    ],
-    'update_xml' : [
         'security/ir.model.access.csv',
         'account_bank_statement_view.xml',
         'account_bank_statement_report.xml',

addons/account_budget/__openerp__.py

@@ -32,23 +32,26 @@ Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Manager
 can set the planned amount on each Analytic Account.
 
 The accountant has the possibility to see the total of amount planned for each
-Budget in order to ensure the total planned is not greater/lower than what he planned
+Budget in order to ensure the total planned is not greater/lower than what he 
-for this Budget. Each list of record can also be switched to a graphical view of it.
+planned for this Budget. Each list of record can also be switched to a graphical 
+view of it.
 
 Three reports are available:
+----------------------------
+    1. The first is available from a list of Budgets. It gives the spreading, for 
+       these Budgets, of the Analytic Accounts.
 
-    1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts.
+    2. The second is a summary of the previous one, it only gives the spreading, 
+       for the selected Budgets, of the Analytic Accounts.
 
-    2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts.
+    3. The last one is available from the Analytic Chart of Accounts. It gives 
-
+       the spreading, for the selected Analytic Accounts of Budgets.
-    3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts of Budgets.
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/budget.jpeg','images/budgetary_position.jpeg'],
     'depends': ['account'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'security/ir.model.access.csv',
         'security/account_budget_security.xml',
         'account_budget_view.xml',
@@ -59,11 +62,11 @@ Three reports are available:
         'wizard/account_budget_crossovered_summary_report_view.xml',
         'wizard/account_budget_crossovered_report_view.xml',
     ],
-    'demo_xml': ['account_budget_demo.xml'],
+    'demo': ['account_budget_demo.xml'],
     'test':[
-            'test/account_budget.yml',
+        'test/account_budget.yml',
-            'test/account_budget_report.yml',
+        'test/account_budget_report.yml',
-            ],
+    ],
     'installable': True,
     'auto_install': False,
     'certificate': '0043819694157',

addons/account_cancel/__openerp__.py

@@ -20,26 +20,25 @@
 ##############################################################################
 
 {
-    "name" : "Cancel Journal Entries",
+    'name': 'Cancel Journal Entries',
-    "version" : "1.1",
+    'version': '1.1',
-    "author" : "OpenERP SA",
+    'author': 'OpenERP SA',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
-    "description": """
+    'description': """
-Allows cancelling accounting entries.
+Allows canceling accounting entries.
-=====================================
+====================================
 
-This module adds 'Allow Cancelling Entries' field on form view of account journal.
+This module adds 'Allow Canceling Entries' field on form view of account journal.
 If set to true it allows user to cancel entries & invoices.
     """,
     'website': 'http://www.openerp.com',
-    "images" : ["images/account_cancel.jpeg"],
+    'images': ['images/account_cancel.jpeg'],
-    "depends" : ["account"],
+    'depends' : ['account'],
-    'init_xml': [],
+    'data': ['account_cancel_view.xml' ],
-    'update_xml': ['account_cancel_view.xml' ],
+    'demo': [],
-    'demo_xml': [],
     'installable': True,
     'auto_install': False,
-    "certificate" : "001101250473177981989",
+    'certificate': '001101250473177981989',
 
 
 }

addons/account_chart/__openerp__.py

@@ -23,7 +23,7 @@
 {
     'name': 'Template of Charts of Accounts',
     'version': '1.1',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 Remove minimal account chart.
 =============================
@@ -33,9 +33,8 @@ Deactivates minimal chart of accounts.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
-    'init_xml': [],
+    'data': [],
-    'update_xml': [],
+    'demo': [],
-    'demo_xml': [],
     'installable': True,
     'certificate': '0073332443901',
 }

addons/account_check_writing/__openerp__.py

@@ -19,29 +19,24 @@
 #
 ##############################################################################
 {
-    "name" : "Check Writing",
+    'name': 'Check Writing',
-    "version" : "1.1",
+    'version': '1.1',
-    "author" : "OpenERP SA, NovaPoint Group",
+    'author': 'OpenERP SA, NovaPoint Group',
-    "category": "Generic Modules/Accounting",
+    'category': 'Generic Modules/Accounting',
-    "description": """
+    'description': """
 Module for the Check Writing and Check Printing.
+================================================
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
+    'depends' : ['account_voucher'],
-    "depends" : [
+    'data': [
-        "account_voucher",
-        ],
-    'update_xml': [
         'account_check_writing_report.xml',
         'account_view.xml',
         'account_voucher_view.xml',
         'account_check_writing_data.xml',
     ],
-    'demo_xml': [
+    'demo': ['account_demo.xml'],
-        'account_demo.xml',
+    'test': [],
-    ],
-    'test': [
-    ],
     'installable': True,
     'active': False,
 }

addons/account_coda/__openerp__.py

@@ -20,74 +20,92 @@
 #
 ##############################################################################
 {
-    "name": 'Belgium - Import Bank CODA Statements',
+    'name': 'Belgium - Import Bank CODA Statements',
-    "version": '2.1',
+    'version': '2.1',
-    "author": 'Noviat',
+    'author': 'Noviat',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
-    "description": '''
+    'description': '''
 Module to import CODA bank statements.
 ======================================
 
 Supported are CODA flat files in V2 format from Belgian bank accounts.
+----------------------------------------------------------------------
     * CODA v1 support.
     * CODA v2.2 support.
     * Foreign Currency support.
     * Support for all data record types (0, 1, 2, 3, 4, 8, 9).
-    * Parsing & logging of all Transaction Codes and Structured Format Communications.
+    * Parsing & logging of all Transaction Codes and Structured Format 
+      Communications.
     * Automatic Financial Journal assignment via CODA configuration parameters.
     * Support for multiple Journals per Bank Account Number.
-    * Support for multiple statements from different bank accounts in a single CODA file.
+    * Support for multiple statements from different bank accounts in a single 
-    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' in the CODA Bank Account configuration records).
+      CODA file.
-    * Multi-language CODA parsing, parsing configuration data provided for EN, NL, FR.
+    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' in 
+      the CODA Bank Account configuration records).
+    * Multi-language CODA parsing, parsing configuration data provided for EN, 
+      NL, FR.
 
 The machine readable CODA Files are parsed and stored in human readable format in 
 CODA Bank Statements. Also Bank Statements are generated containing a subset of 
-the CODA information (only those transaction lines that are required for the creation 
+the CODA information (only those transaction lines that are required for the 
-of the Financial Accounting records). The CODA Bank Statement is a 'read-only' 
+creation of the Financial Accounting records). The CODA Bank Statement is a 
-object, hence remaining a reliable representation of the original CODA file whereas 
+'read-only' object, hence remaining a reliable representation of the original
-the Bank Statement will get modified as required by accounting business processes.
+CODA file whereas the Bank Statement will get modified as required by accounting 
+business processes.
 
 CODA Bank Accounts configured as type 'Info' will only generate CODA Bank Statements.
 
-A removal of one object in the CODA processing results in the removal of the associated 
+A removal of one object in the CODA processing results in the removal of the 
-objects. The removal of a CODA File containing multiple Bank Statements will also 
+associated objects. The removal of a CODA File containing multiple Bank 
-remove those associated statements.
+Statements will also remove those associated statements.
 
 The following reconciliation logic has been implemented in the CODA processing:
-
+-------------------------------------------------------------------------------
-1) The Company's Bank Account Number of the CODA statement is compared against the Bank Account Number field of the Company's CODA Bank Account configuration records (whereby bank accounts defined in type='info' configuration records are ignored). If this is the case an 'internal transfer' transaction is generated using the 'Internal Transfer Account' field of the CODA File Import wizard.
+    1) The Company's Bank Account Number of the CODA statement is compared against 
-2) As a second step the 'Structured Communication' field of the CODA transaction line is matched against the reference field of in- and outgoing invoices (supported : Belgian Structured Communication Type).
+       the Bank Account Number field of the Company's CODA Bank Account 
-3) When the previous step doesn't find a match, the transaction counterparty is located via the Bank Account Number configured on the OpenERP Customer and Supplier records.
+       configuration records (whereby bank accounts defined in type='info' 
-4) In case the previous steps are not successful, the transaction is generated by using the 'Default Account for Unrecognized Movement' field of the CODA File Import wizard in order to allow further manual processing.
+       configuration records are ignored). If this is the case an 'internal transfer'
+       transaction is generated using the 'Internal Transfer Account' field of the 
+       CODA File Import wizard.
+    2) As a second step the 'Structured Communication' field of the CODA transaction
+       line is matched against the reference field of in- and outgoing invoices 
+       (supported : Belgian Structured Communication Type).
+    3) When the previous step doesn't find a match, the transaction counterparty is 
+       located via the Bank Account Number configured on the OpenERP Customer and 
+       Supplier records.
+    4) In case the previous steps are not successful, the transaction is generated 
+       by using the 'Default Account for Unrecognized Movement' field of the CODA 
+       File Import wizard in order to allow further manual processing.
 
 In stead of a manual adjustment of the generated Bank Statements, you can also 
 re-import the CODA after updating the OpenERP database with the information that 
 was missing to allow automatic reconciliation.
 
 Remark on CODA V1 support:
-In some cases a transaction code, transaction category or structured communication code has been given a new or clearer description in CODA V2.
+~~~~~~~~~~~~~~~~~~~~~~~~~~
-The description provided by the CODA configuration tables is based upon the CODA V2.2 specifications.
+In some cases a transaction code, transaction category or structured 
+communication code has been given a new or clearer description in CODA V2.The
+description provided by the CODA configuration tables is based upon the CODA 
+V2.2 specifications.
 If required, you can manually adjust the descriptions via the CODA configuration menu.
 ''',
-    "images"   : ["images/coda_logs.jpeg","images/import_coda_logs.jpeg"],
+    'images'   : ['images/coda_logs.jpeg','images/import_coda_logs.jpeg'],
-    "depends": ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'],
+    'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'],
-    "demo_xml": [],
+    'demo': [],
-    "init_xml": [
+    'data': [
         'account_coda_trans_type.xml',
         'account_coda_trans_code.xml',
         'account_coda_trans_category.xml',
         'account_coda_comm_type.xml',
-    ],
-    "update_xml" : [
         'security/ir.model.access.csv',
         'security/account_security.xml',
         'account_coda_wizard.xml',
         'account_coda_view.xml',
     ],
-    "auto_install": False,
+    'auto_install': False,
-    "installable": True,
+    'installable': True,
-    "license": 'AGPL-3',
+    'license': 'AGPL-3',
-    "certificate" : "001237207321716002029",
+    'certificate' : '001237207321716002029',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_followup/__openerp__.py

@@ -28,30 +28,27 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
 ==========================================================================
 
 You can define your multiple levels of recall through the menu:
+---------------------------------------------------------------
+    **Invoicing** / **Configuration** / **Miscellaneous** / **Follow-ups**
 
-    Invoicing/Configuration/Miscellaneous/Follow-ups
+Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
-
+------------------------------------------------------------------------------------------------------
-Once it is defined, you can automatically print recalls every day through simply 
+    **Invoicing** / **Periodical Processing** / **Billing** / **Send follow-ups**
-clicking on the menu:
-
-    Invoicing/Periodical Processing/Billing/Send follow-ups
 
 It will generate a PDF with all the letters according to the the different levels 
 of recall defined. You can define different policies for different companies. You 
 can also send mail to the customer.
 
-Note that if you want to check the follow-up level for a given partner/account 
+Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu:
-entry, you can do from in the menu:
+------------------------------------------------------------------------------------------------------------------
-
+    **Invoicing** / **Reporting** / **Generic Reporting** / **Partners** / **Follow-ups Sent**
-    Invoicing/Reporting/Generic Reporting/Partners/Follow-ups Sent
 
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/follow_ups.jpeg','images/send_followups.jpeg'],
     'depends': ['account_accountant', 'mail'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'security/account_followup_security.xml',
         'security/ir.model.access.csv',
         'wizard/account_followup_print_view.xml',
@@ -60,7 +57,7 @@ entry, you can do from in the menu:
         'account_followup_view.xml',
         'account_followup_data.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': [
         'test/account_followup.yml',
         'test/account_followup_report.yml',

addons/account_payment/__openerp__.py

@@ -20,26 +20,31 @@
 ##############################################################################
 
 {
-    "name": "Suppliers Payment Management",
+    'name': 'Suppliers Payment Management',
-    "version": "1.1",
+    'version': '1.1',
-    "author": "OpenERP SA",
+    'author': 'OpenERP SA',
-    "category": "Accounting & Finance",
+    'category': 'Accounting & Finance',
-    "description": """
+    'description': """
 Module to manage the payment of your supplier invoices.
 =======================================================
 
-This module allows you to create and manage your payment orders, with purposes to 
+This module allows you to create and manage your payment orders, with purposes to
+--------------------------------------------------------------------------------- 
     * serve as base for an easy plug-in of various automated payment mechanisms.
     * provide a more efficient way to manage invoice payment.
 
 Warning:
---------
+~~~~~~~~
-The confirmation of a payment order does _not_ create accounting entries, it just records the fact that you gave your payment order to your bank. The booking of your order must be encoded as usual through a bank statement. Indeed, it's only when you get the confirmation from your bank that your order has been accepted that you can book it in your accounting. To help you with that operation, you have a new option to import payment orders as bank statement lines.
+The confirmation of a payment order does _not_ create accounting entries, it just 
+records the fact that you gave your payment order to your bank. The booking of 
+your order must be encoded as usual through a bank statement. Indeed, it's only 
+when you get the confirmation from your bank that your order has been accepted 
+that you can book it in your accounting. To help you with that operation, you 
+have a new option to import payment orders as bank statement lines.
     """,
     'images': ['images/payment_mode.jpeg','images/payment_order.jpeg'],
     'depends': ['account','account_voucher'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'security/account_payment_security.xml',
         'security/ir.model.access.csv',
         'wizard/account_payment_pay_view.xml',
@@ -51,7 +56,7 @@ The confirmation of a payment order does _not_ create accounting entries, it jus
         'account_invoice_view.xml',
         'account_payment_report.xml',
     ],
-    'demo_xml': ['account_payment_demo.xml'],
+    'demo': ['account_payment_demo.xml'],
     'test': [
         'test/account_payment_demo.yml',
         'test/cancel_payment_order.yml',

addons/account_sequence/__openerp__.py

@@ -22,7 +22,7 @@
 {
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
     'description': """
 This module maintains internal sequence number for accounting entries.
 ======================================================================
@@ -30,6 +30,7 @@ This module maintains internal sequence number for accounting entries.
 Allows you to configure the accounting sequences to be maintained.
 
 You can customize the following attributes of the sequence:
+-----------------------------------------------------------
     * Prefix
     * Suffix
     * Next Number
@@ -40,13 +41,12 @@ You can customize the following attributes of the sequence:
     'website': 'http://www.openerp.com',
     'images': ['images/internal_sequence_number.jpeg'],
     'depends': ['account'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'account_sequence_data.xml',
         'account_sequence_installer_view.xml',
         'account_sequence.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '00475376442024623469',

addons/account_voucher/__openerp__.py

@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    "name" : "eInvoicing & Payments",
+    'name' : 'eInvoicing & Payments',
-    "version" : "1.0",
+    'version' : '1.0',
-    "author" : 'OpenERP SA',
+    'author' : 'OpenERP SA',
-    "summary": 'Send Invoices and Track Payments',
+    'summary': 'Send Invoices and Track Payments',
-    "description": """
+    'description': """
-eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra.
+eInvoicing & Payments module manage all Voucher Entries such as 'Reconciliation Entries', 'Adjustment Entries', 'Closing or Opening Entries' for Sales, Purchase, Bank, Cash, Expense, Contra.
 ==============================================================================================================================================================================================
 
     * Voucher Entry
@@ -33,47 +33,43 @@ eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation
     * Voucher Payment [Customer & Supplier]
     * Cheque Register
     """,
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
-    "sequence": 4,
+    'sequence': 4,
-    "website" : "http://openerp.com",
+    'website' : 'http://openerp.com',
-    "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
+    'images' : ['images/customer_payment.jpeg','images/journal_voucher.jpeg','images/sales_receipt.jpeg','images/supplier_voucher.jpeg'],
-    "depends" : ["account"],
+    'depends' : ['account'],
-    "init_xml" : [
+    'demo' : [],
+    'data' : [
+        'security/ir.model.access.csv',
+        'account_voucher_sequence.xml',
+        'account_voucher_workflow.xml',
+        'account_voucher_report.xml',
+        'wizard/account_statement_from_invoice_view.xml',
+        'account_voucher_view.xml',
+        'voucher_payment_receipt_view.xml',
+        'voucher_sales_purchase_view.xml',
+        'account_voucher_wizard.xml',
+        'account_voucher_pay_invoice.xml',
+        'report/account_voucher_sales_receipt_view.xml',
+        'security/account_voucher_security.xml',
         'account_voucher_data.xml',
     ],
-
+    'test' : [
-    "demo_xml" : [],
+        'test/account_voucher.yml',
-
+        'test/sales_receipt.yml',
-    "update_xml" : [
+        'test/sales_payment.yml',
-        "security/ir.model.access.csv",
+        'test/account_voucher_report.yml',
-        "account_voucher_sequence.xml",
+        'test/case1_usd_usd.yml',
-        "account_voucher_workflow.xml",
+        'test/case2_usd_eur_debtor_in_eur.yml',
-        "account_voucher_report.xml",
+        'test/case2_usd_eur_debtor_in_usd.yml',
-        "wizard/account_statement_from_invoice_view.xml",
+        'test/case3_eur_eur.yml',
-        "account_voucher_view.xml",
+        'test/case4_cad_chf.yml',
-        "voucher_payment_receipt_view.xml",
+        'test/case_eur_usd.yml',
-        "voucher_sales_purchase_view.xml",
-        "account_voucher_wizard.xml",
-        "account_voucher_pay_invoice.xml",
-        "report/account_voucher_sales_receipt_view.xml",
-        "security/account_voucher_security.xml"
-    ],
-    "test" : [
-        "test/account_voucher.yml",
-        "test/sales_receipt.yml",
-        "test/sales_payment.yml",
-        "test/account_voucher_report.yml",
-        "test/case1_usd_usd.yml",
-        "test/case2_usd_eur_debtor_in_eur.yml",
-        "test/case2_usd_eur_debtor_in_usd.yml",
-        "test/case3_eur_eur.yml",
-        "test/case4_cad_chf.yml",
-        "test/case_eur_usd.yml",
     ],
     'certificate': '0037580727101',
-    "auto_install": False,
+    'auto_install': False,
-    "application": True,
+    'application': True,
-    "installable": True,
+    'installable': True,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_voucher/test/account_voucher.yml

@@ -54,7 +54,7 @@
     currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher Axelor
-    narration: Basic PC
+    narration: PC Assemble SC234
     line_dr_ids:
       - account_id: account.cash
         amount: 1000.0

addons/account_voucher/test/account_voucher_report.yml

@@ -6,7 +6,7 @@
     company_id: base.main_company
     journal_id: account.bank_journal
     name: Voucher Axelor
-    narration: Basic PC
+    narration: PC Assemble SC234
     amount: 1000.0
     line_ids:
       - account_id: account.cash

addons/account_voucher/test/case1_usd_usd.yml

@@ -79,7 +79,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -112,7 +112,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account_voucher/test/case2_suppl_usd_eur.yml

@@ -50,7 +50,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -85,7 +85,7 @@
     type : in_invoice
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml

@@ -85,7 +85,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -118,7 +118,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml

@@ -85,7 +85,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -118,7 +118,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account_voucher/test/case3_eur_eur.yml

@@ -39,7 +39,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 150.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -72,7 +72,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 80.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account_voucher/test/case4_cad_chf.yml

@@ -73,7 +73,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account_voucher/test/case_eur_usd.yml

@@ -52,7 +52,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 1000.0
         quantity: 1.0
         product_id: product.product_product_3

addons/account_voucher/test/sales_payment.yml

@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3

addons/analytic/__openerp__.py

@@ -20,13 +20,13 @@
 ##############################################################################
 
 {
-    "name" : "Analytic Accounting",
+    'name' : 'Analytic Accounting',
-    "version": "1.1",
+    'version': '1.1',
-    "author" : "OpenERP SA",
+    'author' : 'OpenERP SA',
-    "website" : "http://www.openerp.com",
+    'website' : 'http://www.openerp.com',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
-    "depends" : ["base", "decimal_precision", "mail"],
+    'depends' : ['base', 'decimal_precision', 'mail'],
-    "description": """
+    'description': """
 Module for defining analytic accounting object.
 ===============================================
 
@@ -34,16 +34,15 @@ In OpenERP, analytic accounts are linked to general accounts but are treated
 totally independently. So, you can enter various different analytic operations
 that have no counterpart in the general financial accounts.
     """,
-    "init_xml" : [],
+    'data': [
-    "update_xml": ['security/analytic_security.xml',
+        'security/analytic_security.xml',
-                   "security/ir.model.access.csv",
+        'security/ir.model.access.csv',
-                   "analytic_sequence.xml",
+        'analytic_sequence.xml',
-                   "analytic_view.xml"
+        'analytic_view.xml'
-    ],
-    'demo_xml': [
     ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : "00462253285027988541",
+    'certificate' : '00462253285027988541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/analytic_contract_expense_project/__openerp__.py

@@ -26,18 +26,14 @@
     'category': 'Hidden',
     'description': """
 This module is for modifying project view to show some data related to the hr_expense module.
-
+=============================================================================================
 """,
-    "author": "OpenERP S.A.",
+    'author': 'OpenERP S.A.',
-    "website": "http://www.openerp.com/",
+    'website': 'http://www.openerp.com/',
-    "depends": ["analytic_contract_hr_expense","project"],
+    'depends': ['analytic_contract_hr_expense','project'],
-    "init_xml": [],
+    'data': ['analytic_contract_expense_project_view.xml'],
-    "update_xml": [
+    'demo': [],
-                    "analytic_contract_expense_project_view.xml",
+    'css' : [],
-                    ],
-    'demo_xml': [],
-    "css" : [
-             ],
     'installable': True,
     'auto_install': True,
 }

addons/analytic_contract_hr_expense/__openerp__.py

@@ -26,18 +26,14 @@
     'category': 'Hidden',
     'description': """
 This module is for modifying account analytic view to show some data related to the hr_expense module.
-
+======================================================================================================
 """,
-    "author": "OpenERP S.A.",
+    'author': 'OpenERP S.A.',
-    "website": "http://www.openerp.com/",
+    'website': 'http://www.openerp.com/',
-    "depends": ["hr_expense","account_analytic_analysis"],
+    'depends': ['hr_expense','account_analytic_analysis'],
-    "init_xml": [],
+    'data': ['analytic_contract_hr_expense_view.xml'],
-    "update_xml": [
+    'demo': [],
-                    "analytic_contract_hr_expense_view.xml",
+    'css' : [],
-                    ],
-    'demo_xml': [],
-    "css" : [
-             ],
     'installable': True,
     'auto_install': True,
 }

addons/analytic_contract_project/__openerp__.py

@@ -20,18 +20,18 @@
 ##############################################################################
 
 {
-    "name" : "Contract on Project",
+    'name' : 'Contract on Project',
-    "version": "1.1",
+    'version': '1.1',
-    "author" : "OpenERP SA",
+    'author' : 'OpenERP SA',
     'category': 'Hidden',
-    "website" : "http://www.openerp.com",
+    'website' : 'http://www.openerp.com',
-    "depends" : ["project", "account_analytic_analysis"],
+    'depends' : ['project', 'account_analytic_analysis'],
-    "description": """
+    'description': """
 Add "Contract Data" in project view.
+====================================
     """,
-    "init_xml" : [],
+    'data': ['analytic_contract_project_view.xml'],
-    "update_xml": ["analytic_contract_project_view.xml"],
+    'demo': [],
-    'demo_xml': [],
     'installable': True,
     'auto_install': True,
 }

addons/analytic_user_function/__openerp__.py

@@ -41,9 +41,8 @@ compatible with older configurations.
     'website': 'http://www.openerp.com',
     'images': ['images/analytic_user_function.jpeg'],
     'depends': ['hr_timesheet_sheet'],
-    'init_xml': [],
+    'data': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
-    'update_xml': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
+    'demo': [],
-    'demo_xml': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0082277138269',

addons/anonymization/__openerp__.py

@@ -40,11 +40,7 @@ anonymization process to recover your previous data.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'demo': ['anonymization_demo.xml'],
-    'update_xml': [],
-    'demo_xml': [
-        'anonymization_demo.xml',
-    ],
     'data': [
         'ir.model.fields.anonymization.csv',
         'security/ir.model.access.csv',

addons/anonymization/anonymization_view.xml

@@ -76,7 +76,7 @@
         </field>
     </record>
 
-      <!-- ACTION -->
+    <!-- ACTION -->
 
     <record model="ir.actions.act_window" id="action_ir_model_fields_anonymize_wizard">
         <field name="name">Anonymize Database</field>
@@ -163,4 +163,3 @@
 
 </data>
 </openerp>
-

addons/association/__openerp__.py

@@ -33,8 +33,8 @@ membership products (schemes).
     """,
     'author': 'OpenERP SA',
     'depends': ['base_setup', 'membership', 'event'],
-    'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'],
+    'data': ['security/ir.model.access.csv', 'profile_association.xml'],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0078696047261',

addons/audittrail/__openerp__.py

@@ -34,13 +34,12 @@ and can check logs.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'wizard/audittrail_view_log_view.xml',
         'audittrail_view.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': ['audittrail_demo.xml'],
+    'demo': ['audittrail_demo.xml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0062572348749',

addons/auth_anonymous/__openerp__.py

@@ -1,19 +1,16 @@
 {
- 'name': 'Anonymous',
+    'name': 'Anonymous',
- 'description': 'Allow anonymous access to OpenERP.',
+    'description': """
- 'author': 'OpenERP SA',
+Allow anonymous access to OpenERP.
- 'version': '1.0',
+==================================
- 'category': 'Authentication',
+ """,
- 'website': 'http://www.openerp.com',
+    'author': 'OpenERP SA',
- 'installable': True,
+    'version': '1.0',
- 'depends': ['web'],
+    'category': 'Authentication',
- 'data': [
+    'website': 'http://www.openerp.com',
-    'auth_anonymous.xml',
+    'installable': True,
- ],
+    'depends': ['web'],
- 'js': [
+    'data': ['auth_anonymous.xml'],
-    'static/src/js/auth_anonymous.js',
+    'js': ['static/src/js/auth_anonymous.js'],
- ],
+    'qweb': ['static/src/xml/auth_anonymous.xml'],
- 'qweb': [
-     'static/src/xml/auth_anonymous.xml',
- ],
 }

addons/auth_anonymous/static/src/js/auth_anonymous.js

@@ -26,10 +26,10 @@ openerp.auth_anonymous = function(instance) {
         start: function() {
             var self = this;
             this._super.apply(this, arguments);
-            this.$element.find('.oe_topbar_anonymous_login').click(function() {
+            this.$el.find('.oe_topbar_anonymous_login').click(function() {
                 var p = self.getParent();
                 var am = p.action_manager;
-                p.$element.find('.oe_leftbar').hide();
+                p.$el.find('.oe_leftbar').hide();
                 am.do_action({
                     type:'ir.actions.client',
                     tag:'login',

addons/auth_ldap/__openerp__.py

@@ -19,18 +19,18 @@
 ##############################################################################
 
 {
-    "name" : "Authentication via LDAP",
+    'name' : 'Authentication via LDAP',
-    "version" : "1.0",
+    'version' : '1.0',
-    "depends" : ["base"],
+    'depends' : ['base'],
-    "images" : ["images/ldap_configuration.jpeg"],
+    'images' : ['images/ldap_configuration.jpeg'],
-    "author" : "OpenERP SA",
+    'author' : 'OpenERP SA',
-    "description": """
+    'description': """
 Adds support for authentication by LDAP server.
 ===============================================
 This module allows users to login with their LDAP username and password, and
 will automatically create OpenERP users for them on the fly.
 
-Note: This module only work on servers who have Python's ``ldap`` module installed.
+**Note:** This module only work on servers who have Python's ``ldap`` module installed.
 
 Configuration:
 --------------
@@ -64,7 +64,7 @@ It is also possible to have local OpenERP users in the database along with
 LDAP-authenticated users (the Administrator account is one obvious example).
 
 Here is how it works:
-
+---------------------
     * The system first attempts to authenticate users against the local OpenERP
       database;
     * if this authentication fails (for example because the user has no local
@@ -84,7 +84,7 @@ Template*. If set, this user will be used as template to create the local users
 whenever someone authenticates for the first time via LDAP authentication. This
 allows pre-setting the default groups and menus of the first-time users.
 
-Warning: if you set a password for the user template, this password will be
+**Warning:** if you set a password for the user template, this password will be
          assigned as local password for each new LDAP user, effectively setting
          a *master password* for these users (until manually changed). You
          usually do not want this. One easy way to setup a template user is to
@@ -98,19 +98,17 @@ Interaction with base_crypt:
 The base_crypt module is not compatible with this module, and will disable LDAP
 authentication if installed at the same time.
     """,
-
+    'website' : 'http://www.openerp.com',
-
+    'category' : 'Authentication',
-    "website" : "http://www.openerp.com",
+    'data' : [
-    "category" : "Authentication",
+        'users_ldap_view.xml',
-    "data" : [
+        'user_ldap_installer.xml',
-        "users_ldap_view.xml",
+        'security/ir.model.access.csv',
-        "user_ldap_installer.xml",
-        "security/ir.model.access.csv",
     ],
-    "auto_install": False,
+    'auto_install': False,
-    "installable": True,
+    'installable': True,
-    "certificate" : "001141446349334700221",
+    'certificate' : '001141446349334700221',
-    "external_dependencies" : {
+    'external_dependencies' : {
         'python' : ['ldap'],
     }
 }

addons/auth_oauth/__openerp__.py

@@ -24,27 +24,21 @@
     'name': 'OAuth2 Authentication',
     'version': '1.0',
     'category': 'Tools',
-    'description': """Allow users to login through Google OAuth2.""",
+    'description': """
+Allow users to login through Google OAuth2.
+===========================================
+""",
     'author': 'Victor Tabuenca',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'web', 'base_setup'],
     'data': [
         'auth_oauth_data.xml',
+        'auth_oauth_view.xml'
     ],
-    'update_xml': [
+    'js': ['static/src/js/auth_oauth.js'],
-        'auth_oauth_view.xml',
+    'css': ['static/lib/zocial/css/zocial.css'],
-        'res_config.xml',
+    'qweb': ['static/src/xml/auth_oauth.xml'],
-    ],
-    'js': [
-        'static/src/js/auth_oauth.js',
-    ],
-    'css': [
-        'static/lib/zocial/css/zocial.css',
-    ],
-    'qweb': [
-        'static/src/xml/auth_oauth.xml',
-    ],
     'installable': True,
     'auto_install': False,
 }

addons/auth_oauth/static/src/js/auth_oauth.js

@@ -4,7 +4,7 @@ openerp.auth_oauth = function(instance) {
     instance.web.Login = instance.web.Login.extend({
         start: function(parent, params) {
             var d = this._super.apply(this, arguments);
-            this.$element.on('click', 'a.zocial', this.on_oauth_sign_in);
+            this.$el.on('click', 'a.zocial', this.on_oauth_sign_in);
             this.oauth_providers = [];
             if(this.params.oauth_error === 1) {
                 this.do_warn("Sign up error.","Sign up is not allowed on this database.");

addons/auth_openid/__openerp__.py

@@ -24,23 +24,18 @@
     'name': 'OpenID Authentification',
     'version': '2.0',
     'category': 'Tools',
-    'description': """Allow users to login through OpenID.""",
+    'description': """
+Allow users to login through OpenID.
+====================================
+""",
     'author': 'OpenERP s.a.',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'web'],
-    'data': [
+    'data': ['res_users.xml'],
-        'res_users.xml',
+    'js': ['static/src/js/auth_openid.js'],
-    ],
+    'css': ['static/src/css/openid.css'],
-    'js': [
+    'qweb': ['static/src/xml/auth_openid.xml'],
-        'static/src/js/auth_openid.js',
-    ],
-    'css': [
-        'static/src/css/openid.css',
-    ],
-    'qweb': [
-        'static/src/xml/auth_openid.xml',
-    ],
     'external_dependencies': {
         'python' : ['openid'],
     },

addons/auth_openid/static/src/js/auth_openid.js

@@ -8,7 +8,7 @@ instance.web.Login = instance.web.Login.extend({
         this._super.apply(this, arguments);
         var self = this;
 
-        this._default_error_message = this.$element.find('.oe_login_error_message').text();
+        this._default_error_message = this.$el.find('.oe_login_error_message').text();
 
         this.$openid_selected_button = $();
         this.$openid_selected_input = $();
@@ -32,7 +32,7 @@ instance.web.Login = instance.web.Login.extend({
             this.do_openid_select('a[data-url=""]', 'login,password', true);
         }
 
-        this.$element.find('a[data-url]').click(function (event) {
+        this.$el.find('a[data-url]').click(function (event) {
             event.preventDefault();
             var selected_oidh = $(this).attr('href').substr(1);
             if (selected_oidh != self.$openid_selected_provider) {
@@ -48,10 +48,10 @@ instance.web.Login = instance.web.Login.extend({
         var self = this;
 
             self.$openid_selected_button.add(self.$openid_selected_input).removeClass('selected');
-            self.$openid_selected_button = self.$element.find(button).addClass('selected');
+            self.$openid_selected_button = self.$el.find(button).addClass('selected');
 
             var input = _(provider.split(',')).map(function(p) { return 'li[data-provider="'+p+'"]'; }).join(',');
-            self.$openid_selected_input = self.$element.find(input).addClass('selected');
+            self.$openid_selected_input = self.$el.find(input).addClass('selected');
 
             self.$openid_selected_input.find('input:first').focus();
             self.$openid_selected_provider = (self.$openid_selected_button.attr('href') || '').substr(1);
@@ -61,7 +61,7 @@ instance.web.Login = instance.web.Login.extend({
             }
 
             if (!noautosubmit && self.$openid_selected_input.length == 0) {
-                self.$element.find('form').submit();
+                self.$el.find('form').submit();
             }
 
     },
@@ -96,7 +96,7 @@ instance.web.Login = instance.web.Login.extend({
                 localStorage.setItem('openid-login', id);
             }
 
-            var db = this.$element.find("form [name=db]").val();
+            var db = this.$el.find("form [name=db]").val();
             var openid_url = dataurl.replace('{id}', id);
 
             this.do_openid_login(db, openid_url);
@@ -129,12 +129,12 @@ instance.web.Login = instance.web.Login.extend({
 
     do_warn: function(title, msg) {
         //console.warn(title, msg);
-        this.$element.find('.oe_login_error_message').text(msg).show();
+        this.$el.find('.oe_login_error_message').text(msg).show();
         this._super(title, msg);
     },
 
     reset_error_message: function() {
-        this.$element.find('.oe_login_error_message').text(this._default_error_message);
+        this.$el.find('.oe_login_error_message').text(this._default_error_message);
     }
 
 });

addons/auth_reset_password/__openerp__.py

@@ -1,22 +1,17 @@
 {
- 'name': 'Reset Password',
+    'name': 'Reset Password',
- 'description': 'Allow users to reset their password from the login page',
+    'description': """
- 'author': 'OpenERP SA',
+Allow users to reset their password from the login page.
- 'version': '1.0',
+========================================================
- 'category': 'Authentication',
+""",
- 'website': 'http://www.openerp.com',
+    'author': 'OpenERP SA',
- 'installable': True,
+    'version': '1.0',
- 'depends': ['auth_anonymous', 'email_template'],
+    'category': 'Authentication',
- 'data': [
+    'website': 'http://www.openerp.com',
-     'auth_reset_password.xml',
+    'installable': True,
- ],
+    'depends': ['auth_anonymous', 'email_template'],
- 'js': [
+    'data': ['auth_reset_password.xml'],
-     'static/src/js/reset_password.js',
+    'js': ['static/src/js/reset_password.js'],
- ],
+    'css': ['static/src/css/reset_password.css'],
- 'css': [
+    'qweb': ['static/src/xml/reset_password.xml'],
-     'static/src/css/reset_password.css',
- ],
- 'qweb': [
-     'static/src/xml/reset_password.xml',
- ],
 }

addons/auth_reset_password/static/src/js/reset_password.js

@@ -2,7 +2,7 @@ openerp.auth_reset_password = function(instance) {
     var _t = instance.web._t;
     instance.web.Login.include({
         start: function() {
-            var $e = this.$element;
+            var $e = this.$el;
             $e.find('a.oe_login_switch').click(function() {
                 $e.find('ul.oe_login_switch').toggle();
                 var $m = $e.find('form input[name=is_reset_pw]');
@@ -15,7 +15,7 @@ openerp.auth_reset_password = function(instance) {
                 ev.preventDefault();
             }
 
-            var $e = this.$element;
+            var $e = this.$el;
             var db = $e.find("form [name=db]").val();
             if (!db) {
                 this.do_warn(_t("Login"), _t("No database selected !"));

addons/auth_signup/__openerp__.py

@@ -21,20 +21,17 @@
 
 {
     'name': 'Signup',
-    'description': 'Allow users to sign up',
+    'description': """
+Allow users to sign up.
+=======================
+    """,
     'author': 'OpenERP SA',
     'version': '1.0',
     'category': 'Authentication',
     'website': 'http://www.openerp.com',
     'installable': True,
     'depends': ['base_setup'],
-    'data': [
+    'data': ['res_config.xml'],
-        'res_config.xml',
+    'js': ['static/src/js/auth_signup.js'],
-    ],
+    'qweb': ['static/src/xml/auth_signup.xml'],
-    'js': [
-        'static/src/js/auth_signup.js',
-    ],
-    'qweb': [
-        'static/src/xml/auth_signup.xml',
-    ],
 }

addons/base_action_rule/__openerp__.py

@@ -29,21 +29,19 @@ This module allows to implement action rules for any object.
 
 Use automated actions to automatically trigger actions for various screens.
 
-Example: A lead created by a specific user may be automatically set to a specific
+**Example:** A lead created by a specific user may be automatically set to a specific
 sales team, or an opportunity which still has status pending after 14 days might
 trigger an automatic reminder email.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'mail'],
-    'init_xml': [
+    'data': [
-        'base_action_rule_data.xml'
-    ],
-    'update_xml': [
         'base_action_rule_view.xml',
         'security/ir.model.access.csv',
+        'base_action_rule_data.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '001017908446466333429',

addons/base_calendar/__openerp__.py

@@ -20,14 +20,15 @@
 ##############################################################################
 
 {
-    "name": "Calendar Layer",
+    'name': 'Calendar Layer',
-    "version": "1.0",
+    'version': '1.0',
-    "depends": ["base", "base_status", "mail", "base_action_rule"],
+    'depends': ['base', 'base_status', 'mail', 'base_action_rule'],
     'description': """
 This is a full-featured calendar system.
 ========================================
 
 It supports:
+------------
     - Calendar of events
     - Alerts (create requests)
     - Recurring events
@@ -35,25 +36,23 @@ It supports:
 
 If you need to manage your meetings, you should install the CRM module.
     """,
-    "author": "OpenERP SA",
+    'author': 'OpenERP SA',
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
-    "init_xml": [
+    'demo': ['crm_meeting_demo.xml'],
-        'base_calendar_data.xml',
+    'data': [
-        'crm_meeting_data.xml',
-    ],
-    "demo_xml": ['crm_meeting_demo.xml'],
-    "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
         'wizard/base_calendar_invite_attendee_view.xml',
         'base_calendar_view.xml',
         'crm_meeting_view.xml',
+        'base_calendar_data.xml',
+        'crm_meeting_data.xml',
     ],
-    "test" : ['test/base_calendar_test.yml'],
+    'test' : ['test/base_calendar_test.yml'],
-    "installable": True,
+    'installable': True,
-    "auto_install": False,
+    'auto_install': False,
-    "certificate": "00694071962960352821",
+    'certificate': '00694071962960352821',
     'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
 }
 

addons/base_calendar/crm_meeting_data.xml

@@ -16,6 +16,14 @@
             <field name="name">Off-site Meeting</field>
         </record>
 
+        <record model="crm.meeting.type" id="categ_meet4">
+            <field name="name">Open Discussion</field>
+        </record>
+
+        <record model="crm.meeting.type" id="categ_meet5">
+            <field name="name">Feedback Meeting</field>
+        </record>
+
          <record model="res.request.link" id="request_link_meeting">
             <field name="name">Meeting</field>
             <field name="object">crm.meeting</field>

addons/base_calendar/crm_meeting_demo.xml

@@ -27,7 +27,7 @@
             <field eval="time.strftime('%Y-%m-05 12:00:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-05 19:00:00')" name="date_deadline"/>
             <field eval="7.0" name="duration"/>
-            <field name="state">draft</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_3" model="crm.meeting">
@@ -39,7 +39,7 @@
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
             <field eval="3.0" name="duration"/>
-            <field name="state">done</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_4" model="crm.meeting">
@@ -61,7 +61,7 @@
             <field eval="time.strftime('%Y-%m-22 11:05:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-22 16:05:00')" name="date_deadline"/>
             <field eval="5" name="duration"/>
-            <field name="state">draft</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_6" model="crm.meeting">
@@ -72,7 +72,7 @@
             <field eval="time.strftime('%Y-%m-18 2:00:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-18 10:30:00')" name="date_deadline"/>
             <field eval="8.5" name="duration"/>
-            <field name="state">done</field>
+            <field name="state">open</field>
         </record>
     </data>
 </openerp>

addons/base_calendar/crm_meeting_view.xml

@@ -70,7 +70,7 @@
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
                 <header>
-                    <field name="state"/>
+                    <field name="state" invisible="True"/>
                 </header>
                 <sheet>
                     <div class="oe_title">
@@ -115,7 +115,7 @@
                                     <label for="allday" string="All Day?"/>)
                                 </div>
                                     <field name="recurrency"
-                                        attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
+                                        attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
                             </group>
                             <group>
                                 <field name="alarm_id" widget="selection" />
@@ -245,11 +245,10 @@
         <field name="model">crm.meeting</field>
         <field name="arch" type="xml">
             <tree string="Meetings" fonts="bold:message_unread==True"
-                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="name" string="Subject" />
                 <field name="user_id"/>
                 <field name="date"/>
-                <field name="state"/>
+                <field name="state" invisible="True"/>
                 <field name="duration" />
                 <field name="message_unread" invisible="1"/>
             </tree>

addons/base_crypt/__openerp__.py

@@ -19,18 +19,18 @@
 #
 ##############################################################################
 {
-    "name" : "DB Password Encryption",
+    'name': 'DB Password Encryption',
-    "version" : "1.1",
+    'version': '1.1',
-    "author" : ['OpenERP SA', "FS3"],
+    'author': ['OpenERP SA', 'FS3'],
-    "maintainer" : "OpenERP SA",
+    'maintainer': 'OpenERP SA',
-    "website" : "http://www.openerp.com",
+    'website': 'http://www.openerp.com',
-    "category" : "Tools",
+    'category': 'Tools',
-    "description": """
+    'description': """
 Replaces cleartext passwords in the database with a secure hash.
 ================================================================
 
 For your existing user base, the removal of the cleartext passwords occurs 
-immediately when you instal base_crypt.
+immediately when you install base_crypt.
 
 All passwords will be replaced by a secure, salted, cryptographic hash, 
 preventing anyone from reading the original password in the database.
@@ -49,16 +49,16 @@ contain critical data. Appropriate security measures need to be implemented
 by the system administrator in all areas, such as: protection of database
 backups, system files, remote shell access, physical server access.
 
-Interation with LDAP authentication:
+Interaction with LDAP authentication:
-------------------------------------
+-------------------------------------
 This module is currently not compatible with the ``user_ldap`` module and
 will disable LDAP authentication completely if installed at the same time.
 """,
-    "depends" : ["base"],
+    'depends': ['base'],
-    "data" : [],
+    'data': [],
-    "auto_install": False,
+    'auto_install': False,
-    "installable": True,
+    'installable': True,
-    "certificate" : "00721290471310299725",
+    'certificate': '00721290471310299725',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_iban/__openerp__.py

@@ -21,10 +21,10 @@
 {
     'name': 'IBAN Bank Accounts',
     'version': '1.0',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for it's validity.
-=====================================================================================================================
+======================================================================================================================
 
 The ability to extract the correctly represented local accounts from IBAN accounts 
 with a single statement.
@@ -32,8 +32,7 @@ with a single statement.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['base_iban_data.xml'],
+    'data': ['base_iban_data.xml' , 'base_iban_view.xml'],
-    'update_xml': ['base_iban_view.xml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0050014379549',

addons/base_iban/base_iban_data.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!--
         Default bank account description

addons/base_module_doc_rst/__openerp__.py

@@ -34,14 +34,13 @@ This module generates the Technical Guides of selected modules in Restructured T
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'base_module_doc_rst_view.xml',
         'wizard/generate_relation_graph_view.xml',
         'wizard/tech_guide_rst_view.xml',
         'module_report.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'certificate': '001288481437217734509',
     'images': ['images/base_module_doc_rst1.jpeg'],

addons/base_module_record/__openerp__.py

@@ -39,19 +39,19 @@ This should help you to easily create reusable and publishable modules for custo
 configurations and demo/testing data.
 
 How to use it?:
+---------------
 Run Settings/Technical/Module Creation/Export Customizations As a Module wizard. 
 Select datetime criteria of recording and objects to be recorded and Record module.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'security/ir.model.access.csv',
         'wizard/base_module_record_object_view.xml',
         'wizard/base_module_record_data_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'certificate': '0083134865813',
     'images': ['images/base_module_record1.jpeg','images/base_module_record2.jpeg','images/base_module_record3.jpeg',]

addons/base_module_record/wizard/base_module_save.py

@@ -60,9 +60,8 @@ def _create_module(self, cr, uid, ids, context=None):
         "category" : "%(category)s",
         "description": \"\"\"%(description)s\"\"\",
         "depends" : [%(depends)s],
-        "init_xml" : [ ],
+        "demo" : [ %(demo_name)s],
-        "demo_xml" : [ %(demo_name)s],
+        "data" : [%(update_name)s],
-        "update_xml" : [%(update_name)s],
         "installable": True
 } """ % data
     filewrite = {
@@ -167,4 +166,4 @@ class base_module_save(osv.osv_memory):
         
 base_module_save()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_report_designer/__openerp__.py

@@ -34,9 +34,8 @@ Once you have modified it you can upload the report using the same wizard.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['wizard/base_report_design_view.xml'],
+    'data': ['wizard/base_report_design_view.xml' , 'base_report_designer_installer.xml'],
-    'update_xml': ['base_report_designer_installer.xml'],
+    'demo': [],
-    'demo_xml': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0056379010493',

addons/base_report_designer/wizard/base_report_design_view.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="view_base_report_sxw" model="ir.ui.view">
             <field name="name">Base Report sxw</field>
             <field name="model">base.report.sxw</field>
@@ -17,7 +18,7 @@
                 </footer>
             </form>
             </field>
-       </record>
+        </record>
 
         <record id="action_view_base_report_sxw" model="ir.actions.act_window">
             <field name="name">Base Report sxw</field>
@@ -43,7 +44,8 @@
             <label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
             </form>
             </field>
-       </record>
+        </record>
+
         <record id="view_base_report_file_rml" model="ir.ui.view">
             <field name="name">Base Report File sxw</field>
             <field name="model">base.report.rml.save</field>
@@ -55,6 +57,5 @@
             </field>
        </record>
 
-
     </data>
 </openerp>

addons/base_setup/static/src/js/base_setup.js

@@ -7,13 +7,13 @@ openerp.base_setup = function(openerp) {
             if (this.dataset.model === 'res.partner') {
                 /* Set names for partner categories */
                 var category_ids = [];
-                this.$element.find('.oe_kanban_partner_categories span').each(function() {
+                this.$el.find('.oe_kanban_partner_categories span').each(function() {
                     category_ids.push($(this).data('category_id'));
                 });
                 var dataset = new openerp.web.DataSetSearch(this, 'res.partner.category', self.session.context);
                 dataset.name_get(_.uniq(category_ids)).then(function(result) {
                     _.each(result, function(value) {
-                        self.$element
+                        self.$el
                             .find('.oe_kanban_partner_categories span[data-category_id=' + value[0] + ']')
                             .html(value[1]);
                     });

addons/base_status/__openerp__.py

@@ -24,19 +24,17 @@
     'version': '1.0',
     'category': 'Hidden',
     'description': """
-This module handles state and stage. It is derived from the crm_base and
+This module handles state and stage. It is derived from the crm_base and crm_case classes from crm.
-crm_case classes from crm.
+===================================================================================================
-========================================================================
 
- * ``base_state``: state management
+    * ``base_state``: state management
- * ``base_stage``: stage management
+    * ``base_stage``: stage management
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'data': [],
-    'update_xml': [],
+    'demo': [],
-    'demo_xml': [],
     'installable': True,
     'auto_install': False,
 }

addons/base_tools/__openerp__.py

@@ -1,22 +1,19 @@
 # -*- encoding: utf-8 -*-
 {
-    "name": "Base Tools",
+    'name': 'Base Tools',
-    "author": "OpenERP SA",
+    'author': 'OpenERP SA',
-    "version": "1.0",
+    'version': '1.0',
-    "depends": ["base"],
+    'depends': ['base'],
-    "category" : "Hidden/Dependency",
+    'category' : 'Hidden/Dependency',
     'description': """
 Common base for tools modules.
 ==============================
 
 Creates menu link for Tools from where tools like survey, lunch, idea are accessible if installed.
     """,
-    "init_xml": [],
+    'data': ['tools_view.xml'],
-    "update_xml": [
+    'installable': True,
-        'tools_view.xml'
+    'certificate' : '00571588675379342237'
-    ],
-    "installable": True,
-    "certificate" : "00571588675379342237"
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/base_vat/__openerp__.py

@@ -22,7 +22,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 VAT validation for Partner's VAT numbers.
 =========================================
@@ -33,19 +33,20 @@ be validated for all supported countries. The country is inferred from the
 will be validated using the Belgian rules.
 
 There are two different levels of VAT number validation:
-
+--------------------------------------------------------
- * By default, a simple off-line check is performed using the known validation
+    * By default, a simple off-line check is performed using the known validation
-   rules for the country, usually a simple check digit. This is quick and 
+      rules for the country, usually a simple check digit. This is quick and 
-   always available, but allows numbers that are perhaps not truly allocated,
+      always available, but allows numbers that are perhaps not truly allocated,
-   or not valid anymore.
+      or not valid anymore.
- * When the "VAT VIES Check" option is enabled (in the configuration of the user's
+      
-   Company), VAT numbers will be instead submitted to the online EU VIES
+    * When the "VAT VIES Check" option is enabled (in the configuration of the user's
-   database, which will truly verify that the number is valid and currently
+      Company), VAT numbers will be instead submitted to the online EU VIES
-   allocated to a EU company. This is a little bit slower than the simple
+      database, which will truly verify that the number is valid and currently
-   off-line check, requires an Internet connection, and may not be available
+      allocated to a EU company. This is a little bit slower than the simple
-   all the time. If the service is not available or does not support the
+      off-line check, requires an Internet connection, and may not be available
-   requested country (e.g. for non-EU countries), a simple check will be performed
+      all the time. If the service is not available or does not support the
-   instead.
+      requested country (e.g. for non-EU countries), a simple check will be performed
+      instead.
 
 Supported countries currently include EU countries, and a few non-EU countries
 such as Chile, Colombia, Mexico, Norway or Russia. For unsupported countries,

addons/board/__openerp__.py

@@ -34,21 +34,14 @@ The user can also publish notes.
     """,
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'board_view.xml',
         'board_mydashboard_view.xml'
     ],
-    "js": [
+    'js': ['static/src/js/dashboard.js'],
-        'static/src/js/dashboard.js',
+    'css': ['static/src/css/dashboard.css'],
-    ],
+    'qweb': ['static/src/xml/*.xml'],
-    "css": [
-        'static/src/css/dashboard.css',
-    ],
-    'qweb': [
-        "static/src/xml/*.xml",
-    ],
-
     'installable': True,
     'auto_install': False,
     'certificate': '0076912305725',

addons/board/static/src/css/dashboard.css

@@ -50,6 +50,13 @@
   content: "+";
   margin-left: 4px;
 }
+.openerp .oe_dashboard .oe_action .oe_header .oe_header_text {
+  visibility: hidden;
+  cursor: text;
+}
+.openerp .oe_dashboard .oe_action .oe_header span {
+  cursor: pointer;
+}
 .openerp .oe_dashboard .oe_action .oe_header_empty {
   padding-top: 0;
   padding-bottom: 2px;

addons/board/static/src/css/dashboard.sass

@@ -49,6 +49,11 @@
         .oe_maximize:after
           content: "+"
           margin-left: 4px
+        .oe_header_text
+          visibility: hidden
+          cursor: text
+        span
+          cursor: pointer
       .oe_header_empty
         padding-top: 0
         padding-bottom: 2px

addons/board/static/src/js/dashboard.js

@@ -18,18 +18,21 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         var self = this;
         this._super.apply(this, arguments);
 
-        this.$element.find('.oe_dashboard_column').sortable({
+        this.$el.find('.oe_dashboard_column').sortable({
             connectWith: '.oe_dashboard_column',
             handle: '.oe_header',
             scroll: false
-        }).disableSelection().bind('sortstop', self.do_save_dashboard);
+        }).bind('sortstop', self.do_save_dashboard);
 
         // Events
-        this.$element.find('.oe_dashboard_link_reset').click(this.on_reset);
+        this.$el.find('.oe_dashboard_link_reset').click(this.on_reset);
-        this.$element.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);
+        this.$el.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);
-
+        this.$el.find('h2.oe_header span.oe_header_txt').click(function(ev){
-        this.$element.delegate('.oe_dashboard_column .oe_fold', 'click', this.on_fold_action);
+            if(ev.target === ev.currentTarget)
-        this.$element.delegate('.oe_dashboard_column .oe_close', 'click', this.on_close_action);
+                self.on_header_string($(ev.target).parent());
+        });
+        this.$el.delegate('.oe_dashboard_column .oe_fold', 'click', this.on_fold_action);
+        this.$el.delegate('.oe_dashboard_column .oe_close', 'click', this.on_close_action);
 
         // Init actions
         _.each(this.node.children, function(column, column_index) {
@@ -46,6 +49,30 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             });
         });
     },
+    on_header_string:function(h2){
+        var self = this;
+        var span = h2.find('span:first').hide();
+        var input = h2.find('.oe_header_text').css('visibility','visible');
+        var attr = h2.closest(".oe_action").data('action_attrs');
+        var change_string = function(new_name){
+                attr['string'] = new_name;
+                span.text(new_name).show();
+                input.css('visibility','hidden');
+                self.do_save_dashboard();
+        }
+        input.unbind()
+        .val(span.text())
+        .change(function(event){
+            change_string($(this).val());
+        })
+        .keyup(function(event){
+            if(event.keyCode == 27){
+                //esc key to cancel changes
+                input.css('visibility','hidden');
+                span.show();
+            }
+        });
+    },
     on_reset: function() {
         this.rpc('/web/view/undo_custom', {
             view_id: this.view.fields_view.view_id,
@@ -55,7 +82,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
     on_change_layout: function() {
         var self = this;
         var qdict = {
-            current_layout : this.$element.find('.oe_dashboard').attr('data-layout')
+            current_layout : this.$el.find('.oe_dashboard').attr('data-layout')
         };
         var $dialog = instance.web.dialog($('<div>'), {
                             modal: true,
@@ -70,7 +97,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         });
     },
     do_change_layout: function(new_layout) {
-        var $dashboard = this.$element.find('.oe_dashboard');
+        var $dashboard = this.$el.find('.oe_dashboard');
         var current_layout = $dashboard.attr('data-layout');
         if (current_layout != new_layout) {
             var clayout = current_layout.split('-').length,
@@ -114,10 +141,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         var self = this;
         var board = {
                 form_title : this.view.fields_view.arch.attrs.string,
-                style : this.$element.find('.oe_dashboard').attr('data-layout'),
+                style : this.$el.find('.oe_dashboard').attr('data-layout'),
                 columns : []
             };
-        this.$element.find('.oe_dashboard_column').each(function() {
+        this.$el.find('.oe_dashboard_column').each(function() {
             var actions = [];
             $(this).find('.oe_action').each(function() {
                 var action_id = $(this).attr('data-id'),
@@ -139,7 +166,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             view_id: this.view.fields_view.view_id,
             arch: arch
         }, function() {
-            self.$element.find('.oe_dashboard_link_reset').show();
+            self.$el.find('.oe_dashboard_link_reset').show();
         });
     },
     on_load_action: function(result, index, action_attrs) {
@@ -245,11 +272,11 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             });
         }
         var rendered = QWeb.render(this.form_template, this);
-        this.$element.html(rendered);
+        this.$el.html(rendered);
     },
     no_result: function() {
         if (this.view.options.action.help) {
-            this.$element.append(
+            this.$el.append(
                 $('<div class="oe_view_nocontent">')
                     .append($('<div>').html(this.view.options.action.help || " "))
             );
@@ -296,7 +323,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
     _in_drawer: true,
     start: function () {
         var self = this;
-        this.$element
+        this.$el
             .on('click', 'h4', this.proxy('show_option'))
             .on('submit', 'form', function (e) {
                 e.preventDefault();
@@ -333,7 +360,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         var self = this;
         var getParent = this.getParent();
         var view_parent = this.getParent().getParent();
-        if (! view_parent.action || ! this.$element.find("select").val()) {
+        if (! view_parent.action || ! this.$el.find("select").val()) {
             this.do_warn("Can't find dashboard action");
             return;
         }
@@ -343,24 +370,24 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         _.each(data.contexts, context.add, context);
         _.each(data.domains, domain.add, domain);
         this.rpc('/board/add_to_dashboard', {
-            menu_id: this.$element.find("select").val(),
+            menu_id: this.$el.find("select").val(),
             action_id: view_parent.action.id,
             context_to_save: context,
             domain: domain,
             view_mode: view_parent.active_view,
-            name: this.$element.find("input").val()
+            name: this.$el.find("input").val()
         }, function(r) {
             if (r === false) {
                 self.do_warn("Could not add filter to dashboard");
             } else {
-                self.$element.toggleClass('oe_opened');
+                self.$el.toggleClass('oe_opened');
                 self.do_notify("Filter added to dashboard", '');
             }
         });
     },
     show_option:function(){
-        this.$element.toggleClass('oe_opened');
+        this.$el.toggleClass('oe_opened');
-        if (! this.$element.hasClass('oe_opened'))
+        if (! this.$el.hasClass('oe_opened'))
             return;
         this.$("input").val(this.getParent().fields_view.name || "" );
     }

addons/board/static/src/xml/board.xml

@@ -23,13 +23,15 @@
 <t t-name="DashBoard.action">
     <div t-att-data-id="action.attrs.name" class="oe_action">
         <h2 t-attf-class="oe_header #{action.attrs.string ? '' : 'oe_header_empty'}">
-            <t t-esc="action.attrs.string"/>
+            <span class="oe_header_txt"> <t t-esc="action.attrs.string"/> </span>
+            <input class = "oe_header_text" type="text"/>
             <t t-if="!action.attrs.string">&amp;nbsp;</t>
             <button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_button oe_button_create">Create</button>
             <span class='oe_icon oe_close'></span>
             <span class='oe_icon oe_minimize oe_fold' t-if="!action.attrs.fold"></span>
             <span class='oe_icon oe_maximize oe_fold' t-if="action.attrs.fold"></span>
         </h2>
+        
         <div t-attf-id="#{view.element_id}_action_#{column_index}_#{action_index}" class="oe_content" t-att-style="action.attrs.fold ? 'display: none' : null"></div>
     </div>
 </t>

addons/caldav/__openerp__.py

@@ -21,13 +21,13 @@
 
 
 {
-    "name": "Share Calendar Using CalDAV",
+    'name': 'Share Calendar Using CalDAV',
-    "version": "1.1",
+    'version': '1.1',
-    "depends": [
+    'depends': [
-                    "base",
+        'base',
-                    "document_webdav",
+        'document_webdav',
-                ],
+    ],
-     'description': """
+    'description': """
 This module contains basic functionality for Caldav system.
 ===========================================================
 
@@ -37,34 +37,39 @@ This module contains basic functionality for Caldav system.
   - Provides iCal Import/Export functionality
 
 To access Calendars using CalDAV clients, point them to:
+--------------------------------------------------------
     http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c
 
 To access OpenERP Calendar using WebCal to remote site use the URL like:
+------------------------------------------------------------------------
     http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics
 
     Where,
-        HOSTNAME: Host on which OpenERP server(With webdav) is running
+        **HOSTNAME:** Host on which OpenERP server(With webdav) is running
-        PORT : Port on which OpenERP server is running (By Default : 8069)
+        
-        DATABASE_NAME: Name of database on which OpenERP Calendar is created
+        **PORT :** Port on which OpenERP server is running (By Default : 8069)
-        CALENDAR_NAME: Name of calendar to access
+        
+        **DATABASE_NAME:** Name of database on which OpenERP Calendar is created
+        
+        **CALENDAR_NAME:** Name of calendar to access
 """, 
     'category': 'Hidden/Dependency', 
-    "author": "OpenERP SA",
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    "init_xml": ["caldav_data.xml"],
+    'demo': [],
-    "demo_xml": [],
+    'data': [
-    "update_xml": [
+        'security/ir.model.access.csv',
-                    'security/ir.model.access.csv',
+        'wizard/calendar_event_export_view.xml',
-                    'wizard/calendar_event_export_view.xml',
+        'wizard/calendar_event_import_view.xml',
-                    'wizard/calendar_event_import_view.xml',
+        'wizard/calendar_event_subscribe_view.xml',
-                    'wizard/calendar_event_subscribe_view.xml',
+        'wizard/caldav_browse_view.xml',
-                    'wizard/caldav_browse_view.xml',
+        'caldav_view.xml',
-                    'caldav_view.xml',
+        'caldav_setup.xml',
-                    'caldav_setup.xml'
+        'caldav_data.xml'
-                    ],
+    ],
-    "installable": True,
+    'installable': True,
-    "auto_install": False,
+    'auto_install': False,
-    "certificate": "00924841426645403741",
+    'certificate': '00924841426645403741',
     'images': ['images/calendar_collections.jpeg','images/calendars.jpeg','images/export_ics_file.jpeg'],
 }
 

addons/claim_from_delivery/__openerp__.py

@@ -18,23 +18,22 @@
 #
 ##############################################################################
 {
-    "name" : "Claim on Deliveries",
+    'name' : 'Claim on Deliveries',
-    "version" : "1.0",
+    'version' : '1.0',
-    "author" : "OpenERP SA",
+    'author' : 'OpenERP SA',
-    "category" : "Warehouse Management",
+    'category' : 'Warehouse Management',
-    "depends" : ["base", "crm_claim", "stock"],
+    'depends' : ['base', 'crm_claim', 'stock'],
-    "init_xml" : [],
+    'demo' : [],
-    "demo_xml" : [],
+    'description': """
-    "description": '''
 Create a claim from a delivery order.
 =====================================
 
 Adds a Claim link to the delivery order.
-''',
+""",
-    "update_xml" : ["claim_delivery_view.xml"],
+    'data' : ['claim_delivery_view.xml'],
-    "auto_install": False,
+    'auto_install': False,
-    "installable": True,
+    'installable': True,
-    "certificate" : "001101649349223746957",
+    'certificate' : '001101649349223746957',
     'images': ['images/1_claim_link_delivery_order.jpeg'],
 }
 

addons/crm/__openerp__.py

@@ -24,8 +24,8 @@
     'name': 'CRM',
     'version': '1.0',
     'category': 'Customer Relationship Management',
-    "sequence": 2,
+    'sequence': 2,
-    "summary": "Leads, Opportunities, Agenda",
+    'summary': 'Leads, Opportunities, Agenda',
     'description': """
 The generic OpenERP Customer Relationship Management.
 =====================================================
@@ -70,12 +70,11 @@ Creates a dashboard for CRM that includes:
         'board',
         'fetchmail'
     ],
-    'init_xml': [
+    'data': [
         'crm_data.xml',
         'crm_lead_data.xml',
         'crm_phonecall_data.xml',
-    ],
+
-    'update_xml': [
         'security/crm_security.xml',
         'security/ir.model.access.csv',
 
@@ -115,22 +114,22 @@ Creates a dashboard for CRM that includes:
         'res_config_view.xml',
 
     ],
-    'demo_xml': [
+    'demo': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [
-            'test/process/communication_with_customer.yml',
+        'test/process/communication_with_customer.yml',
-            'test/process/lead2opportunity2win.yml',
+        'test/process/lead2opportunity2win.yml',
-            'test/process/merge_opportunity.yml',
+        'test/process/merge_opportunity.yml',
-            'test/process/cancel_lead.yml',
+        'test/process/cancel_lead.yml',
-            'test/process/action_rule.yml',
+        'test/process/action_rule.yml',
-            'test/process/segmentation.yml',
+        'test/process/segmentation.yml',
-            'test/ui/crm_demo.yml',
+        'test/ui/crm_demo.yml',
-            'test/ui/duplicate_lead.yml',
+        'test/ui/duplicate_lead.yml',
-            'test/ui/delete_lead.yml'
+        'test/ui/delete_lead.yml'
-             ],
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,

addons/crm/crm_lead.py

@@ -277,6 +277,7 @@ class crm_lead(base_stage, osv.osv):
 
     def on_change_partner(self, cr, uid, ids, partner_id, context=None):
         result = {}
+        values = {}
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {

addons/crm/crm_lead_demo.xml

@@ -49,7 +49,6 @@ Can you send details,</field>
             <field name="section_id" ref="crm_case_section_3"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field name="description">Want to know features and benifits to use the new software.</field>
             <field eval="1" name="active"/>
         </record>
 
@@ -550,43 +549,66 @@ Andrew</field>
 
         <!-- Some messages linked to the previous opportunity -->
         <record id="message_email0" model="mail.message">
-            <field name="subject">Kitchen design</field>
+            <field name="subject">Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="body"><![CDATA[Email0 inquiry]]></field>
+            <field name="body">&lt;![CDATA[Email0 inquiry]]&gt;&lt;div&gt;&lt;font size="2"&gt;Hello,&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;&lt;br&gt;&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;I am interested in your company's product and I plan to buy a new laptop having latest technologies and affordable price.&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;Can you please send me product catalogue?&lt;/font&gt;&lt;/div&gt;</field>
             <field name="type">email</field>
         </record>
         <record id="message_note0" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="body"><![CDATA[Internal note0]]></field>
             <field name="type">comment</field>
+            <field name="body"><![CDATA[Internal note0]]></field>
+            <field name="parent_id" ref="message_email0"/>
+            <field name="body">Dear Customer,
+Thanks for showing interest in our products.
+We have attached the catalogue,
+We would like to know your interests, Let us know if we can call you for more details.
+
+Thanks</field>
         </record>
         <record id="message_note0_comment0" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="body"><![CDATA[comment on note0]]></field>
+            <field name="body">&lt;div&gt;Thanks for the information,&lt;/div&gt;&lt;div&gt;I will visit the store soon.&lt;/div&gt;</field>
             <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
         </record>
         <record id="message_note0_comment1" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="body"><![CDATA[comment1 on note0]]></field>
+            <field name="body">&lt;font color="#1f1f1f"&gt;Can you tell me if the store is open at 9:00 PM?&lt;/b&gt;&lt;/font&gt;</field>
             <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
         </record>
         <record id="message_email1" model="mail.message">
-            <field name="subject">Your inquiry</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="body"><![CDATA[hello, outgoing email]]></field>
+            <field name="body">Yes, its open till 10:00 PM, you are welcome!</field>
             <field name="type">email</field>
         </record>
-
+        <record id="message_email_12" model="mail.message">
+            <field name="subject">Inquiry</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_1"/>
+            <field name="body">Hello,
+I am Jason from Le Club SARL,
+I am intertested to attend Training organized in your company,
+Can you send details,</field>
+            <field name="type">email</field>
+        </record>
+        <record id="message_email_13" model="mail.message">
+            <field name="subject">Need Details</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_2"/>
+            <field name="body">Want to know features and benifits to use the new software.</field>
+            <field name="type">comment</field>
+        </record>
 
         <!--        Call Function to set the opportunities as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"

addons/crm/crm_lead_view.xml

@@ -155,7 +155,7 @@
                         <group>
                             <field name="partner_name" string="Company Name"/>
                             <field name="partner_id" string="Customer"
-                                on_change="on_change_partner(partner_id)" />
+                                on_change="on_change_partner(partner_id)" options='{"create_name_field": "name"}'/>
                             <label for="street" string="Address"/>
                             <div>
                                 <field name="street" placeholder="Street..."/>

addons/crm/crm_meeting_view.xml

@@ -2,9 +2,8 @@
 <openerp>
     <data>
 
-    <!-- Calendar Attendee Form View -->
+        <!-- Calendar Attendee Form View -->
-
+        <record id="attendee_form_view_inherit" model="ir.ui.view">
-    <record id="attendee_form_view_inherit" model="ir.ui.view">
             <field name="name">calendar.attendee.form.inherit</field>
             <field name="model">calendar.attendee</field>
             <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
@@ -13,7 +12,7 @@
                     <field name="categ_id" string="Event Type"/>
                 </field>
             </field>
-    </record>
+        </record>
 
     </data>
 </openerp>

addons/crm_caldav/__openerp__.py

@@ -34,13 +34,12 @@ Caldav features in Meeting.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['caldav', 'crm' ],
-    'init_xml': [
+    'data': [
-                'crm_caldav_data.xml',
+        'crm_caldav_data.xml',
-                'crm_caldav_setup.xml',
+        'crm_caldav_setup.xml',
-                ],
+        'crm_caldav_view.xml'
-
+    ],
-    'update_xml': ['crm_caldav_view.xml'],
+    'demo': [],
-    'demo_xml': [],
     'installable': True,
     'auto_install': False,
     'certificate' : '001088048737252670109',

addons/crm_claim/__openerp__.py

@@ -34,23 +34,18 @@ automatically new claims based on incoming emails.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['crm'],
-    'init_xml': [
+    'data': [
-         'crm_claim_data.xml',
-    ],
-
-    'update_xml': [
         'crm_claim_view.xml',
         'crm_claim_menu.xml',
         'security/ir.model.access.csv',
         'report/crm_claim_report_view.xml',
         'res_config_view.xml',
+        'crm_claim_data.xml',
     ],
-    'demo_xml': [
+    'demo': ['crm_claim_demo.xml'],
-        'crm_claim_demo.xml',
-    ],
     'test': ['test/process/claim.yml',
              'test/ui/claim_demo.yml'
-             ],
+    ],
     'installable': True,
     'auto_install': False,
     'certificate' : '00612027414703404749',

addons/crm_helpdesk/__openerp__.py

@@ -21,8 +21,8 @@
 
 
 {
-    'category': 'Customer Relationship Management', 
     'name': 'Helpdesk',
+    'category': 'Customer Relationship Management', 
     'version': '1.0',
     'description': """
 Helpdesk Management.
@@ -36,18 +36,14 @@ and categorize your interventions with a channel and a priority level.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['crm'],
-    'init_xml': [
+    'data': [
-         'crm_helpdesk_data.xml',
-    ],
-    'update_xml': [
         'crm_helpdesk_view.xml',
         'crm_helpdesk_menu.xml',
         'security/ir.model.access.csv',
         'report/crm_helpdesk_report_view.xml',
+        'crm_helpdesk_data.xml',
     ],
-    'demo_xml': [
+    'demo': ['crm_helpdesk_demo.xml'],
-        'crm_helpdesk_demo.xml',
-    ],
     'test': ['test/process/help-desk.yml'],
     'installable': True,
     'auto_install': False,

addons/crm_partner_assign/__openerp__.py

@@ -32,15 +32,14 @@ You can geolocalize your opportunities by using this module.
 
 Use geolocalization when assigning opportunities to partners.
 Determine the GPS coordinates according to the address of the partner.
+
 The most appropriate partner can be assigned.
 You can also use the geolocalization without using the GPS coordinates.
     """,
     'author': 'OpenERP SA',
     'depends': ['crm', 'account'],
-    'demo_xml': [
+    'demo': ['res_partner_demo.xml'],
-        'res_partner_demo.xml',
+    'data': [
-    ],
-    'update_xml': [
         'security/ir.model.access.csv',
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
@@ -48,9 +47,7 @@ You can also use the geolocalization without using the GPS coordinates.
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
     ],
-    'test': [
+    'test': ['test/partner_assign.yml'],
-        'test/partner_assign.yml'
-    ],
     'installable': True,
     'auto_install': False,
     'certificate': '00503409558942442061',

addons/crm_profiling/__openerp__.py

@@ -35,15 +35,13 @@ questionnaire and directly use it on a partner.
 It also has been merged with the earlier CRM & SRM segmentation tool because they 
 were overlapping.
 
-    * Note: this module is not compatible with the module segmentation, since 
+    **Note:** this module is not compatible with the module segmentation, since it's the same which has been renamed.
-            it's the same which has been renamed.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'crm'],
-    'init_xml': [],
+    'data': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
-    'update_xml': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
+    'demo': ['crm_profiling_demo.xml'],
-    'demo_xml': ['crm_profiling_demo.xml'],
     'test': [
         #'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
     ],

addons/crm_todo/__openerp__.py

@@ -23,18 +23,15 @@
 {
     'name': 'Tasks on CRM',
     'version': '1.0',
-    "category": 'Customer Relationship Management',
+    'category': 'Customer Relationship Management',
     'description': """
 Todo list for CRM leads and opportunities.
+==========================================
     """,
     'author': 'OpenERP SA',
     'depends': ['crm','project_gtd'],
-    'update_xml': [
+    'data': ['crm_todo_view.xml'],
-        'crm_todo_view.xml',
+    'demo': ['crm_todo_demo.xml'],
-    ],
-    'demo': [
-        'crm_todo_demo.xml',
-    ],
     'installable': True,
     'auto_install': False,
 }

addons/decimal_precision/__openerp__.py

@@ -20,25 +20,24 @@
 ##############################################################################
 
 {
-    "name": "Decimal Precision Configuration",
+    'name': 'Decimal Precision Configuration',
-    "description": """
+    'description': """
 Configure the price accuracy you need for different kinds of usage: accounting, sales, purchases.
 =================================================================================================
 
 The decimal precision is configured per company.
 """,
-    "author": "OpenERP SA",
+    'author': 'OpenERP SA',
-    "version": "0.1",
+    'version': '0.1',
-    "depends": ["base"],
+    'depends': ['base'],
-    "category" : "Hidden/Dependency",
+    'category' : 'Hidden/Dependency',
-    "init_xml": [],
+    'data': [
-    "update_xml": [
         'decimal_precision_view.xml',
         'security/ir.model.access.csv',
     ],
-    "demo_xml": [],
+    'demo': [],
-    "installable": True,
+    'installable': True,
-    "certificate" : "001307317809612974621",
+    'certificate' : '001307317809612974621',
     'images': ['images/1_decimal_accuracy_form.jpeg','images/1_decimal_accuracy_list.jpeg'],
 }
 

addons/delivery/__openerp__.py

@@ -33,17 +33,15 @@ invoices from picking, OpenERP is able to add and compute the shipping line.
 """,
     'author': 'OpenERP SA',
     'depends': ['sale', 'purchase', 'stock'],
-    'init_xml': ['delivery_data.xml'],
+    'data': [
-    'update_xml': [
         'security/ir.model.access.csv',
         'delivery_report.xml',
         'delivery_view.xml',
-        'partner_view.xml'
+        'partner_view.xml',
-    ],
+        'delivery_data.xml'
-    'demo_xml': ['delivery_demo.xml'],
-    'test': [
-        'test/delivery_cost.yml',
     ],
+    'demo': ['delivery_demo.xml'],
+    'test': ['test/delivery_cost.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0033981912253',

addons/delivery/delivery_data.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
         <record forcecreate="True" id="property_delivery_carrier" model="ir.property">
             <field name="name">property_delivery_carrier</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>

addons/document/__openerp__.py

@@ -37,6 +37,7 @@ This is a complete document management system.
         * Files Size by Month (graph)
 
 ATTENTION:
+----------
     - When you install this module in a running company that have already PDF 
       files stored into the database, you will lose them all.
     - After installing this module PDF's are no longer stored into the database,
@@ -45,8 +46,7 @@ ATTENTION:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['process','board', 'knowledge'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'security/document_security.xml',
         'document_view.xml',
         'document_data.xml',
@@ -55,10 +55,8 @@ ATTENTION:
         'report/document_report_view.xml',
         'board_document_view.xml',
     ],
-    'demo_xml': [ 'document_demo.xml','board_document_demo.xml'],
+    'demo': [ 'document_demo.xml','board_document_demo.xml'],
-    'test': [
+    'test': ['test/document_test2.yml'],
-        'test/document_test2.yml',
-    ],
     'installable': True,
     'auto_install': False,
     'certificate': '0070515416461',

addons/document_ftp/__openerp__.py

@@ -35,14 +35,13 @@ FTP client.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'document'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'wizard/ftp_configuration_view.xml',
         'wizard/ftp_browse_view.xml',
         'security/ir.model.access.csv',
         'res_config_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': [
         'test/document_ftp_test2.yml',
         'test/document_ftp_test4.yml',

addons/document_page/__openerp__.py

@@ -31,20 +31,15 @@ Web pages
     'author': ['OpenERP SA'],
     'website': 'http://www.openerp.com/',
     'depends': ['knowledge'],
-    'init_xml': [],
+    'data': [
-    'update_xml': [
         'wizard/document_page_create_menu_view.xml',
         'wizard/document_page_show_diff_view.xml',
         'document_page_view.xml',
         'security/document_page_security.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': [
+    'demo': ['document_page_demo.xml'],
-        'document_page_demo.xml'
+    'test': ['test/document_page_test00.yml'],
-    ],
-    'test': [
-        'test/document_page_test00.yml'
-    ],
     'installable': True,
     'auto_install': False,
     'certificate': '0086363630317',
@@ -53,8 +48,6 @@ Web pages
         'static/src/lib/wiky/wiky.js', 
         'static/src/js/document_page.js'
     ],
-    'css' : [
+    'css' : ['static/src/css/document_page.css'],
-        "static/src/css/document_page.css"
-    ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/document_page/static/src/js/document_page.js

@@ -11,7 +11,7 @@ openerp.document_page = function (openerp) {
                 }
             } else {
                 var wiki_value = wiky.process(show_value || '');
-                this.$element.html(wiki_value);
+                this.$el.html(wiki_value);
             }
         },
     });

addons/document_webdav/__openerp__.py

@@ -29,12 +29,12 @@
 ##############################################################################
 
 {
-        "name" : "Shared Repositories (WebDAV)",
+    'name': 'Shared Repositories (WebDAV)',
-        "version" : "2.3",
+    'version': '2.3',
-        "author" : "OpenERP SA",
+    'author': 'OpenERP SA',
-        "category" : "Knowledge Management",
+    'category': 'Knowledge Management',
-        "website": "http://www.openerp.com",
+    'website': 'http://www.openerp.com',
-        "description": """
+    'description': """
 With this module, the WebDAV server for documents is activated.
 ===============================================================
 
@@ -42,35 +42,36 @@ You can then use any compatible browser to remotely see the attachments of OpenO
 
 After installation, the WebDAV server can be controlled by a [webdav] section in 
 the server's config.
-Server Configuration Parameter:
 
-    [webdav]
+Server Configuration Parameter:
-    ; enable = True ; Serve webdav over the http(s) servers
+-------------------------------
-    ; vdir = webdav ; the directory that webdav will be served at
+[webdav]:
-    ; this default val means that webdav will be
++++++++++ 
-    ; on "http://localhost:8069/webdav/
+    * enable = True ; Serve webdav over the http(s) servers
-    ; verbose = True ; Turn on the verbose messages of webdav
+    * vdir = webdav ; the directory that webdav will be served at
-    ; debug = True ; Turn on the debugging messages of webdav
+    * this default val means that webdav will be
-    ; since the messages are routed to the python logging, with
+    * on "http://localhost:8069/webdav/
-    ; levels "debug" and "debug_rpc" respectively, you can leave
+    * verbose = True ; Turn on the verbose messages of webdav
-    ; these options on
+    * debug = True ; Turn on the debugging messages of webdav
+    * since the messages are routed to the python logging, with
+    * levels "debug" and "debug_rpc" respectively, you can leave
+    * these options on
 
 Also implements IETF RFC 5785 for services discovery on a http server,
 which needs explicit configuration in openerp-server.conf too.
 """,
-        "depends" : ["base", "document"],
+    'depends': ['base', 'document'],
-        "init_xml" : [],
+    'data': ['security/ir.model.access.csv',
-        "update_xml" : ['security/ir.model.access.csv',
+            'webdav_view.xml',
-                        'webdav_view.xml',
+            'webdav_setup.xml',
-                        'webdav_setup.xml',
+    ],
-                        ],
+    'demo': [],
-        "demo_xml" : [],
+    'test': [ #'test/webdav_test1.yml',
-        "test": [ #'test/webdav_test1.yml',
+    ],
-                ],
+    'auto_install': False,
-        "auto_install": False,
+    'installable': True,
-        "installable": True,
+    'certificate' : '001236490750845657973',
-        "certificate" : "001236490750845657973",
+    'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
-        'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/edi/__openerp__.py

@@ -36,21 +36,11 @@ documentation at http://doc.openerp.com.
     'website': 'http://www.openerp.com',
     'depends': ['base', 'email_template'],
     'icon': '/edi/static/src/img/knowledge.png',
-    'data': [
+    'data': ['security/ir.model.access.csv'],
-        'security/ir.model.access.csv',
+    'test': ['test/edi_partner_test.yml'],
-    ],
+    'js': ['static/src/js/edi.js'],
-    'test': [
+    'css': ['static/src/css/edi.css'],
-        'test/edi_partner_test.yml',
+    'qweb': ['static/src/xml/*.xml'],
-    ],
-    'js': [
-        'static/src/js/edi.js',
-    ],
-    "css": [
-        "static/src/css/edi.css"
-    ],
-    'qweb': [
-        "static/src/xml/*.xml",
-    ],
     'installable': True,
     'auto_install': False,
     'certificate': '002046536359186',

addons/edi/static/src/js/edi.js

@@ -28,14 +28,14 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
         if (openerp.web.qweb.templates[template_content]) {
             this.content = openerp.web.qweb.render(template_content, param);
         }
-        this.$element.html(openerp.web.qweb.render("EdiView", param));
+        this.$el.html(openerp.web.qweb.render("EdiView", param));
-        this.$element.find('button.oe_edi_action_print').bind('click', this.do_print);
+        this.$el.find('button.oe_edi_action_print').bind('click', this.do_print);
-        this.$element.find('button#oe_edi_import_existing').bind('click', this.do_import_existing);
+        this.$el.find('button#oe_edi_import_existing').bind('click', this.do_import_existing);
-        this.$element.find('button#oe_edi_import_create').bind('click', this.do_import_create);
+        this.$el.find('button#oe_edi_import_create').bind('click', this.do_import_create);
-        this.$element.find('button#oe_edi_download').bind('click', this.do_download);
+        this.$el.find('button#oe_edi_download').bind('click', this.do_download);
-        this.$element.find('.oe_edi_import_choice, .oe_edi_import_choice_label').bind('click', this.toggle_choice('import'));
+        this.$el.find('.oe_edi_import_choice, .oe_edi_import_choice_label').bind('click', this.toggle_choice('import'));
-        this.$element.find('.oe_edi_pay_choice, .oe_edi_pay_choice_label').bind('click', this.toggle_choice('pay'));
+        this.$el.find('.oe_edi_pay_choice, .oe_edi_pay_choice_label').bind('click', this.toggle_choice('pay'));
-        this.$element.find('#oe_edi_download_show_code').bind('click', this.show_code);
+        this.$el.find('#oe_edi_download_show_code').bind('click', this.show_code);
     },
     on_document_failed: function(response) {
         var self = this;
@@ -85,7 +85,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
     },
     do_import_existing: function(e) {
         var url_download = this.get_download_url();
-        var $edi_text_server_input = this.$element.find('#oe_edi_txt_server_url');
+        var $edi_text_server_input = this.$el.find('#oe_edi_txt_server_url');
         var server_url = $edi_text_server_input.val();
         $edi_text_server_input.removeClass('invalid');
         if (!server_url) {
@@ -138,14 +138,14 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({
     show_login: function() {
         this.destroy_content();
         this.login = new openerp.web.Login(this);
-        this.login.appendTo(this.$element);
+        this.login.appendTo(this.$el);
     },
 
     destroy_content: function() {
         _.each(_.clone(this.getChildren()), function(el) {
             el.destroy();
         });
-        this.$element.children().remove();
+        this.$el.children().remove();
     },
 
     do_import: function() {

addons/email_template/__openerp__.py

@@ -21,13 +21,13 @@
 ##############################################################################
 
 {
-    "name" : "Email Templates",
+    'name' : 'Email Templates',
-    "version" : "1.1",
+    'version' : '1.1',
-    "author" : "OpenERP,OpenLabs",
+    'author' : 'OpenERP,OpenLabs',
-    "website" : "http://openerp.com",
+    'website' : 'http://openerp.com',
-    "category" : "Marketing",
+    'category' : 'Marketing',
-    "depends" : ['mail'],
+    'depends' : ['mail'],
-    "description": """
+    'description': """
 Email Templating (simplified version of the original Power Email by Openlabs).
 ==============================================================================
 
@@ -53,22 +53,19 @@ These email templates are also at the heart of the marketing campaign system
 (see the ``marketing_campaign`` application), if you need to automate larger
 campaigns on any OpenERP document.
 
-Technical note: only the templating system of the original Power Email by
+    **Technical note:** only the templating system of the original Power Email by Openlabs was kept.
-Openlabs was kept.
     """,
-    "data": [
+    'data': [
         'wizard/email_template_preview_view.xml',
         'email_template_view.xml',
         'res_partner_view.xml',
         'wizard/mail_compose_message_view.xml',
         'security/ir.model.access.csv'
     ],
-    "demo": [
+    'demo': ['res_partner_demo.yml'],
-        'res_partner_demo.yml',
+    'installable': True,
-    ],
+    'auto_install': False,
-    "installable": True,
+    'certificate' : '00817073628967384349',
-    "auto_install": False,
-    "certificate" : "00817073628967384349",
     'images': ['images/1_email_account.jpeg','images/2_email_template.jpeg','images/3_emails.jpeg'],
 }