From 41547d5942d1a945a7cb8af9b8434c8161f9e28a Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Mon, 25 Jun 2012 11:43:43 +0530 Subject: [PATCH 01/85] [IMP]customers-sales-receipt bzr revid: pja@tinyerp.com-20120625061343-oxbyvom0a37qtcez --- addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 5de7636c0c1..1365a24051f 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -96,15 +96,15 @@ + - - + From f1957e856384abfaba18bf82750e7daee19e5f02 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Mon, 25 Jun 2012 11:59:19 +0530 Subject: [PATCH 02/85] [IMP]customers-sales-receipt bzr revid: pja@tinyerp.com-20120625062919-lawo5zyr8i4zn8jc --- addons/account_voucher/account_voucher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 9ca30aed099..1e882b7c585 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -260,7 +260,7 @@ class account_voucher(osv.osv): ('receipt','Receipt'), ],'Default Type', readonly=True, states={'draft':[('readonly',False)]}), 'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}), - 'date':fields.date('Date', readonly=True, select=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"), + 'date':fields.date('Bill Date', readonly=True, select=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"), 'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}), From bb4240fc56964c5e4c775e53feb245efdb681843 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Mon, 25 Jun 2012 14:55:40 +0530 Subject: [PATCH 03/85] [IMP] improve the customer and supplier invoice and refunds form bzr revid: nco@tinyerp.com-20120625092540-m7243o1kkdcg1l62 --- addons/account/account_invoice_view.xml | 83 ++++++++++--------- .../account_asset_invoice_view.xml | 2 +- .../account_invoice_layout_view.xml | 2 +- 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 68a723aa4a0..7ac6e6154ab 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -53,6 +53,7 @@
+ @@ -156,33 +156,42 @@ - - - + + From 6b7047c9c4880802d56065f5bf4ff426dc43b331 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Mon, 25 Jun 2012 18:18:04 +0530 Subject: [PATCH 05/85] [IMP] improved views of account_asset module and also added function for Entries feature bzr revid: bde@tinyerp.com-20120625124804-37hru51o1uyaop3n --- addons/account_asset/account_asset.py | 22 +++++-- addons/account_asset/account_asset_view.xml | 63 +++++++++++++++------ 2 files changed, 61 insertions(+), 24 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 0799a59a423..27a58d3079b 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -213,13 +213,13 @@ class account_asset_asset(osv.osv): _columns = { 'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}), - 'name': fields.char('Asset', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}), 'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}), - 'purchase_value': fields.float('Gross value ', required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'purchase_value': fields.float('Gross Value ', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'note': fields.text('Note'), - 'category_id': fields.many2one('account.asset.category', 'Asset category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}), + 'category_id': fields.many2one('account.asset.category', 'Asset Category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}), 'parent_id': fields.many2one('account.asset.asset', 'Parent Asset', readonly=True, states={'draft':[('readonly',False)]}), 'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'), 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}), @@ -316,6 +316,16 @@ class account_asset_asset(osv.osv): asset_id = super(account_asset_asset, self).create(cr, uid, vals, context=context) self.compute_depreciation_board(cr, uid, [asset_id], context=context) return asset_id + + def open_entries(self, cr, uid, ids, context=None): + return { + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'account.move.line', + 'view_id': False, + 'type': 'ir.actions.act_window', + 'context':{'search_default_asset_id': ids, 'default_asset_id': ids}, + } account_asset_asset() @@ -331,12 +341,12 @@ class account_asset_depreciation_line(osv.osv): _columns = { 'name': fields.char('Depreciation Name', size=64, required=True, select=1), - 'sequence': fields.integer('Sequence of the depreciation', required=True), + 'sequence': fields.integer('Sequence', required=True), 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True), 'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'), 'amount': fields.float('Depreciation Amount', required=True), - 'remaining_value': fields.float('Amount to Depreciate', required=True), - 'depreciated_value': fields.float('Amount Already Depreciated', required=True), + 'remaining_value': fields.float('Amount to depreciate', required=True), + 'depreciated_value': fields.float('Amount already depreciated', required=True), 'depreciation_date': fields.char('Depreciation Date', size=64, select=1), 'move_id': fields.many2one('account.move', 'Depreciation Entry'), 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True) diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 8efe929e471..a126f6d1173 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -70,7 +70,7 @@ - + @@ -88,28 +88,40 @@ -