diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index e1b9078ec3f..86166ec0125 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -19,11 +19,11 @@ # ############################################################################## { - "name" : "eInvoicing", - "version" : "1.1", - "author" : "OpenERP SA", - "category": 'Accounting & Finance', - "description": """ + 'name' : 'eInvoicing', + 'version' : '1.1', + 'author' : 'OpenERP SA', + 'category' : 'Accounting & Finance', + '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 -financial year and for preparation of vouchers there is a module named account_voucher. +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 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"], - 'update_xml': [ + 'depends' : ['base_setup', 'product', 'analytic', 'process', 'board', 'edi'], + 'data': [ '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", - "account_bank_view.xml", - "res_config_view.xml", - "account_pre_install.yml" + 'edi/invoice_action_data.xml', + 'account_bank_view.xml', + 'res_config_view.xml', + 'account_pre_install.yml' ], - 'demo_xml': [ + 'demo': [ 'demo/account_demo.xml', 'project/project_demo.xml', 'project/analytic_account_demo.xml', diff --git a/addons/account/account.py b/addons/account/account.py index fa30b20f2ca..907e6207380 100644 --- a/addons/account/account.py +++ b/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: diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 8b86429ea1b..42bcb785d61 100644 --- a/addons/account/account_invoice.py +++ b/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 diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml index 1f1a412c19e..5f06a20b1ab 100644 --- a/addons/account/test/account_change_currency.yml +++ b/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 diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml index 6553635a781..7b995150af0 100644 --- a/addons/account/test/account_invoice_state.yml +++ b/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 diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml index 3bc4a778794..74dcbce56ba 100644 --- a/addons/account/test/account_sequence_test.yml +++ b/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 diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml index ccebd2ea90c..9c5ce2dea3e 100644 --- a/addons/account/test/account_supplier_invoice.yml +++ b/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 diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml index 516be311cf8..80dc098e770 100644 --- a/addons/account/test/test_edi_invoice.yml +++ b/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" diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index 7c97112b875..ea4d7887a15 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -19,13 +19,13 @@ # ############################################################################## { - "name" : "Accounting and Finance", - "version" : "1.1", - "author" : "OpenERP SA", - "category": 'Accounting & Finance', - "sequence": 10, - "summary": "Financial and Analytic Accounting", - "description": """ + 'name' : 'Accounting and Finance', + 'version' : '1.1', + 'author' : 'OpenERP SA', + 'category': 'Accounting & Finance', + 'sequence': 10, + 'summary': 'Financial and Analytic Accounting', + '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"], - 'update_xml': [ + 'depends' : ['account_voucher'], + 'data': [ '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, diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml index d8adba25196..7a666c8d344 100644 --- a/addons/account_accountant/account_accountant_data.xml +++ b/addons/account_accountant/account_accountant_data.xml @@ -1,10 +1,10 @@ - - - Accounting - + + + @@ -19,10 +19,8 @@ automatic 100 - - - + diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index e0bec840467..7a4e5d519bb 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/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. -You can also view the report of account analytic summary -user-wise as well as month-wise. +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. """, - "author": "Camptocamp", - "website": "http://www.camptocamp.com/", - "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 - "init_xml": [], - "update_xml": [ - "security/ir.model.access.csv", - "account_analytic_analysis_view.xml", - "account_analytic_analysis_menu.xml", - "account_analytic_analysis_cron.xml", - ], - 'demo_xml': [], + 'author': 'Camptocamp', + 'website': 'http://www.camptocamp.com/', + '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 + 'data': [ + 'security/ir.model.access.csv', + 'account_analytic_analysis_view.xml', + 'account_analytic_analysis_menu.xml', + 'account_analytic_analysis_cron.xml', + ], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate': '0042927202589', diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py index 5ec1fc66c73..ef01867983a 100644 --- a/addons/account_analytic_default/__openerp__.py +++ b/addons/account_analytic_default/__openerp__.py @@ -20,12 +20,12 @@ ############################################################################## { - 'name' : 'Account Analytic Defaults', - 'version' : '1.0', - "category": 'Accounting & Finance', + 'name': 'Account Analytic Defaults', + 'version': '1.0', + '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', - 'website' : 'http://www.openerp.com', - 'images' : ['images/analytic_defaults.jpeg'], - 'depends' : ['sale'], - 'init_xml' : [], - 'update_xml': [ + 'author': 'OpenERP SA', + 'website': 'http://www.openerp.com', + 'images': ['images/analytic_defaults.jpeg'], + 'depends': ['sale'], + 'data': [ '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', diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py index a9000cfa490..675723f423a 100644 --- a/addons/account_analytic_plans/__openerp__.py +++ b/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 - SubProj 1.1 - SubProj 1.2 +------------------------------------------------------------- + * **Projects** + * Project 1 + + SubProj 1.1 + + + SubProj 1.2 - Project 2 - Salesman - Eric - Fabien + * Project 2 + + * **Salesman** + * Eric + + * Fabien -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. The following example is for -an invoice that touches the two subproject and assigned to one salesman: +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. + +The following example is for an invoice that touches the two subprojects and assigned to one salesman: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +**Plan1:** -Plan1: - SubProject 1.1 : 50% - SubProject 1.2 : 50% -Plan2: + * SubProject 1.1 : 50% + + * SubProject 1.2 : 50% + +**Plan2:** Eric: 100% -So when this line of invoice will be confirmed, it will generate 3 analytic lines, -for one account entry. +So when this line of invoice will be confirmed, it will generate 3 analytic lines,for one account entry. -The analytic plan validates the minimum and maximum percentage at the time of creation -of distribution models. +The analytic plan validates the minimum and maximum percentage at the time of creation of distribution models. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'images': ['images/analytic_plan.jpeg'], 'depends': ['account', 'account_analytic_default'], - 'init_xml': [], - 'update_xml': [ + 'data': [ '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, diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py index 5073d6522e3..330d0df0000 100644 --- a/addons/account_anglo_saxon/__openerp__.py +++ b/addons/account_anglo_saxon/__openerp__.py @@ -19,32 +19,34 @@ ############################################################################## { - "name": "Anglo-Saxon Accounting", - "version": "1.2", - "author": "OpenERP SA, Veritos", - "website": "http://openerp.com - http://veritos.nl", - "description": """ + 'name': 'Anglo-Saxon Accounting', + 'version': '1.2', + 'author': 'OpenERP SA, Veritos', + 'website': 'http://openerp.com - http://veritos.nl', + '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 -Continental accounting) countries is the moment of taking the Cost of Goods Sold versus -Cost of Sales. Anglo-Saxons accounting does take the cost when sales invoice is created, -Continental accounting will take the cost at the moment the goods are shipped. +The difference between the Anglo-Saxon accounting countries and the Rhine +(or also called Continental accounting) countries is the moment of taking +the Cost of Goods Sold versus Cost of Sales. Anglo-Saxons accounting does +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 -shipped goods and will contra book this interim account when the invoice is created to -transfer this amount to the debtor or creditor account. Secondly, price differences between -actual purchase price and fixed product standard price are booked on a separate account.""", - "images": ["images/account_anglo_saxon.jpeg"], - "depends": ["product", "purchase"], - "category": "Accounting & Finance", - "init_xml": [], - "demo_xml": [], - "update_xml": ["product_view.xml",], - "auto_install": False, - "installable": True, - "certificate":"00557423080410733581", +This module will add this functionality by using a interim account, to +store the value of shipped goods and will contra book this interim +account when the invoice is created to transfer this amount to the +debtor or creditor account. Secondly, price differences between actual +purchase price and fixed product standard price are booked on a separate +account.""", + 'images': ['images/account_anglo_saxon.jpeg'], + 'depends': ['product', 'purchase'], + 'category': 'Accounting & Finance', + 'demo': [], + 'data': ['product_view.xml',], + 'auto_install': False, + 'installable': True, + 'certificate':'00557423080410733581', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index 2cf79e9d30d..93bfd18a7cb 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -20,42 +20,40 @@ ############################################################################## { - "name" : "Assets Management", - "version" : "1.0", - "depends" : ["account"], - "author" : "OpenERP S.A.", - "description": """ + 'name': 'Assets Management', + 'version': '1.0', + 'depends': ['account'], + 'author': 'OpenERP S.A.', + '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. -And it allows to create Move's of the depreciation lines. +This Module manages the assets owned by a company or an individual. It will keep +track of depreciation's occurred on those assets. And it allows to create Move's +of the depreciation lines. """, - "website" : "http://www.openerp.com", - "category" : "Accounting & Finance", - "sequence": 32, - "init_xml" : [ - ], - "demo_xml" : [ 'account_asset_demo.xml' - ], + 'website': 'http://www.openerp.com', + 'category': 'Accounting & Finance', + 'sequence': 32, + 'demo': [ 'account_asset_demo.xml'], 'test': [ 'test/account_asset_demo.yml', 'test/account_asset.yml', 'test/account_asset_wizard.yml', ], - "update_xml" : [ - "security/account_asset_security.xml", - "security/ir.model.access.csv", - "wizard/account_asset_change_duration_view.xml", - "wizard/wizard_asset_compute_view.xml", - "account_asset_view.xml", - "account_asset_invoice_view.xml", - "report/account_asset_report_view.xml", + 'data': [ + 'security/account_asset_security.xml', + 'security/ir.model.access.csv', + 'wizard/account_asset_change_duration_view.xml', + 'wizard/wizard_asset_compute_view.xml', + 'account_asset_view.xml', + 'account_asset_invoice_view.xml', + 'report/account_asset_report_view.xml', ], - "auto_install": False, - "installable": True, - "application": False, + 'auto_install': False, + 'installable': True, + 'application': False, } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/__openerp__.py b/addons/account_bank_statement_extensions/__openerp__.py index a3765d33622..7571eef3e54 100644 --- a/addons/account_bank_statement_extensions/__openerp__.py +++ b/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) - - name_search on res.partner.bank enhanced to allow search on bank and iban account numbers + - performance improvements for digital import of bank statement (via + 'ebanking_import' context flag) + - name_search on res.partner.bank enhanced to allow search on bank + and iban account numbers ''', 'depends': ['account'], - 'demo_xml': [], - 'init_xml': [ - ], - 'update_xml' : [ + 'demo': [], + 'data' : [ 'security/ir.model.access.csv', 'account_bank_statement_view.xml', 'account_bank_statement_report.xml', diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index e03c66c2132..928e87f1202 100644 --- a/addons/account_budget/__openerp__.py +++ b/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 -for this Budget. Each list of record can also be switched to a graphical view of it. +Budget in order to ensure the total planned is not greater/lower than what he +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': [], - 'update_xml': [ + 'data': [ '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_report.yml', - ], + 'test/account_budget.yml', + 'test/account_budget_report.yml', + ], 'installable': True, 'auto_install': False, 'certificate': '0043819694157', diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py index c616cc9d5e0..b1feedda55a 100644 --- a/addons/account_cancel/__openerp__.py +++ b/addons/account_cancel/__openerp__.py @@ -20,26 +20,25 @@ ############################################################################## { - "name" : "Cancel Journal Entries", - "version" : "1.1", - "author" : "OpenERP SA", - "category": 'Accounting & Finance', - "description": """ -Allows cancelling accounting entries. -===================================== + 'name': 'Cancel Journal Entries', + 'version': '1.1', + 'author': 'OpenERP SA', + 'category': 'Accounting & Finance', + 'description': """ +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"], - "depends" : ["account"], - 'init_xml': [], - 'update_xml': ['account_cancel_view.xml' ], - 'demo_xml': [], + 'images': ['images/account_cancel.jpeg'], + 'depends' : ['account'], + 'data': ['account_cancel_view.xml' ], + 'demo': [], 'installable': True, 'auto_install': False, - "certificate" : "001101250473177981989", + 'certificate': '001101250473177981989', } diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py index c0c9245a477..2c458ceb49f 100644 --- a/addons/account_chart/__openerp__.py +++ b/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': [], - 'update_xml': [], - 'demo_xml': [], + 'data': [], + 'demo': [], 'installable': True, 'certificate': '0073332443901', } diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py index faba82928ed..f5a2355b002 100644 --- a/addons/account_check_writing/__openerp__.py +++ b/addons/account_check_writing/__openerp__.py @@ -19,29 +19,24 @@ # ############################################################################## { - "name" : "Check Writing", - "version" : "1.1", - "author" : "OpenERP SA, NovaPoint Group", - "category": "Generic Modules/Accounting", - "description": """ + 'name': 'Check Writing', + 'version': '1.1', + 'author': 'OpenERP SA, NovaPoint Group', + 'category': 'Generic Modules/Accounting', + 'description': """ Module for the Check Writing and Check Printing. +================================================ """, 'website': 'http://www.openerp.com', - 'init_xml': [], - "depends" : [ - "account_voucher", - ], - 'update_xml': [ + 'depends' : ['account_voucher'], + 'data': [ 'account_check_writing_report.xml', 'account_view.xml', 'account_voucher_view.xml', 'account_check_writing_data.xml', ], - 'demo_xml': [ - 'account_demo.xml', - ], - 'test': [ - ], + 'demo': ['account_demo.xml'], + 'test': [], 'installable': True, 'active': False, } diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py index 094ab45acc0..03527eaa2ec 100644 --- a/addons/account_coda/__openerp__.py +++ b/addons/account_coda/__openerp__.py @@ -20,74 +20,92 @@ # ############################################################################## { - "name": 'Belgium - Import Bank CODA Statements', - "version": '2.1', - "author": 'Noviat', - "category": 'Accounting & Finance', - "description": ''' + 'name': 'Belgium - Import Bank CODA Statements', + 'version': '2.1', + 'author': 'Noviat', + 'category': 'Accounting & Finance', + '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 '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. + * Support for multiple statements from different bank accounts in a single + CODA file. + * 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 -of the Financial Accounting records). The CODA Bank Statement is a 'read-only' -object, hence remaining a reliable representation of the original CODA file whereas -the Bank Statement will get modified as required by accounting business processes. +the CODA information (only those transaction lines that are required for the +creation of the Financial Accounting records). The CODA Bank Statement is a +'read-only' object, hence remaining a reliable representation of the original +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 -objects. The removal of a CODA File containing multiple Bank Statements will also -remove those associated statements. +A removal of one object in the CODA processing results in the removal of the +associated objects. The removal of a CODA File containing multiple Bank +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. -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. +------------------------------------------------------------------------------- + 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. + 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"], - "depends": ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'], - "demo_xml": [], - "init_xml": [ + 'images' : ['images/coda_logs.jpeg','images/import_coda_logs.jpeg'], + 'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'], + 'demo': [], + '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, - "installable": True, - "license": 'AGPL-3', - "certificate" : "001237207321716002029", + 'auto_install': False, + 'installable': True, + 'license': 'AGPL-3', + 'certificate' : '001237207321716002029', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index e8724b01b4e..43b1c4b2859 100644 --- a/addons/account_followup/__openerp__.py +++ b/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: - - Invoicing/Periodical Processing/Billing/Send follow-ups +Once it is defined, you can automatically print recalls every day through simply 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 -entry, you can do from in the menu: - - Invoicing/Reporting/Generic Reporting/Partners/Follow-ups Sent +Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu: +------------------------------------------------------------------------------------------------------------------ + **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': [], - 'update_xml': [ + 'data': [ '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', diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py index 9e7209a348e..dd08386b064 100644 --- a/addons/account_payment/__openerp__.py +++ b/addons/account_payment/__openerp__.py @@ -20,26 +20,31 @@ ############################################################################## { - "name": "Suppliers Payment Management", - "version": "1.1", - "author": "OpenERP SA", - "category": "Accounting & Finance", - "description": """ + 'name': 'Suppliers Payment Management', + 'version': '1.1', + 'author': 'OpenERP SA', + 'category': 'Accounting & Finance', + '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': [], - 'update_xml': [ + 'data': [ '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', diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py index 0f860d400e9..16f13dc5178 100644 --- a/addons/account_sequence/__openerp__.py +++ b/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': [], - 'update_xml': [ + 'data': [ 'account_sequence_data.xml', 'account_sequence_installer_view.xml', 'account_sequence.xml' ], - 'demo_xml': [], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate': '00475376442024623469', diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 16ea771d123..03befcc3acd 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -20,12 +20,12 @@ ############################################################################## { - "name" : "eInvoicing & Payments", - "version" : "1.0", - "author" : 'OpenERP SA', - "summary": 'Send Invoices and Track Payments', - "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. + 'name' : 'eInvoicing & Payments', + 'version' : '1.0', + 'author' : 'OpenERP SA', + 'summary': 'Send Invoices and Track Payments', + '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. ============================================================================================================================================================================================== * 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', - "sequence": 4, - "website" : "http://openerp.com", - "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"], - "depends" : ["account"], - "init_xml" : [ + 'category': 'Accounting & Finance', + 'sequence': 4, + 'website' : 'http://openerp.com', + 'images' : ['images/customer_payment.jpeg','images/journal_voucher.jpeg','images/sales_receipt.jpeg','images/supplier_voucher.jpeg'], + 'depends' : ['account'], + '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', ], - - "demo_xml" : [], - - "update_xml" : [ - "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" - ], - "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", + '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, - "application": True, - "installable": True, + 'auto_install': False, + 'application': True, + 'installable': True, } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml index 9cfb9d61229..2ea6c0b7890 100644 --- a/addons/account_voucher/test/account_voucher.yml +++ b/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 diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml index 85432f747aa..3996e0c27e4 100644 --- a/addons/account_voucher/test/account_voucher_report.yml +++ b/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 diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml index 45c352955f4..b706e6f0644 100644 --- a/addons/account_voucher/test/case1_usd_usd.yml +++ b/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 diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml index cc4c238aaaf..1a0c250395e 100644 --- a/addons/account_voucher/test/case2_suppl_usd_eur.yml +++ b/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 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml index c37783247db..91f8a629cbb 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml +++ b/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 diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml index 36593a2b9cd..cc5e819af30 100644 --- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml +++ b/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 diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml index d70bd41a2ff..37ea7ea981a 100644 --- a/addons/account_voucher/test/case3_eur_eur.yml +++ b/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 diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml index 5ca901cdbca..a78669c95ef 100644 --- a/addons/account_voucher/test/case4_cad_chf.yml +++ b/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 diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml index 2ca2ded1a72..125277191cb 100644 --- a/addons/account_voucher/test/case_eur_usd.yml +++ b/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 diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml index 585ce23aace..88f10e55918 100644 --- a/addons/account_voucher/test/sales_payment.yml +++ b/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 diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py index 859a65e7856..10762a1d2be 100644 --- a/addons/analytic/__openerp__.py +++ b/addons/analytic/__openerp__.py @@ -20,13 +20,13 @@ ############################################################################## { - "name" : "Analytic Accounting", - "version": "1.1", - "author" : "OpenERP SA", - "website" : "http://www.openerp.com", - "category": 'Hidden/Dependency', - "depends" : ["base", "decimal_precision", "mail"], - "description": """ + 'name' : 'Analytic Accounting', + 'version': '1.1', + 'author' : 'OpenERP SA', + 'website' : 'http://www.openerp.com', + 'category': 'Hidden/Dependency', + 'depends' : ['base', 'decimal_precision', 'mail'], + '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" : [], - "update_xml": ['security/analytic_security.xml', - "security/ir.model.access.csv", - "analytic_sequence.xml", - "analytic_view.xml" - ], - 'demo_xml': [ + 'data': [ + 'security/analytic_security.xml', + 'security/ir.model.access.csv', + 'analytic_sequence.xml', + 'analytic_view.xml' ], + 'demo': [], 'installable': True, 'auto_install': False, - 'certificate' : "00462253285027988541", + 'certificate' : '00462253285027988541', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py index b569330d117..8996e9f7565 100644 --- a/addons/analytic_contract_expense_project/__openerp__.py +++ b/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.", - "website": "http://www.openerp.com/", - "depends": ["analytic_contract_hr_expense","project"], - "init_xml": [], - "update_xml": [ - "analytic_contract_expense_project_view.xml", - ], - 'demo_xml': [], - "css" : [ - ], + 'author': 'OpenERP S.A.', + 'website': 'http://www.openerp.com/', + 'depends': ['analytic_contract_hr_expense','project'], + 'data': ['analytic_contract_expense_project_view.xml'], + 'demo': [], + 'css' : [], 'installable': True, 'auto_install': True, } diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py index 6d5cca8b574..8e807923550 100644 --- a/addons/analytic_contract_hr_expense/__openerp__.py +++ b/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.", - "website": "http://www.openerp.com/", - "depends": ["hr_expense","account_analytic_analysis"], - "init_xml": [], - "update_xml": [ - "analytic_contract_hr_expense_view.xml", - ], - 'demo_xml': [], - "css" : [ - ], + 'author': 'OpenERP S.A.', + 'website': 'http://www.openerp.com/', + 'depends': ['hr_expense','account_analytic_analysis'], + 'data': ['analytic_contract_hr_expense_view.xml'], + 'demo': [], + 'css' : [], 'installable': True, 'auto_install': True, } diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py index 4e4f621663c..9c0be102760 100644 --- a/addons/analytic_contract_project/__openerp__.py +++ b/addons/analytic_contract_project/__openerp__.py @@ -20,18 +20,18 @@ ############################################################################## { - "name" : "Contract on Project", - "version": "1.1", - "author" : "OpenERP SA", + 'name' : 'Contract on Project', + 'version': '1.1', + 'author' : 'OpenERP SA', 'category': 'Hidden', - "website" : "http://www.openerp.com", - "depends" : ["project", "account_analytic_analysis"], - "description": """ + 'website' : 'http://www.openerp.com', + 'depends' : ['project', 'account_analytic_analysis'], + 'description': """ Add "Contract Data" in project view. +==================================== """, - "init_xml" : [], - "update_xml": ["analytic_contract_project_view.xml"], - 'demo_xml': [], + 'data': ['analytic_contract_project_view.xml'], + 'demo': [], 'installable': True, 'auto_install': True, } diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py index 1c1f345aca0..f23296012d2 100644 --- a/addons/analytic_user_function/__openerp__.py +++ b/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': [], - 'update_xml': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'], - 'demo_xml': [], + 'data': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate': '0082277138269', diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py index acfc5ac3792..865fb19ea07 100644 --- a/addons/anonymization/__openerp__.py +++ b/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': [], - 'update_xml': [], - 'demo_xml': [ - 'anonymization_demo.xml', - ], + 'demo': ['anonymization_demo.xml'], 'data': [ 'ir.model.fields.anonymization.csv', 'security/ir.model.access.csv', diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml index 5aba288d4f8..1a6c6c355d5 100644 --- a/addons/anonymization/anonymization_view.xml +++ b/addons/anonymization/anonymization_view.xml @@ -76,7 +76,7 @@ - + Anonymize Database @@ -163,4 +163,3 @@ - diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index 2b7fcab8b12..665968c6613 100644 --- a/addons/association/__openerp__.py +++ b/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'], - 'demo_xml': [], + 'data': ['security/ir.model.access.csv', 'profile_association.xml'], + 'demo': [], 'installable': True, 'auto_install': False, 'certificate': '0078696047261', diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py index 9ba403bcee3..3ba8c59a2f3 100644 --- a/addons/audittrail/__openerp__.py +++ b/addons/audittrail/__openerp__.py @@ -34,13 +34,12 @@ and can check logs. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], - 'init_xml': [], - 'update_xml': [ + 'data': [ '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', diff --git a/addons/auth_anonymous/__openerp__.py b/addons/auth_anonymous/__openerp__.py index 95d98e65fea..1246850fe04 100644 --- a/addons/auth_anonymous/__openerp__.py +++ b/addons/auth_anonymous/__openerp__.py @@ -1,19 +1,16 @@ { - 'name': 'Anonymous', - 'description': 'Allow anonymous access to OpenERP.', - 'author': 'OpenERP SA', - 'version': '1.0', - 'category': 'Authentication', - 'website': 'http://www.openerp.com', - 'installable': True, - 'depends': ['web'], - 'data': [ - 'auth_anonymous.xml', - ], - 'js': [ - 'static/src/js/auth_anonymous.js', - ], - 'qweb': [ - 'static/src/xml/auth_anonymous.xml', - ], + 'name': 'Anonymous', + 'description': """ +Allow anonymous access to OpenERP. +================================== + """, + 'author': 'OpenERP SA', + 'version': '1.0', + 'category': 'Authentication', + 'website': 'http://www.openerp.com', + 'installable': True, + 'depends': ['web'], + 'data': ['auth_anonymous.xml'], + 'js': ['static/src/js/auth_anonymous.js'], + 'qweb': ['static/src/xml/auth_anonymous.xml'], } diff --git a/addons/auth_anonymous/static/src/js/auth_anonymous.js b/addons/auth_anonymous/static/src/js/auth_anonymous.js index fab2be1fd53..55425e26054 100644 --- a/addons/auth_anonymous/static/src/js/auth_anonymous.js +++ b/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', diff --git a/addons/auth_ldap/__openerp__.py b/addons/auth_ldap/__openerp__.py index 4e5bc811dca..aa7c93e4146 100644 --- a/addons/auth_ldap/__openerp__.py +++ b/addons/auth_ldap/__openerp__.py @@ -19,18 +19,18 @@ ############################################################################## { - "name" : "Authentication via LDAP", - "version" : "1.0", - "depends" : ["base"], - "images" : ["images/ldap_configuration.jpeg"], - "author" : "OpenERP SA", - "description": """ + 'name' : 'Authentication via LDAP', + 'version' : '1.0', + 'depends' : ['base'], + 'images' : ['images/ldap_configuration.jpeg'], + 'author' : 'OpenERP SA', + '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", - "data" : [ - "users_ldap_view.xml", - "user_ldap_installer.xml", - "security/ir.model.access.csv", + 'website' : 'http://www.openerp.com', + 'category' : 'Authentication', + 'data' : [ + 'users_ldap_view.xml', + 'user_ldap_installer.xml', + 'security/ir.model.access.csv', ], - "auto_install": False, - "installable": True, - "certificate" : "001141446349334700221", - "external_dependencies" : { + 'auto_install': False, + 'installable': True, + 'certificate' : '001141446349334700221', + 'external_dependencies' : { 'python' : ['ldap'], } } diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py index 585dc48e11e..f0be1234721 100644 --- a/addons/auth_oauth/__openerp__.py +++ b/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': [ - 'auth_oauth_view.xml', - 'res_config.xml', - ], - 'js': [ - 'static/src/js/auth_oauth.js', - ], - 'css': [ - 'static/lib/zocial/css/zocial.css', - ], - '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, } diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js index d63631c262d..4a41e720726 100644 --- a/addons/auth_oauth/static/src/js/auth_oauth.js +++ b/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."); diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py index cd1a12fce7f..10c77f29965 100644 --- a/addons/auth_openid/__openerp__.py +++ b/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': [ - 'res_users.xml', - ], - 'js': [ - 'static/src/js/auth_openid.js', - ], - 'css': [ - 'static/src/css/openid.css', - ], - 'qweb': [ - 'static/src/xml/auth_openid.xml', - ], + 'data': ['res_users.xml'], + 'js': ['static/src/js/auth_openid.js'], + 'css': ['static/src/css/openid.css'], + 'qweb': ['static/src/xml/auth_openid.xml'], 'external_dependencies': { 'python' : ['openid'], }, diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js index 1417bc471ce..70739e056ed 100644 --- a/addons/auth_openid/static/src/js/auth_openid.js +++ b/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); } }); diff --git a/addons/auth_reset_password/__openerp__.py b/addons/auth_reset_password/__openerp__.py index 76528bbfeb8..ccf5ca53a21 100644 --- a/addons/auth_reset_password/__openerp__.py +++ b/addons/auth_reset_password/__openerp__.py @@ -1,22 +1,17 @@ { - 'name': 'Reset Password', - 'description': 'Allow users to reset their password from the login page', - 'author': 'OpenERP SA', - 'version': '1.0', - 'category': 'Authentication', - 'website': 'http://www.openerp.com', - 'installable': True, - 'depends': ['auth_anonymous', 'email_template'], - 'data': [ - 'auth_reset_password.xml', - ], - 'js': [ - 'static/src/js/reset_password.js', - ], - 'css': [ - 'static/src/css/reset_password.css', - ], - 'qweb': [ - 'static/src/xml/reset_password.xml', - ], + 'name': 'Reset Password', + 'description': """ +Allow users to reset their password from the login page. +======================================================== +""", + 'author': 'OpenERP SA', + 'version': '1.0', + 'category': 'Authentication', + 'website': 'http://www.openerp.com', + 'installable': True, + 'depends': ['auth_anonymous', 'email_template'], + 'data': ['auth_reset_password.xml'], + 'js': ['static/src/js/reset_password.js'], + 'css': ['static/src/css/reset_password.css'], + 'qweb': ['static/src/xml/reset_password.xml'], } diff --git a/addons/auth_reset_password/static/src/js/reset_password.js b/addons/auth_reset_password/static/src/js/reset_password.js index 13cf070a548..4e09b5c5318 100644 --- a/addons/auth_reset_password/static/src/js/reset_password.js +++ b/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 !")); diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py index 765a36ef252..5f889bfb119 100644 --- a/addons/auth_signup/__openerp__.py +++ b/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': [ - 'res_config.xml', - ], - 'js': [ - 'static/src/js/auth_signup.js', - ], - 'qweb': [ - 'static/src/xml/auth_signup.xml', - ], + 'data': ['res_config.xml'], + 'js': ['static/src/js/auth_signup.js'], + 'qweb': ['static/src/xml/auth_signup.xml'], } diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py index eff92685313..c9483f00360 100644 --- a/addons/base_action_rule/__openerp__.py +++ b/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': [ - 'base_action_rule_data.xml' - ], - 'update_xml': [ + 'data': [ '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', diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 58f666baa0d..48ec05e2e92 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -20,14 +20,15 @@ ############################################################################## { - "name": "Calendar Layer", - "version": "1.0", - "depends": ["base", "base_status", "mail", "base_action_rule"], + 'name': 'Calendar Layer', + 'version': '1.0', + '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": [ - 'base_calendar_data.xml', - 'crm_meeting_data.xml', - ], - "demo_xml": ['crm_meeting_demo.xml'], - "update_xml": [ + 'demo': ['crm_meeting_demo.xml'], + 'data': [ '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'], - "installable": True, - "auto_install": False, - "certificate": "00694071962960352821", + 'test' : ['test/base_calendar_test.yml'], + 'installable': True, + 'auto_install': False, + 'certificate': '00694071962960352821', 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',], } diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml index 44838514935..d1cffddc403 100644 --- a/addons/base_calendar/crm_meeting_data.xml +++ b/addons/base_calendar/crm_meeting_data.xml @@ -16,6 +16,14 @@ Off-site Meeting + + Open Discussion + + + + Feedback Meeting + + Meeting crm.meeting diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml index 221653e5fc3..6c098e2f949 100644 --- a/addons/base_calendar/crm_meeting_demo.xml +++ b/addons/base_calendar/crm_meeting_demo.xml @@ -27,7 +27,7 @@ - draft + open @@ -39,7 +39,7 @@ - done + open @@ -61,7 +61,7 @@ - draft + open @@ -72,7 +72,7 @@ - done + open diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 3dffcd61520..d5d5d2dcc72 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -70,7 +70,7 @@
- +
@@ -115,7 +115,7 @@
+ attrs="{'readonly': [('recurrent_uid','!=',False)]}"/> @@ -245,11 +245,10 @@ crm.meeting - + diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index 62edc76b277..d0252f6810c 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -19,18 +19,18 @@ # ############################################################################## { - "name" : "DB Password Encryption", - "version" : "1.1", - "author" : ['OpenERP SA', "FS3"], - "maintainer" : "OpenERP SA", - "website" : "http://www.openerp.com", - "category" : "Tools", - "description": """ + 'name': 'DB Password Encryption', + 'version': '1.1', + 'author': ['OpenERP SA', 'FS3'], + 'maintainer': 'OpenERP SA', + 'website': 'http://www.openerp.com', + 'category': 'Tools', + '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"], - "data" : [], - "auto_install": False, - "installable": True, - "certificate" : "00721290471310299725", + 'depends': ['base'], + 'data': [], + 'auto_install': False, + 'installable': True, + 'certificate': '00721290471310299725', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py index f7778c13f2b..76c397586c9 100644 --- a/addons/base_iban/__openerp__.py +++ b/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'], - 'update_xml': ['base_iban_view.xml'], + 'data': ['base_iban_data.xml' , 'base_iban_view.xml'], 'installable': True, 'auto_install': False, 'certificate': '0050014379549', diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml index ac481098254..eafc8dfcff8 100644 --- a/addons/base_iban/base_iban_data.xml +++ b/addons/base_iban/base_iban_data.xml @@ -1,6 +1,6 @@ - + - Kitchen design + Plan to buy a Laptop crm.lead - + <![CDATA[Email0 inquiry]]><div><font size="2">Hello,</font></div><div><font size="2"><br></font></div><div><font size="2">I am interested in your company's product and I plan to buy a new laptop having latest technologies and affordable price.</font></div><div><font size="2">Can you please send me product catalogue?</font></div> email - Reply + Re: Plan to buy a Laptop crm.lead - comment + + + 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 - Reply + Re: Plan to buy a Laptop crm.lead - + <div>Thanks for the information,</div><div>I will visit the store soon.</div> comment - Reply + Re: Plan to buy a Laptop crm.lead - + <font color="#1f1f1f">Can you tell me if the store is open at 9:00 PM?</b></font> comment - Your inquiry + Re: Plan to buy a Laptop crm.lead - + Yes, its open till 10:00 PM, you are welcome! email - + + Inquiry + crm.lead + + Hello, +I am Jason from Le Club SARL, +I am intertested to attend Training organized in your company, +Can you send details, + email + + + Need Details + crm.lead + + Want to know features and benifits to use the new software. + comment + + on_change="on_change_partner(partner_id)" options='{"create_name_field": "name"}'/>