From 7a41e200186a806be121c67b01e3ecf66ee94c64 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 29 Aug 2008 01:33:53 +0200 Subject: [PATCH 1/6] Modifs bzr revid: fp@tinyerp.com-20080828233353-v3a1rqrvgrp7je9d --- addons/account/account_invoice_view.xml | 20 +++++++++---------- addons/account/account_view.xml | 26 +++++++++++++------------ addons/account/project/project_view.xml | 14 +++++++------ 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index abf88954672..f9a8151bf2e 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -112,12 +112,12 @@ 2
- + + + + + - - - - @@ -196,12 +196,12 @@ form - + + + + + - - - - diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 2505a6f7693..3bc5fa992ef 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -242,12 +242,12 @@ form - + + + + + - - - - @@ -554,14 +554,16 @@ form - + + + + + + + + + - - - - - - diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 78fb0465f62..d338bc06c29 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -44,12 +44,14 @@ form - - - - - - + + + + + + + + From e79dd19330d80478d66c0c59f0b60cc77c82506c Mon Sep 17 00:00:00 2001 From: "mga@tinyerp.com" <> Date: Fri, 29 Aug 2008 11:04:20 +0530 Subject: [PATCH 2/6] comment appear 2 times so give error in e-tiny bzr revid: mga@tinyerp.com-20080829053420-noa72l1vizyfqguh --- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 791f0a254fb..d3d23e6fb92 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -129,7 +129,7 @@ - + From ae21cdb0eeaa8df585a2f1316935223d84ff3fe5 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 29 Aug 2008 13:07:47 +0530 Subject: [PATCH 3/6] bug fix bzr revid: mra@tinyerp.com-20080829073747-5wlz6ywae4ht3m3r --- addons/l10n_be/wizard/partner_vat_listing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_be/wizard/partner_vat_listing.py b/addons/l10n_be/wizard/partner_vat_listing.py index 1fc88af68bc..8270cc95051 100644 --- a/addons/l10n_be/wizard/partner_vat_listing.py +++ b/addons/l10n_be/wizard/partner_vat_listing.py @@ -20,7 +20,7 @@ form = """ fields = { 'fyear': {'string': 'Fiscal Year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True,}, 'mand_id':{'string':'MandataireId','type':'char','size':'30','required': True,}, - 'limit_amount':{'string':'Limit Amount','type':'int','required': True, }, + 'limit_amount':{'string':'Limit Amount','type':'integer','required': True, }, 'test_xml': {'string':'Test XML file', 'type':'boolean', }, } msg_form = """ @@ -46,7 +46,7 @@ class wizard_vat(wizard.interface): seq_controlref = pooler.get_pool(cr.dbname).get('ir.sequence').get(cr, uid,'controlref') seq_declarantnum = pooler.get_pool(cr.dbname).get('ir.sequence').get(cr, uid,'declarantnum') obj_cmpny = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id - company_vat = obj_cmpny.partner_id.vat + company_vat = obj_cmpny.partner_id.vat if not company_vat: #if not vat_company: raise wizard.except_wizard('Data Insufficient','No VAT Number Associated with Main Company!') From 29291c35ea55724a82205b9f7471ba797f17bdaf Mon Sep 17 00:00:00 2001 From: "hda@tinyerp.com" <> Date: Fri, 29 Aug 2008 15:14:06 +0530 Subject: [PATCH 4/6] bugfix bzr revid: hda@tinyerp.com-20080829094406-ghw2lj7fclwjvktv --- addons/purchase/purchase.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 6d68ccdf665..0fab3c30145 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -90,8 +90,7 @@ class purchase_order(osv.osv): res = {} for purchase in self.browse(cursor, user, ids, context=context): tot = 0.0 - - if purchase.invoice_id.state not in ('draft','cancel'): + if purchase.invoice_id and purchase.invoice_id.state not in ('draft','cancel'): tot += purchase.invoice_id.amount_untaxed if tot: res[purchase.id] = tot * 100.0 / purchase.amount_untaxed From 6becc8a5a73e9b7bd569500ad940e6e7d07d874d Mon Sep 17 00:00:00 2001 From: qdp Date: Fri, 29 Aug 2008 13:01:54 +0200 Subject: [PATCH 5/6] *improved wizard: if no account is selected then the reconciliation is made for each account that can be reconcilied *bugfixed wizard: bad sql query if partner is empty bzr revid: qdp@tinyerp.com-20080829110154-eg2r4491offbgkq1 --- addons/account/wizard/wizard_automatic_reconcile.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/account/wizard/wizard_automatic_reconcile.py b/addons/account/wizard/wizard_automatic_reconcile.py index 43da365c6cc..667a4bf4a93 100644 --- a/addons/account/wizard/wizard_automatic_reconcile.py +++ b/addons/account/wizard/wizard_automatic_reconcile.py @@ -73,7 +73,7 @@ _reconcile_fields = { 'type': 'many2many', 'relation': 'account.account', 'domain': [('reconcile','=',1)], - 'required': True + 'help': 'If no account is specified, the reconciliation will be made using every accounts that can be reconcilied', }, 'writeoff_acc_id': { 'string': 'Account', @@ -226,8 +226,8 @@ def _reconcile(self, cr, uid, data, context): max_amount = form.get('max_amount', 0.0) power = form['power'] reconciled = unreconciled = 0 - if not form['account_ids']: - return {'reconciled':0, 'unreconciled':[0]} + if not form['account_ids'][0][2]: + form['account_ids'][0][2] = pooler.get_pool(cr.dbname).get('account.account').search(cr, uid, [('reconcile','=',True)]) for account_id in form['account_ids'][0][2]: # reconcile automatically all transactions from partners whose balance is 0 @@ -264,6 +264,7 @@ def _reconcile(self, cr, uid, data, context): "WHERE account_id=%d " \ "AND reconcile_id IS NULL " \ "AND state <> 'draft' " \ + "AND partner_id IS NOT NULL " \ "GROUP BY partner_id " \ "HAVING count(*)>1", (account_id,)) From 0a885233230b874e7804f9c0f7947313abf20abd Mon Sep 17 00:00:00 2001 From: qdp Date: Fri, 29 Aug 2008 13:08:55 +0200 Subject: [PATCH 6/6] *removed the active field on account.move.line bzr revid: qdp@tinyerp.com-20080829110855-r96acqevswauss5o --- addons/account/account_move_line.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 0f7de933e3f..be10e26e30c 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -266,7 +266,6 @@ class account_move_line(osv.osv): 'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'), 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6), 'balance': fields.function(_balance, method=True, string='Balance'), - 'active': fields.boolean('Active'), 'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True), 'tax_code_id': fields.many2one('account.tax.code', 'Tax Account'), 'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True),