From 9799d989a6764c7709633ed65009031955a7c539 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Wed, 23 Dec 2009 19:33:29 +0530 Subject: [PATCH 1/5] [ADD]: Added tooltips for production order and procurement order. bzr revid: uco@tinyerp.co.in-20091223140329-laq7rr59x0k5i6g0 --- addons/mrp/mrp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 860a765a448..f08c3c1b3f2 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -189,7 +189,7 @@ class mrp_bom(osv.osv): 'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."), 'product_qty': fields.float('Product Qty', required=True), 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, help="UoM (Unit of Measure) is the unit of measurement for the inventory control"), - 'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity. For integer only values, put 1.0"), + 'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."), 'product_efficiency': fields.float('Product Efficiency', required=True, help="Material efficiency. A factor of 0.9 means a loss of 10% in the production."), 'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'), 'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True), @@ -441,8 +441,8 @@ class mrp_production(osv.osv): 'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'), 'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'), - 'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'), - 'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Reference'), + 'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name', help='Gives the name of sale order.'), + 'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Reference', help='Gives the name of Customer Reference from sale order.'), 'company_id': fields.many2one('res.company','Company',required=True), } _defaults = { @@ -793,7 +793,7 @@ class mrp_procurement(osv.osv): _description = "Procurement" _order = 'priority,date_planned' _columns = { - 'name': fields.char('Name', size=64, required=True), + 'name': fields.char('Name', size=64, required=True, help='Requisition name. It differs when done by scheduler else same as origin name.'), 'origin': fields.char('Origin', size=64, help="Reference of the document that created this Requisition.\n" "This is automatically completed by Open ERP."), From ec58eefc894227e95ba4a09ae1e304f9776d7f53 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Thu, 24 Dec 2009 12:35:23 +0530 Subject: [PATCH 2/5] [IMP] Help added on timesheet state field.Changed caption from 'Status' to 'State' bzr revid: vir@tinyerp.com-20091224070523-rlhk6rcijp5cujy2 --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 7d23e1340cb..17aada314ee 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -215,7 +215,7 @@ class hr_timesheet_sheet(osv.osv): return True _columns = { - 'name': fields.char('Description', size=64, select=1, + 'name': fields.char('Description', size=64, select=1, states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}), 'user_id': fields.many2one('res.users', 'User', required=True, select=1, states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}), @@ -229,7 +229,14 @@ class hr_timesheet_sheet(osv.osv): 'new': [('readonly', False)]} ), 'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)],'new':[('readonly',False)]}), - 'state' : fields.selection([('new', 'New'),('draft','Draft'),('confirm','Confirmed'),('done','Done')], 'Status', select=True, required=True, readonly=True), + 'state' : fields.selection([ + ('new', 'New'), + ('draft','Draft'), + ('confirm','Confirmed'), + ('done','Done')], 'State', select=True, required=True, readonly=True, + help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \ + \n* The \'Confirmed\' state is used for to confirm the timesheet by user. \ + \n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'), 'state_attendance' : fields.function(_state_attendance, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'), 'total_attendance_day': fields.function(_total_day, method=True, string='Total Attendance', multi="_total_day"), 'total_timesheet_day': fields.function(_total_day, method=True, string='Total Timesheet', multi="_total_day"), From 39980961546961bc23e2869950b93feab0fd3a87 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Thu, 24 Dec 2009 14:13:23 +0530 Subject: [PATCH 3/5] [ADD] Help added on invoice State field bzr revid: vir@tinyerp.com-20091224084323-0vjj0awboaekq6vb --- addons/account/invoice.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 76ab9a63182..d56c857999e 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -245,8 +245,12 @@ class account_invoice(osv.osv): ('open','Open'), ('paid','Done'), ('cancel','Cancelled') - ],'State', select=True, readonly=True), - + ],'State', select=True, readonly=True, + help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \ + \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \ + \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \ + \n* The \'Done\' state is set automatically when invoice is paid.\ + \n* The \'Cancelled\' state is used when user cancel invoice.'), 'date_invoice': fields.date('Date Invoiced', states={'open':[('readonly',True)],'close':[('readonly',True)]}, help="Keep empty to use the current date"), 'date_due': fields.date('Due Date', states={'open':[('readonly',True)],'close':[('readonly',True)]}, help="If you use payment terms, the due date will be computed automatically at the generation "\ @@ -358,7 +362,7 @@ class account_invoice(osv.osv): if p.property_account_receivable.company_id.id != company_id and p.property_account_payable.company_id.id != company_id: rec_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)]) pay_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_payable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)]) - if not rec_pro_id: + if not rec_pro_id: rec_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_receivable'),('company_id','=',company_id)]) if not pay_pro_id: pay_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_payable'),('company_id','=',company_id)]) @@ -394,7 +398,7 @@ class account_invoice(osv.osv): if type in ('in_invoice', 'in_refund'): result['value']['partner_bank'] = bank_id - + if payment_term != partner_payment_term: if partner_payment_term: to_update = self.onchange_payment_term_date_invoice( @@ -446,7 +450,7 @@ class account_invoice(osv.osv): if partner_obj.property_account_payable.company_id.id != company_id and partner_obj.property_account_receivable.company_id.id != company_id: rec_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(part_id)+''),('company_id','=',company_id)]) pay_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_payable'),('res_id','=','res.partner,'+str(part_id)+''),('company_id','=',company_id)]) - if not rec_pro_id: + if not rec_pro_id: rec_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_receivable'),('company_id','=',company_id)]) if not pay_pro_id: pay_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_payable'),('company_id','=',company_id)]) @@ -1120,7 +1124,7 @@ class account_invoice_line(osv.osv): context.update({'lang': lang}) result = {} res = self.pool.get('product.product').browse(cr, uid, product, context=context) - + if company_id: in_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_income'),('res_id','=','product.template,'+str(res.product_tmpl_id.id)+''),('company_id','=',company_id)]) if not in_pro_id: @@ -1128,9 +1132,9 @@ class account_invoice_line(osv.osv): exp_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_expense'),('res_id','=','product.template,'+str(res.product_tmpl_id.id)+''),('company_id','=',company_id)]) if not exp_pro_id: exp_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_expense_categ'),('res_id','=','product.template,'+str(res.categ_id.id)+''),('company_id','=',company_id)]) - + if not in_pro_id: - in_acc = res.product_tmpl_id.property_account_income + in_acc = res.product_tmpl_id.property_account_income in_acc_cate = res.categ_id.property_account_income_categ if in_acc: app_acc_in = in_acc @@ -1148,7 +1152,7 @@ class account_invoice_line(osv.osv): else: app_acc_exp = self.pool.get('account.account').browse(cr,uid,exp_pro_id)[0] if not in_pro_id and not exp_pro_id: - in_acc = res.product_tmpl_id.property_account_income + in_acc = res.product_tmpl_id.property_account_income in_acc_cate = res.categ_id.property_account_income_categ ex_acc = res.product_tmpl_id.property_account_expense ex_acc_cate = res.categ_id.property_account_expense_categ @@ -1212,17 +1216,17 @@ class account_invoice_line(osv.osv): res2 = res.uom_id.category_id.id if res2 : domain = {'uos_id':[('category_id','=',res2 )]} - - prod_pool=self.pool.get('product.product') + + prod_pool=self.pool.get('product.product') result['categ_id'] = res.categ_id.id res_final = {'value':result, 'domain':domain} - + if not company_id and not currency_id: return res_final - + company = self.pool.get('res.company').browse(cr, uid, company_id) currency = self.pool.get('res.currency').browse(cr, uid, currency_id) - + if company.currency_id.id != currency.id and currency.company_id.id == company.id: new_price = res_final['value']['price_unit'] * currency.rate res_final['value']['price_unit'] = new_price From fae30d1a4a3e815a33a1868a8dccc320c1e84a9c Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Thu, 24 Dec 2009 15:09:00 +0530 Subject: [PATCH 4/5] [ADD] Help added on state field in voucher bzr revid: vir@tinyerp.com-20091224093900-ec59lhaseg02p0ng --- addons/account_voucher/voucher.py | 230 +++++++++++++++--------------- 1 file changed, 117 insertions(+), 113 deletions(-) diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py index 459611aca43..4a491e38335 100755 --- a/addons/account_voucher/voucher.py +++ b/addons/account_voucher/voucher.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -43,49 +43,49 @@ class account_voucher(osv.osv): return periods[0] else: return False - + def _get_type(self, cr, uid, context={}): type = context.get('type', 'rec_voucher') return type - + def _get_reference_type(self, cursor, user, context=None): return [('none', 'Free Reference')] - + def _get_journal(self, cr, uid, context): type_inv = 'rec_voucher' - + if type(context) == type(''): type_inv = context elif type(context) == type({}): type_inv = context.get('type', 'rec_voucher') type2journal = { - 'rec_voucher': 'cash', + 'rec_voucher': 'cash', 'bank_rec_voucher': 'cash', 'pay_voucher': 'cash', - 'bank_pay_voucher': 'cash', + 'bank_pay_voucher': 'cash', 'cont_voucher': 'cash', 'journal_sale_vou': 'sale', 'journal_pur_voucher': 'purchase', 'journal_voucher':'expanse' } - + journal_obj = self.pool.get('account.journal') ttype = type2journal.get(type_inv, 'cash') res = journal_obj.search(cr, uid, [('type', '=', ttype)], limit=1) - + if res: return res[0] else: return False - + def _get_currency(self, cr, uid, context): user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0] if user.company_id: return user.company_id.currency_id.id else: return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=',1.0)])[0] - + _name = 'account.voucher' _description = 'Accounting Voucher' _order = "number" @@ -114,8 +114,12 @@ class account_voucher(osv.osv): ('proforma','Pro-forma'), ('posted','Posted'), ('cancel','Cancel') - ], 'State', - readonly=True), + ], 'State', + readonly=True, + help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \ + \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \ + \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \ + \n* The \'Cancelled\' state is used when user cancel voucher.'), 'amount':fields.float('Amount', readonly=True), 'number':fields.char('Number', size=32, readonly=True), 'reference': fields.char('Voucher Reference', size=64), @@ -125,7 +129,7 @@ class account_voucher(osv.osv): 'move_ids':fields.many2many('account.move.line', 'voucher_id', 'account_id', 'rel_account_move', 'Real Entry'), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}) } - + _defaults = { 'state': lambda *a: 'draft', 'date' : lambda *a: time.strftime('%Y-%m-%d'), @@ -136,11 +140,11 @@ class account_voucher(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher', c), 'currency_id': _get_currency, } - + def _get_analityc_lines(self, cr, uid, id): inv = self.browse(cr, uid, [id])[0] cur_obj = self.pool.get('res.currency') - + def onchange_account(self, cr, uid, ids, account_id): if not account_id: return {'value':{'amount':False}} @@ -161,7 +165,7 @@ class account_voucher(osv.osv): else: account_id = journal.browse(cr, uid, journal_id).default_credit_account_id return {'value':{'account_id':account_id.id}} - + def open_voucher(self, cr, uid, ids, context={}): obj=self.pool.get('account.voucher').browse(cr,uid,ids) total=0 @@ -170,18 +174,18 @@ class account_voucher(osv.osv): self.write(cr,uid,ids,{'amount':total}) self.write(cr, uid, ids, {'state':'proforma'}) return True - + def proforma_voucher(self, cr, uid, ids, context={}): self.action_number(cr, uid, ids) self.action_move_line_create(cr, uid, ids) self.write(cr, uid, ids, {'state':'posted'}) return True - + def cancel_voucher(self,cr,uid,ids,context={}): self.action_cancel(cr, uid, ids) self.write(cr, uid, ids, {'state':'cancel'}) return True - + def action_cancel_draft(self, cr, uid, ids, *args): self.write(cr, uid, ids, {'state':'draft'}) return True @@ -196,7 +200,7 @@ class account_voucher(osv.osv): raise osv.except_osv('Invalid action !', 'Cannot delete invoice(s) which are already opened or paid !') osv.osv.unlink(self, cr, uid, unlink_ids) return True - + def _get_analytic_lines(self, cr, uid, id): inv = self.browse(cr, uid, [id])[0] cur_obj = self.pool.get('res.currency') @@ -208,14 +212,14 @@ class account_voucher(osv.osv): sign = -1 iml = self.pool.get('account.voucher.line').move_line_get(cr, uid, inv.id) - + for il in iml: if il['account_analytic_id']: if inv.type in ('pay_voucher', 'rec_voucher','cont_voucher','bank_pay_voucher','bank_rec_voucher','journal_sale_vou','journal_pur_voucher'): ref = inv.reference else: ref = self._convert_ref(cr, uid, inv.number) - + il['analytic_lines'] = [(0, 0, { 'name': il['name'], 'date': inv['date'], @@ -226,7 +230,7 @@ class account_voucher(osv.osv): 'ref': ref, })] return iml - + def action_move_line_create(self, cr, uid, ids, *args): for inv in self.browse(cr, uid, ids): if inv.move_id: @@ -246,13 +250,13 @@ class account_voucher(osv.osv): else: ref = self._convert_ref(cr, uid, inv.number) - acc_id = None + acc_id = None date = inv.date total_currency = 0 acc_id = None for i in iml: partner_id=i['partner_id'] - acc_id = i['account_id'] + acc_id = i['account_id'] if inv.currency_id.id != company_currency: i['currency_id'] = inv.currency_id.id i['amount_currency'] = i['amount'] @@ -289,14 +293,14 @@ class account_voucher(osv.osv): line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x,date, context={})) ,iml) an_journal_id=inv.journal_id.analytic_journal_id.id journal_id = inv.journal_id.id - + journal = self.pool.get('account.journal').browse(cr, uid, journal_id) if journal.sequence_id: name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id) move = { - 'name': name, - 'journal_id': journal_id, + 'name': name, + 'journal_id': journal_id, 'voucher_type':inv.type, 'narration' : inv.narration } @@ -307,7 +311,7 @@ class account_voucher(osv.osv): move_id = self.pool.get('account.move').create(cr, uid, move) ref = move['name'] amount=0.0 - + #create the first line our self move_line = { 'name': inv.name, @@ -318,7 +322,7 @@ class account_voucher(osv.osv): 'journal_id':journal_id , 'period_id':inv.period_id.id, 'partner_id': False, - 'ref': ref, + 'ref': ref, 'date': inv.date } if inv.type in ('rec_voucher', 'bank_rec_voucher', 'journal_pur_voucher', 'journal_voucher'): @@ -326,9 +330,9 @@ class account_voucher(osv.osv): else: move_line['credit'] = inv.amount * (-1) self.pool.get('account.move.line').create(cr, uid, move_line) - + for line in inv.payment_ids: - + move_line = { 'name':line.name, 'debit':False, @@ -338,24 +342,24 @@ class account_voucher(osv.osv): 'journal_id':journal_id , 'period_id':inv.period_id.id, 'partner_id':line.partner_id.id or False, - 'ref':ref, + 'ref':ref, 'date':inv.date } - + if line.type == 'dr': move_line['debit'] = line.amount or False amount=line.amount elif line.type == 'cr': move_line['credit'] = line.amount or False amount=line.amount * (-1) - + ml_id=self.pool.get('account.move.line').create(cr, uid, move_line) - + if inv.narration: line.name=inv.narration else: line.name=line.name - + if line.account_analytic_id: an_line = { 'name':line.name, @@ -368,18 +372,18 @@ class account_voucher(osv.osv): 'ref':ref } self.pool.get('account.analytic.line').create(cr,uid,an_line) - + self.write(cr, uid, [inv.id], {'move_id': move_id}) obj=self.pool.get('account.move').browse(cr, uid, move_id) - + for line in obj.line_id : cr.execute('insert into voucher_id (account_id,rel_account_move) values (%d, %d)',(int(ids[0]),int(line.id))) - + return True - + def line_get_convert(self, cr, uid, x, date, context={}): - + return { 'date':date, 'date_maturity': x.get('date_maturity', False), @@ -397,8 +401,8 @@ class account_voucher(osv.osv): } def _convert_ref(self, cr, uid, ref): return (ref or '').replace('/','') - - + + def action_number(self, cr, uid, ids, *args): cr.execute('SELECT id, type, number, move_id, reference ' \ 'FROM account_voucher ' \ @@ -411,7 +415,7 @@ class account_voucher(osv.osv): ref = reference else: ref = self._convert_ref(cr, uid, number) - + cr.execute('UPDATE account_voucher SET number=%s ' \ 'WHERE id=%d', (number, id)) cr.execute('UPDATE account_move_line SET ref=%s ' \ @@ -425,7 +429,7 @@ class account_voucher(osv.osv): return True - + def name_get(self, cr, uid, ids, context={}): if not len(ids): return [] @@ -452,7 +456,7 @@ class account_voucher(osv.osv): if not ids: ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context) return self.name_get(cr, user, ids, context) - + def copy(self, cr, uid, id, default=None, context=None): if default is None: default = {} @@ -461,7 +465,7 @@ class account_voucher(osv.osv): if 'date' not in default: default['date'] = time.strftime('%Y-%m-%d') return super(account_voucher, self).copy(cr, uid, id, default, context) - + def action_cancel(self, cr, uid, ids, *args): account_move_obj = self.pool.get('account.move') voucher = self.read(cr, uid, ids, ['move_id']) @@ -474,7 +478,7 @@ class account_voucher(osv.osv): account_move_obj.unlink(cr, uid, [i['move_id'][0]]) self.write(cr, uid, ids, {'state':'cancel', 'move_id':False}) return True - + account_voucher() class VoucherLine(osv.osv): @@ -493,7 +497,7 @@ class VoucherLine(osv.osv): _defaults = { 'type': lambda *a: 'cr' } - + def move_line_get(self, cr, uid, voucher_id, context={}): res = [] @@ -505,7 +509,7 @@ class VoucherLine(osv.osv): for line in inv.payment_ids: res.append(self.move_line_get_item(cr, uid, line, context)) return res - + def onchange_partner(self, cr, uid, ids, partner_id, ttype ,type1): if not partner_id: return {'value' : {'account_id' : False, 'type' : False ,'amount':False}} @@ -515,54 +519,54 @@ class VoucherLine(osv.osv): account_id = obj.browse(cr, uid, partner_id).property_account_receivable balance = obj.browse(cr,uid,partner_id).credit ttype = 'cr' - elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : + elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : account_id = obj.browse(cr, uid, partner_id).property_account_payable balance = obj.browse(cr,uid,partner_id).debit ttype = 'dr' - elif type1 in ('journal_sale_vou') : + elif type1 in ('journal_sale_vou') : account_id = obj.browse(cr, uid, partner_id).property_account_receivable balance = obj.browse(cr,uid,partner_id).credit ttype = 'dr' - elif type1 in ('journal_pur_voucher') : + elif type1 in ('journal_pur_voucher') : account_id = obj.browse(cr, uid, partner_id).property_account_payable balance = obj.browse(cr,uid,partner_id).debit - ttype = 'cr' - + ttype = 'cr' + return { 'value' : {'account_id' : account_id.id, 'type' : ttype, 'amount':balance} } - + def onchange_amount(self, cr, uid, ids,partner_id,amount, type,type1): if not amount: return {'value' : {}} if partner_id: - + obj = self.pool.get('res.partner') if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'): if amount < 0 : - account_id = obj.browse(cr, uid, partner_id).property_account_payable + account_id = obj.browse(cr, uid, partner_id).property_account_payable type = 'dr' else: - account_id = obj.browse(cr, uid, partner_id).property_account_receivable + account_id = obj.browse(cr, uid, partner_id).property_account_receivable type = 'cr' - - elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : + + elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : if amount < 0 : - account_id = obj.browse(cr, uid, partner_id).property_account_receivable + account_id = obj.browse(cr, uid, partner_id).property_account_receivable type = 'cr' else: account_id = obj.browse(cr, uid, partner_id).property_account_payable type = 'dr' - - elif type1 in ('journal_sale_vou') : + + elif type1 in ('journal_sale_vou') : if amount < 0 : account_id = obj.browse(cr, uid, partner_id).property_account_payable type = 'cr' else: account_id = obj.browse(cr, uid, partner_id).property_account_receivable type = 'dr' - - elif type1 in ('journal_pur_voucher') : + + elif type1 in ('journal_pur_voucher') : if amount< 0 : account_id = obj.browse(cr, uid, partner_id).property_account_receivable type = 'dr' @@ -572,70 +576,70 @@ class VoucherLine(osv.osv): else: if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'): if amount < 0 : - + type = 'dr' else: - + type = 'cr' - - elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : + + elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : if amount < 0 : - + type = 'cr' else: - + type = 'dr' - - elif type1 in ('journal_sale_vou') : + + elif type1 in ('journal_sale_vou') : if amount < 0 : - + type = 'cr' else: - + type = 'dr' - - elif type1 in ('journal_pur_voucher') : + + elif type1 in ('journal_pur_voucher') : if amount< 0 : - + type = 'dr' else: - + type = 'cr' - + return { 'value' : { 'type' : type , 'amount':amount} } - + def onchange_type(self, cr, uid, ids,partner_id,amount,type,type1): if partner_id: - + obj = self.pool.get('res.partner') - + if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'): if type == 'dr' : - account_id = obj.browse(cr, uid, partner_id).property_account_payable + account_id = obj.browse(cr, uid, partner_id).property_account_payable total=amount*(-1) else: - account_id = obj.browse(cr, uid, partner_id).property_account_receivable + account_id = obj.browse(cr, uid, partner_id).property_account_receivable total=amount*(-1) - - elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : + + elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : if type == 'cr' : - account_id = obj.browse(cr, uid, partner_id).property_account_receivable + account_id = obj.browse(cr, uid, partner_id).property_account_receivable total=amount*(-1) else: account_id = obj.browse(cr, uid, partner_id).property_account_payable total=amount*(-1) - - elif type1 in ('journal_sale_vou') : + + elif type1 in ('journal_sale_vou') : if type == 'cr' : account_id = obj.browse(cr, uid, partner_id).property_account_payable total=amount*(-1) else: account_id = obj.browse(cr, uid, partner_id).property_account_receivable total=amount*(-1) - - elif type1 in ('journal_pur_voucher') : + + elif type1 in ('journal_pur_voucher') : if type == 'dr' : account_id = obj.browse(cr, uid, partner_id).property_account_receivable total=amount*(-1) @@ -645,40 +649,40 @@ class VoucherLine(osv.osv): else: if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'): if type == 'dr' : - + total=amount*(-1) else: - + total=amount*(-1) - - elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : + + elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : if type == 'cr' : - + total=amount*(-1) else: - + total=amount*(-1) - - elif type1 in ('journal_sale_vou') : + + elif type1 in ('journal_sale_vou') : if type == 'cr' : - + total=amount*(-1) else: - + total=amount*(-1) - - elif type1 in ('journal_pur_voucher') : + + elif type1 in ('journal_pur_voucher') : if type == 'dr' : - + total=amount*(-1) else: - + total=amount*(-1) - + return { 'value' : {'type' : type , 'amount':total} } - + def move_line_get_item(self, cr, uid, line, context={}): return { 'type':'src', @@ -689,7 +693,7 @@ class VoucherLine(osv.osv): 'account_analytic_id':line.account_analytic_id.id or False, 'ref' : line.ref } - + VoucherLine() From 5c065f6ccde45999bd2769dc6496ee7cf6e998ba Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Thu, 24 Dec 2009 15:41:39 +0530 Subject: [PATCH 5/5] [ADD] Help added for auction object state bzr revid: vir@tinyerp.com-20091224101139-nenkmnttowhtml3m --- addons/auction/auction.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/addons/auction/auction.py b/addons/auction/auction.py index f90bf254515..2483df35540 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -443,7 +443,16 @@ class auction_lots(osv.osv): # 'paid_vnd':fields.function(_is_paid_vnd,string='Seller Paid',method=True,type='boolean',store=True), 'paid_vnd':fields.boolean('Seller Paid'), 'paid_ach':fields.function(_is_paid_ach,string='Buyer invoice reconciled',method=True, type='boolean',store=True), - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold'),('taken_away','Taken away')),'State', required=True, readonly=True), + 'state': fields.selection(( + ('draft','Draft'), + ('unsold','Unsold'), + ('paid','Paid'), + ('sold','Sold'), + ('taken_away','Taken away')),'State', required=True, readonly=True, + help=' * The \'Draft\' state is used when a object is encoding as a new object. \ + \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \ + \n* The \'Paid\' state is used when user pay for the object \ + \n* The \'Sold\' state is used when user buy the object.'), 'buyer_price': fields.function(_buyerprice, method=True, string='Buyer price',store=True), 'seller_price': fields.function(_sellerprice, method=True, string='Seller price',store=True), 'gross_revenue':fields.function(_grossprice, method=True, string='Gross revenue',store=True),