diff --git a/addons/account/account.py b/addons/account/account.py index 7e0cdb00cae..6bd34048e3b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2541,8 +2541,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True), 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), - "sale_tax": fields.many2one("account.tax.template", "Sale Tax"), - "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"), + "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"), + "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} @@ -2550,12 +2550,12 @@ class wizard_multi_charts_accounts(osv.osv_memory): res['value']["sale_tax"] = False res['value']["purchase_tax"] = False if chart_template_id: - ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" - , "=", chart_template_id)], order="sequence") - if len(ids) > 0: - id=ids[0] - res['value']["sale_tax"] = id - res['value']["purchase_tax"] = id + sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence") + purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence") + res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False + res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False return res def _get_chart(self, cr, uid, context={}): diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index ffea12170a2..62cfa7cbd6f 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1101,6 +1101,10 @@ class account_move_line(osv.osv): journal_obj = self.pool.get('account.journal') if context is None: context = {} + if vals.get('move_id', False): + company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False) + if company_id: + vals['company_id'] = company_id[0] self._check_date(cr, uid, vals, context, check) if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']: raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!')) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index a92ca3b3bb9..acbe5071088 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2419,8 +2419,8 @@ - - + +
@@ -2467,7 +2467,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context) New Company Financial Setting - STOCK_JUSTIFY_FILL + STOCK_EXECUTE diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 79dadadbcd0..ee9a78109c8 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -159,5 +159,6 @@ sequence="1" id="menu_board_crm" icon="terp-graph" groups="base.group_sale_salesman"/> + diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 1d0cf21be08..7f751f7c5a2 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -128,8 +128,8 @@ form tree,form - {'type':'imap'} - [('type','=','imap')] + {'server_type':'imap'} + [('server_type','=','imap')] form tree,form - {'type':'pop'} - [('type','=','pop')] + {'server_type':'pop'} + [('server_type','=','pop')] = %s and line.date < %s " "order by line.date", - (uid, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d'))) + (user_id, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d'))) # Sum attendence by account, then by day accounts = {} @@ -84,7 +90,7 @@ class report_custom(report_rml): %s %s - ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name) + ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name) account_xml = [] for account, telems in accounts.iteritems(): @@ -96,10 +102,6 @@ class report_custom(report_rml): account_xml.append('\n'.join([xml % (day, amount) for day, amount in telems.iteritems()])) account_xml.append('') - # Computing the employee - cr.execute("select name from res_users where id=%s", (str(uid))) - emp = cr.fetchone()[0] - # Computing the xml xml = ''' @@ -107,7 +109,7 @@ class report_custom(report_rml): %s %s - ''' % (header_xml,toxml(emp), '\n'.join(date_xml) + '\n'.join(account_xml)) + ''' % (header_xml,toxml(empl_name), '\n'.join(date_xml) + '\n'.join(account_xml)) return xml report_custom('report.hr.analytical.timesheet', 'hr.employee', '', 'addons/hr_timesheet/report/user_timesheet.xsl') diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py index 5a52e9ce9c8..f7f78d72fd7 100644 --- a/addons/hr_timesheet/report/users_timesheet.py +++ b/addons/hr_timesheet/report/users_timesheet.py @@ -33,7 +33,7 @@ def lengthmonth(year, month): return 29 return [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month] -def emp_create_xml(cr, id, som, eom): +def emp_create_xml(cr, id, som, eom, emp): # Computing the attendence by analytical account cr.execute( "select line.date, (unit_amount * unit.factor) as amount "\ @@ -58,10 +58,6 @@ def emp_create_xml(cr, id, som, eom): ''' time_xml = ([xml % (day, amount) for day, amount in month.iteritems()]) - # Computing the employee - cr.execute("select name from resource_resource where id=%s", (id,)) - emp = cr.fetchone()[0] - # Computing the xml xml = ''' @@ -94,8 +90,9 @@ class report_custom(report_rml): emp_obj = pooler.get_pool(cr.dbname).get('hr.employee') for id in data['form']['employee_ids']: user = emp_obj.browse(cr, uid, id).user_id.id + empl_name = emp_obj.browse(cr, uid, id).name if user: - emp_xml += emp_create_xml(cr, id, som, eom) + emp_xml += emp_create_xml(cr, user, som, eom, empl_name) # Computing the xml #Without this, report don't show non-ascii characters (TO CHECK) date_xml = '\n'.join(date_xml) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index c780951d07e..04cdc7231e5 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -20,12 +20,12 @@ ############################################################################## import time -import netsvc - -from osv import fields, osv from datetime import datetime from dateutil.relativedelta import relativedelta + +from osv import fields, osv from tools.translate import _ +import netsvc class one2many_mod2(fields.one2many): def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None): diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml index a4b4b434da6..3ffa2cf0d1a 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml @@ -1,15 +1,7 @@ - - Sheet 0 - - - - - - - + Sheet 1 diff --git a/addons/html_view/html_view.xml b/addons/html_view/html_view.xml index 7babda37c46..a279b408300 100644 --- a/addons/html_view/html_view.xml +++ b/addons/html_view/html_view.xml @@ -1,41 +1,41 @@ - - - htmlform - html.view - form - - - -

This is Test Html Page

- - - - - - - -
- Name : - - - - Company : - - -
- - - - - - - Html Test - ir.actions.act_window - html.view - form - - - + + + htmlform + html.view + form + +
+ +

This is Test Html Page

+ + + + + + + +
+ Name : + + + + Company : + + +
+ + + +
+ + + Html Test + ir.actions.act_window + html.view + form + + + \ No newline at end of file diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 4b5e3ca959e..01d2e3f0c1c 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -11,7 +11,7 @@ company customize which Pad installation should be used to link to new pads 'author': 'OpenERP SA', 'website': 'http://openerp.com', 'depends': ['base'], - 'update_xml': [ + 'data': [ 'company_pad.xml' ], 'installable': True, diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3145979d7b0..5291df7d258 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -297,10 +297,10 @@ class purchase_order(osv.osv): managers.append(manager.id) for manager_id in managers: request.create(cr, uid,{ - 'name' : "Purchase amount over the limit", + 'name' : _("Purchase amount over the limit"), 'act_from' : uid, 'act_to' : manager_id, - 'body': 'Somebody has just confirmed a purchase with an amount over the defined limit', + 'body': _('Somebody has just confirmed a purchase with an amount over the defined limit'), 'ref_partner_id': po.partner_id.id, 'ref_doc1': 'purchase.order,%d' % (po.id,), }) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 18317f2cff1..fbb05024c29 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -41,7 +41,7 @@ parent="base.menu_purchase_root" sequence="4"/> + groups="base.group_extended"/> @@ -147,8 +147,7 @@