[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20101110101130-kwq6fuc151mylaap

addons/account/account.py

@@ -20,7 +20,7 @@
 ##############################################################################
 
 import time
-from datetime import datetime, timedelta
+from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 

addons/account/account_bank_statement.py

@@ -46,26 +46,6 @@ class account_bank_statement(osv.osv):
                 account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context)
         return res
 
-    def button_import_invoice(self, cr, uid, ids, context=None):
-        mod_obj = self.pool.get('ir.model.data')
-        if context is None:
-            context = {}
-        model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        context.update({'statement_id': ids[0]})
-
-        return {
-            'name': _('Import Invoice'),
-            'context': context,
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.statement.from.invoice',
-            'views': [(resource_id,'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'nodestroy': True
-        }
-
     def _default_journal_id(self, cr, uid, context={}):
         journal_pool = self.pool.get('account.journal')
         journal_type = context.get('journal_type', False)
@@ -423,8 +403,6 @@ account_bank_statement()
 class account_bank_statement_line(osv.osv):
 
     def onchange_type(self, cr, uid, line_id, partner_id, type, context=None):
-        res_users_obj = self.pool.get('res.users')
-        res_currency_obj = self.pool.get('res.currency')
         res = {'value': {}}
         obj_partner = self.pool.get('res.partner')
         if context is None:

addons/account/account_view.xml

@@ -1065,8 +1065,8 @@
                             <separator string="Narration" colspan="4"/>
                             <field name="narration" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Analytic Lines" groups="base.group_extended">
-                            <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}" groups="base.group_extended"/>
+                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                            <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
                         </page>
                     </notebook>
                 </form>
@@ -1112,8 +1112,8 @@
                             <field name="reconcile_partial_id"/>
                             <field name="state"/>
                         </page>
-                        <page string="Analytic Lines" groups="base.group_extended">
-                            <field colspan="4" name="analytic_lines" nolabel="1" groups="base.group_extended"/>
+                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                            <field colspan="4" name="analytic_lines" nolabel="1" />
                         </page>
                     </notebook>
                 </form>
@@ -1358,8 +1358,8 @@
                                             <separator string="Narration" colspan="4"/>
                                             <field name="narration" colspan="4" nolabel="1"/>
                                         </page>
-                                        <page string="Analytic Lines" groups="base.group_extended">
-                                            <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}" groups="base.group_extended"/>
+                                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                                            <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
                                         </page>
                                     </notebook>
                                 </form>

addons/account/wizard/account_report_aged_partner_balance.py

@@ -45,7 +45,6 @@ class account_aged_trial_balance(osv.osv_memory):
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
         res = super(account_aged_trial_balance, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='journal_ids']")

addons/account_followup/wizard/account_followup_print.py

@@ -107,7 +107,7 @@ class account_followup_stat_by_partner(osv.osv):
                     l.reconcile_id is NULL AND
                     l.partner_id IS NOT NULL
                     GROUP BY
-                    l.partner_id, l.company_id 
+                    l.partner_id, l.company_id
             )""")
 account_followup_stat_by_partner()
 
@@ -212,10 +212,8 @@ class account_followup_print_all(osv.osv_memory):
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         if data['email_conf']:
-            mail_notsent = ''
             msg_sent = ''
             msg_unsent = ''
-            count = 0
             data_user = user_obj.browse(cr, uid, uid)
             move_lines = line_obj.browse(cr, uid, data['partner_ids'])
             partners = []

addons/account_payment/wizard/account_payment_order.py

@@ -100,7 +100,7 @@ class payment_order_create(osv.osv_memory):
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         search_due_date = data['duedate']
-        payment = order_obj.browse(cr, uid, context['active_id'], context=context)
+#        payment = order_obj.browse(cr, uid, context['active_id'], context=context)
 
         # Search for move line to pay:
         domain = [('reconcile_id', '=', False), ('account_id.type', '=', 'payable'), ('amount_to_pay', '>', 0)]

addons/base_vat/base_vat.py

@@ -22,7 +22,6 @@
 import string
 
 from osv import osv, fields
-from tools.func import partial
 from tools.translate import _
 
 _ref_vat = {

addons/hr_holidays/wizard/hr_holidays_summary_employees.py

@@ -21,7 +21,6 @@
 import time
 
 from osv import osv, fields
-from tools.translate import _
 
 class hr_holidays_summary_employee(osv.osv_memory):
     _name = 'hr.holidays.summary.employee'

addons/hr_payroll/wizard/hr_payroll_employees_detail.py

@@ -22,7 +22,6 @@
 import time
 
 from osv import fields, osv
-from tools.translate import _
 
 class hr_payroll_employees_detail(osv.osv_memory):
 

addons/hr_payroll/wizard/hr_payroll_year_salary.py

@@ -22,7 +22,6 @@
 import time
 
 from osv import fields, osv
-from tools.translate import _
 
 class hr_payroll_year_salary(osv.osv_memory):
    _name = "hr.payroll.year.salary"