diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index a6d2f0c9e69..b91de72dff6 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -41,9 +41,9 @@ The processes like maintaining of general ledger is done through the defined fin grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a module named account_vouchers """, - "depends" : ["product", "analytic", "process","board"], 'website': 'http://www.openerp.com', 'init_xml': [], + "depends" : ["product", "analytic", "process","board"], 'update_xml': [ #'test/test_parent_structure.yml', 'security/account_security.xml', @@ -55,6 +55,7 @@ module named account_vouchers 'wizard/account_use_model_view.xml', 'account_view.xml', 'account_report.xml', + 'wizard/account_report_common_view.xml', 'wizard/account_invoice_refund_view.xml', 'wizard/account_period_close_view.xml', 'wizard/account_fiscalyear_close_state.xml', @@ -64,9 +65,9 @@ module named account_vouchers 'wizard/account_open_closed_fiscalyear_view.xml', 'wizard/account_move_line_unreconcile_select_view.xml', 'wizard/account_vat_view.xml', - 'wizard/account_print_journal_view.xml', - 'wizard/account_general_journal_view.xml', - 'wizard/account_central_journal_view.xml', + 'wizard/account_report_print_journal_view.xml', + 'wizard/account_report_general_journal_view.xml', + 'wizard/account_report_central_journal_view.xml', 'wizard/account_subscription_generate_view.xml', 'wizard/account_fiscalyear_close_view.xml', 'wizard/account_state_open_view.xml', @@ -75,14 +76,14 @@ module named account_vouchers 'wizard/account_validate_move_view.xml', 'wizard/account_pay_invoice_view.xml', 'wizard/account_unreconcile_view.xml', - 'wizard/account_general_ledger_report_view.xml', + 'wizard/account_report_general_ledger_view.xml', 'wizard/account_invoice_state_view.xml', - 'wizard/account_partner_balance_report_view.xml', - 'wizard/account_balance_report_view.xml', + 'wizard/account_report_partner_balance_view.xml', + 'wizard/account_report_account_balance_view.xml', # 'wizard/account_move_line_select_view.xml', - 'wizard/account_aged_trial_balance_view.xml', + 'wizard/account_report_aged_partner_balance_view.xml', 'wizard/account_compare_account_balance_report_view.xml', - 'wizard/account_third_party_ledger.xml', + 'wizard/account_report_partner_ledger_view.xml', 'wizard/account_reconcile_view.xml', 'wizard/account_reconcile_partner_process_view.xml', 'wizard/account_automatic_reconcile_view.xml', @@ -113,12 +114,15 @@ module named account_vouchers 'report/account_invoice_report_view.xml', 'report/account_entries_report_view.xml', 'report/account_report_view.xml', + 'report/account_analytic_report_view.xml', + 'report/account_account_report_view.xml', 'report/account_analytic_entries_report_view.xml', 'board_account_view.xml', - "wizard/account_pl_report_view.xml", - "wizard/account_bs_report_view.xml" + "wizard/account_report_profit_loss_view.xml", + "wizard/account_report_balance_sheet_view.xml" ], 'demo_xml': [ + #'demo/price_accuracy00.yml', 'account_demo.xml', 'project/project_demo.xml', 'project/analytic_account_demo.xml', diff --git a/addons/account/account.py b/addons/account/account.py index 2e7ce17196b..aa0a27ad76d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -81,7 +81,7 @@ class account_payment_term(osv.osv): if amt: next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days) if line.days2 < 0: - next_date += relativedelta(day=31) + next_date += relativedelta(day=line.days2) if line.days2 > 0: next_date += relativedelta(day=line.days2, months=1) result.append( (next_date.strftime('%Y-%m-%d'), amt) ) @@ -860,7 +860,7 @@ class account_period(osv.osv): 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True), 'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True, help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'), - 'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company'), + 'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True) } _defaults = { 'state': lambda *a: 'draft', @@ -1236,7 +1236,7 @@ class account_move(osv.osv): return amount def _centralise(self, cr, uid, move, mode, context=None): - assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection + assert(mode in ('debit', 'credit'), 'Invalid Mode') #to prevent sql injection if context is None: context = {} @@ -1292,11 +1292,10 @@ class account_move(osv.osv): # # Validate a balanced move. If it is a centralised journal, create a move. # - def validate(self, cr, uid, ids, context={}): if context and ('__last_update' in context): del context['__last_update'] - + valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries for move in self.browse(cr, uid, ids, context): @@ -1332,7 +1331,7 @@ class account_move(osv.osv): valid_moves.append(move) # Check whether the move lines are confirmed - + if not len(line_draft_ids): continue # Update the move lines (set them as valid) @@ -1345,7 +1344,7 @@ class account_move(osv.osv): account = {} account2 = {} - + if journal.type in ('purchase','sale'): for line in move.line_id: code = amount = 0 @@ -1602,8 +1601,8 @@ class account_tax(osv.osv): # # Fields used for the VAT declaration # - 'base_code_id': fields.many2one('account.tax.code', 'Base Code', help="Use this code for the VAT declaration."), - 'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="Use this code for the VAT declaration."), + 'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the VAT declaration."), + 'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the VAT declaration."), 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), @@ -2196,6 +2195,7 @@ class account_add_tmpl_wizard(osv.osv_memory): def _get_def_cparent(self, cr, uid, context): acc_obj=self.pool.get('account.account') tmpl_obj=self.pool.get('account.account.template') + #print "Searching for ",context tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id']) if not tids or not tids[0]['parent_id']: return False @@ -2237,6 +2237,7 @@ class account_add_tmpl_wizard(osv.osv_memory): # 'tax_ids': [(6,0,tax_ids)], todo!! 'company_id': company_id, } + # print "Creating:", vals new_account = acc_obj.create(cr, uid, vals) return {'type':'state', 'state': 'end' } @@ -2257,7 +2258,7 @@ class account_tax_code_template(osv.osv): 'info': fields.text('Description'), 'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True), 'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'), - 'sign': fields.float('Sign for parent', required=True, help="Choose 1.00 to add the total to the parent account or -1.00 to subtract it"), + 'sign': fields.float('Sign for parent', required=True), 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"), } @@ -2289,7 +2290,7 @@ class account_chart_template(osv.osv): _columns={ 'name': fields.char('Name', size=64, required=True), - 'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)], help=""), + 'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)]), 'tax_code_root_id': fields.many2one('account.tax.code.template','Root Tax Code',required=True,domain=[('parent_id','=',False)]), 'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'), 'bank_account_view_id': fields.many2one('account.account.template','Bank Account',required=True), diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 2cd1b4d17bd..c1c6e3f854b 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -96,7 +96,7 @@ class account_analytic_line(osv.osv): # Take the company currency as the reference one context['currency_id']=company_obj.browse(cr, uid, company_id).currency_id.id amount_unit=prod.price_get(pricetype.field, context)[prod.id] - amount=amount_unit*unit_amount or 1.0 + amount = amount_unit*unit_amount or 1.0 return {'value': { 'amount': - round(amount, 2), 'general_account_id': a, diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index a29f32105a5..d3dd4f1ee78 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -20,6 +20,7 @@ ############################################################################## import time from datetime import datetime + import netsvc from osv import fields, osv from tools.translate import _ @@ -35,8 +36,10 @@ class account_move_line(osv.osv): fiscalperiod_obj = self.pool.get('account.period') fiscalyear_ids = [] fiscalperiod_ids = [] - if not context.get('fiscalyear', False): + if not context.get('fiscalyear', False) and not context.get('empty_fy_allow', False): fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')]) + elif context.get('empty_fy_allow', False): + fiscalyear_ids = context['fiscalyear'] else: fiscalyear_ids = [context['fiscalyear']] @@ -53,13 +56,19 @@ class account_move_line(osv.osv): if state.lower() not in ['all']: where_move_state= " AND "+obj+".move_id in (select id from account_move where account_move.state = '"+state+"')" - if context.get('periods', False): ids = ','.join([str(x) for x in context['periods']]) - query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s %s" % (fiscalyear_clause, ids,where_move_state,where_move_lines_by_date) + query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s %s" % (fiscalyear_clause, ids, where_move_state, where_move_lines_by_date) else: query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s %s)" % (fiscalyear_clause,where_move_state,where_move_lines_by_date) + if context.get('journal_ids', False): + query += ' AND '+obj+'.journal_id in (%s)' % ','.join(map(str, context['journal_ids'])) + + if context.get('chart_account_id', False): + child_ids = self.pool.get('account.account')._get_children_and_consol(cr, uid, [context['chart_account_id']], context=context) + query += ' AND '+obj+'.account_id in (%s)' % ','.join(map(str, child_ids)) + if context.get('period_manner','') == 'created': #the query have to be build with no reference to periods but thanks to the creation date if context.get('periods',False): @@ -452,7 +461,7 @@ class account_move_line(osv.osv): context=context) dt = period.date_start return dt - + def _get_currency(self, cr, uid, context={}): if not context.get('journal_id', False): return False @@ -506,7 +515,7 @@ class account_move_line(osv.osv): _constraints = [ (_check_no_view, 'You can not create move line on view account.', ['account_id']), (_check_no_closed, 'You can not create move line on closed account.', ['account_id']), - (_check_company_id, 'Company must be same for its related account and period.', ['company_id']), + (_check_company_id,'Company must be same for its related account and period.',['company_id'] ), ] #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id @@ -677,7 +686,7 @@ class account_move_line(osv.osv): account_id = line['account_id']['id'] partner_id = (line['partner_id'] and line['partner_id']['id']) or False writeoff = debit - credit - + # Ifdate_p in context => take this date if context.has_key('date_p') and context['date_p']: date=context['date_p'] @@ -815,7 +824,7 @@ class account_move_line(osv.osv): # } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False): - result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu) + result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu) if view_type != 'tree': return result @@ -1111,7 +1120,7 @@ class account_move_line(osv.osv): #if not 'currency_id' in vals: # vals['currency_id'] = account.company_id.currency_id.id - + result = super(osv.osv, self).create(cr, uid, vals, context) # CREATE Taxes if vals.get('account_tax_id', False): diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index 8b4aa147a95..8e26ee8553b 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -1,14 +1,14 @@ - - - + + + - - - - + + + + --> - - - - @@ -103,21 +98,6 @@ - - - - - - - diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index d0a2eb78404..f28e08c3191 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -1,8 +1,6 @@ - - @@ -363,7 +361,7 @@ Bank Journal - (test) BNK - cash + bank @@ -373,6 +371,16 @@ Checks Journal - (test) CHK + bank + + + + + + + + Cash Journal - (test) + CHK cash diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po index aa04a287cab..bd0c612ea95 100644 --- a/addons/account/i18n/bs.po +++ b/addons/account/i18n/bs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:01+0000\n" -"Last-Translator: Bojan Markovic \n" +"PO-Revision-Date: 2010-08-03 11:13+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:39+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po index 4a6e773ce91..a1c02761d4d 100644 --- a/addons/account/i18n/ca.po +++ b/addons/account/i18n/ca.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 18:10+0000\n" +"PO-Revision-Date: 2010-08-03 11:28+0000\n" "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " "\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 6accfe23750..8175ed9c6ce 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 18:12+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-03 11:36+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index f94de679a79..925d3622b5e 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 18:14+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-03 10:49+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 500a41160aa..7f3f9df3325 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 18:17+0000\n" -"Last-Translator: Ferdinand-chricar \n" +"PO-Revision-Date: 2010-08-03 11:20+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index bfd326a4d8c..2f512f64bf5 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 14:43+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-03 10:34+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:41+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index b3f16f609a4..629155c2530 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 19:52+0000\n" +"PO-Revision-Date: 2010-08-03 10:51+0000\n" "Last-Translator: eLBati - albatos.com \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:41+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po index 9879be9d1da..678e1537ac1 100644 --- a/addons/account/i18n/lt.po +++ b/addons/account/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 19:59+0000\n" +"PO-Revision-Date: 2010-08-03 12:38+0000\n" "Last-Translator: Giedrius Slavinskas \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:41+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 52c8139568e..920ffbff1bf 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:08+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-03 12:26+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:41+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1577,7 +1577,7 @@ msgstr "Zestawienia dla urzędu" #: field:account.tax.code,parent_id:0 #: field:account.tax.code.template,parent_id:0 msgid "Parent Code" -msgstr "Kod nadrzędny" +msgstr "Rejestr nadrzędny" #. module: account #: wizard_button:account.move.line.reconcile.select,init,open:0 diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po index 145c7b67397..7da3720eb98 100644 --- a/addons/account/i18n/sl.po +++ b/addons/account/i18n/sl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:17+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-03 11:07+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po index de83a4da270..ce9428e8299 100644 --- a/addons/account/i18n/sq.po +++ b/addons/account/i18n/sq.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: ASTRIT BOKSHI \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:17+0000\n" +"PO-Revision-Date: 2010-08-03 12:01+0000\n" "Last-Translator: bokshas \n" "Language-Team: Albanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:39+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 4bc3069fadd..8b4e9fef082 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:21+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-03 10:37+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: <> <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po index 99ca9fde003..6979035ce3a 100644 --- a/addons/account/i18n/th.po +++ b/addons/account/i18n/th.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 36597cf1857..9b5b6372ded 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:50+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-08-03 13:00+0000\n" +"Last-Translator: Omer Barlas \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -168,11 +168,14 @@ msgid "" "positive, it gives the day of the next month. Set 0 for net days (otherwise " "it's based on the beginning of the month)." msgstr "" +"Ayın günü, bulunduğumuz ayın son günü için -1 girin. Eğer pozitif bir değer " +"girilir ise bir sonraki ayın gününü verir. Net günler için 0 girin (aksi " +"takdirde ayın başına göre hesaplanır)." #. module: account #: view:account.move:0 msgid "Total Credit" -msgstr "Toplam alacak" +msgstr "Toplam Alacak" #. module: account #: field:account.config.wizard,charts:0 @@ -252,7 +255,7 @@ msgstr "Tedarikçi vergileri" #. module: account #: view:account.move:0 msgid "Total Debit" -msgstr "Toplam borç" +msgstr "Toplam Borç" #. module: account #: rml:account.tax.code.entries:0 diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po index 42b58179c12..fd3c469684c 100644 --- a/addons/account/i18n/ug.po +++ b/addons/account/i18n/ug.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po index 04e81fab7a9..fc061532397 100644 --- a/addons/account/i18n/uk.po +++ b/addons/account/i18n/uk.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index 9ee664a23cf..973951261c9 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 127ae1a219f..9ff9fca151a 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:22+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-03 12:10+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -24,7 +24,7 @@ msgstr "内部名称" #. module: account #: view:account.tax.code:0 msgid "Account Tax Code" -msgstr "税务科目" +msgstr "税事务科目" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree9 @@ -35,17 +35,17 @@ msgstr "未支付的采购发票" #. module: account #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Entries Encoding" -msgstr "分录录入" +msgstr "分录" #. module: account #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form msgid "Specify The Message for the Overdue Payment Report." -msgstr "设置过期支付的催款信息" +msgstr "" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement from draft" -msgstr "从草稿记账银行凭证" +msgstr "从银行单据生成记账凭证" #. module: account #: model:account.account.type,name:account.account_type_asset @@ -55,7 +55,7 @@ msgstr "资产" #. module: account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "在动作定义使用了无效的模式名称。" +msgstr "在行动定义中的模式名称无效" #. module: account #: help:account.journal,currency:0 @@ -87,7 +87,7 @@ msgstr "对账结果" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled msgid "Unreconciled entries" -msgstr "未对账分录" +msgstr "未对账" #. module: account #: field:account.invoice.tax,base_code_id:0 @@ -128,13 +128,13 @@ msgstr "剩余的" #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" -msgstr "基于的税务的符号" +msgstr "基础税事务符号" #. module: account #: model:ir.actions.wizard,name:account.wizard_unreconcile_select #: model:ir.ui.menu,name:account.menu_unreconcile_select msgid "Unreconcile entries" -msgstr "取消核销" +msgstr "未对账" #. module: account #: constraint:account.period:0 @@ -149,7 +149,7 @@ msgstr "错误!这会计期间无效 " #: model:ir.actions.act_window,name:account.action_move_line_form #: model:ir.ui.menu,name:account.menu_action_move_line_form msgid "Entries" -msgstr "记录" +msgstr "分录" #. module: account #: selection:account.move.line,centralisation:0 @@ -190,7 +190,7 @@ msgstr "选择凭证行" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Entry label" -msgstr "标签" +msgstr "分录标签" #. module: account #: model:ir.model,name:account.model_account_model_line @@ -212,12 +212,12 @@ msgstr "计算代码(如果类型=代码)" #: view:account.move:0 #: view:account.move.line:0 msgid "Account Entry Line" -msgstr "明细" +msgstr "凭证明细" #. module: account #: wizard_view:account.aged.trial.balance,init:0 msgid "Aged Trial Balance" -msgstr "旧的试算表" +msgstr "账龄试算平衡表" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries @@ -242,7 +242,7 @@ msgstr "金额" #: model:ir.actions.wizard,name:account.wizard_third_party_ledger #: model:ir.ui.menu,name:account.menu_third_party_ledger msgid "Partner Ledger" -msgstr "业务伙伴分类账" +msgstr "业务伙伴总帐" #. module: account #: field:product.template,supplier_taxes_id:0 @@ -312,7 +312,7 @@ msgstr "来源" #. module: account #: rml:account.analytic.account.journal:0 msgid "Move Name" -msgstr "凭证名称" +msgstr "" #. module: account #: xsl:account.transfer:0 @@ -380,7 +380,7 @@ msgstr "错误! 你不能创建递归的辅助核算项" #. module: account #: field:account.bank.statement.reconcile,total_entry:0 msgid "Total entries" -msgstr "合计" +msgstr "分录合计" #. module: account #: field:account.fiscal.position.account,account_src_id:0 @@ -391,7 +391,7 @@ msgstr "源科目" #. module: account #: field:account.journal,update_posted:0 msgid "Allow Cancelling Entries" -msgstr "允许取消" +msgstr "允许取消分录" #. module: account #: model:process.transition,name:account.process_transition_paymentorderbank0 @@ -407,7 +407,7 @@ msgstr "费用记录集合" #. module: account #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal msgid "All Analytic Entries" -msgstr "所有辅助核算" +msgstr "所有辅助核算分录" #. module: account #: rml:account.overdue:0 @@ -422,7 +422,7 @@ msgstr "负数" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "(业务伙伴/科目)名称" +msgstr "" #. module: account #: selection:account.move,type:0 @@ -443,7 +443,7 @@ msgstr "状态" #: model:ir.actions.act_window,name:account.action_invoice_tree13 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13 msgid "Unpaid Supplier Refunds" -msgstr "未支付的供应商退还" +msgstr "未支付的供应商退款" #. module: account #: view:account.tax:0 @@ -461,12 +461,12 @@ msgstr "从草稿记账与对/不对帐" #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree msgid "Bank reconciliation" -msgstr "银行对帐单" +msgstr "银行对账" #. module: account #: rml:account.invoice:0 msgid "Disc.(%)" -msgstr "折扣(%)" +msgstr "" #. module: account #: rml:account.general.ledger:0 @@ -497,7 +497,7 @@ msgstr "定期处理" #. module: account #: view:report.hr.timesheet.invoice.journal:0 msgid "Analytic Entries Stats" -msgstr "辅助核算统计" +msgstr "辅助核算分录统计" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form @@ -514,7 +514,7 @@ msgstr "供应商发票" #: model:process.transition,name:account.process_transition_reconcilepaid0 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "Reconcile Paid" -msgstr "核销已付的" +msgstr "对账支付" #. module: account #: wizard_field:account.chart,init,target_move:0 @@ -530,7 +530,7 @@ msgstr "税模板" #. module: account #: field:account.invoice,reconciled:0 msgid "Paid/Reconciled" -msgstr "已付/ 核销" +msgstr "支付/对账" #. module: account #: field:account.account.type,close_method:0 @@ -540,13 +540,13 @@ msgstr "递延方法" #. module: account #: field:account.tax.template,include_base_amount:0 msgid "Include in Base Amount" -msgstr "包含在基本金额里" +msgstr "包含在基础金额里" #. module: account #: field:account.tax,ref_base_code_id:0 #: field:account.tax.template,ref_base_code_id:0 msgid "Refund Base Code" -msgstr "退还基于的税务" +msgstr "退税事务代码" #. module: account #: view:account.invoice.line:0 @@ -595,7 +595,7 @@ msgstr "账龄分析表" #. module: account #: view:account.journal:0 msgid "Entry Controls" -msgstr "控制" +msgstr "分录控制" #. module: account #: help:account.model.line,sequence:0 @@ -629,12 +629,12 @@ msgstr "业务伙伴付款条款" #. module: account #: view:account.move.reconcile:0 msgid "Account Entry Reconcile" -msgstr "分录核销" +msgstr "分录对账" #. module: account #: wizard_button:account.move.bank.reconcile,init,open:0 msgid "Open for bank reconciliation" -msgstr "打开银行对账" +msgstr "开始银行对账" #. module: account #: field:account.invoice.line,discount:0 @@ -668,7 +668,7 @@ msgstr "小计 :" #: model:ir.actions.act_window,name:account.action_account_analytic_line_form #: model:ir.ui.menu,name:account.next_id_41 msgid "Analytic Entries" -msgstr "辅助核算记录" +msgstr "辅助核算分录" #. module: account #: selection:account.subscription,period_type:0 @@ -678,7 +678,7 @@ msgstr "月" #. module: account #: field:account.analytic.account,partner_id:0 msgid "Associated Partner" -msgstr "相关的业务伙伴" +msgstr "相关业务伙伴" #. module: account #: field:account.invoice,comment:0 @@ -688,7 +688,7 @@ msgstr "附加信息" #. module: account #: selection:account.invoice,type:0 msgid "Customer Refund" -msgstr "客户退还" +msgstr "客户退款" #. module: account #: wizard_view:account.analytic.account.chart,init:0 @@ -701,7 +701,7 @@ msgstr "选择辅助核算的会计期间" #: field:account.tax.template,ref_tax_sign:0 #: field:account.tax.template,tax_sign:0 msgid "Tax Code Sign" -msgstr "税务的符号(1为正数)" +msgstr "税事务的符号(1为正数)" #. module: account #: help:res.partner,credit:0 @@ -784,7 +784,7 @@ msgstr "业务伙伴科目" #. module: account #: wizard_view:account.subscription.generate,init:0 msgid "Generate entries before:" -msgstr "之前生成的记录:" +msgstr "之前生成的分录:" #. module: account #: rml:account.analytic.account.cost_ledger:0 @@ -792,7 +792,7 @@ msgstr "之前生成的记录:" #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report msgid "Cost Ledger" -msgstr "成本分类账" +msgstr "成本分类帐" #. module: account #: wizard_view:account.account.balance.report,checktype:0 @@ -938,7 +938,7 @@ msgstr "结束日期" #. module: account #: field:account.invoice.tax,base_amount:0 msgid "Base Code Amount" -msgstr "基于的税务的金额" +msgstr "基础税事务代码的金额" #. module: account #: help:account.journal,user_id:0 @@ -1092,7 +1092,7 @@ msgstr "含税价计算代码" #: model:ir.actions.act_window,name:account.action_tax_code_list #: model:ir.ui.menu,name:account.menu_action_tax_code_list msgid "Tax codes" -msgstr "税务" +msgstr "税事务" #. module: account #: field:account.fiscal.position.template,chart_template_id:0 @@ -1110,7 +1110,7 @@ msgstr "收入类科目" #: model:ir.actions.act_window,name:account.analytic_account_form #: model:ir.ui.menu,name:account.account_analytic_form msgid "New Analytic Account" -msgstr "新辅助核算项" +msgstr "新的分析科目" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form @@ -1127,7 +1127,7 @@ msgstr "单价" #. module: account #: rml:account.analytic.account.journal:0 msgid "Period from :" -msgstr "会计期间从:" +msgstr "" #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts @@ -1179,7 +1179,7 @@ msgstr "银行收据" #. module: account #: view:res.partner:0 msgid "Bank account" -msgstr "银行帐号" +msgstr "银行账号" #. module: account #: field:account.chart.template,tax_template_ids:0 @@ -1194,7 +1194,7 @@ msgstr "进项发票" #. module: account #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select msgid "Standard entry" -msgstr "普通的" +msgstr "普通分录" #. module: account #: help:account.account,currency_mode:0 @@ -1225,7 +1225,7 @@ msgstr "上级辅助核算项目" #. module: account #: wizard_button:account.move.line.reconcile,init_partial,addendum:0 msgid "Reconcile With Write-Off" -msgstr "核销用补差额" +msgstr "补差额时对账" #. module: account #: field:account.move.line,tax_amount:0 @@ -1271,7 +1271,7 @@ msgstr "部分核销单号" #. module: account #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0 msgid "Not reconciled transactions" -msgstr "还未核销的交易" +msgstr "没对账的交易" #. module: account #: view:account.fiscal.position:0 @@ -1316,7 +1316,7 @@ msgstr "汇总副本" #. module: account #: view:wizard.company.setup:0 msgid "Message" -msgstr "信息" +msgstr "" #. module: account #: model:process.node,note:account.process_node_supplierpaymentorder0 @@ -1363,7 +1363,7 @@ msgstr "记账分录" msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disable" -msgstr "如果取消交易的核销, 你必须检验链接该交易的所有操作. 因为他们不会被禁止." +msgstr "如果进行未对账交易, 你必须检验交易的所有操作. 因为他们不会被禁止." #. module: account #: model:process.node,name:account.process_node_electronicfile0 @@ -1476,7 +1476,7 @@ msgstr "关闭状态" #. module: account #: model:ir.model,name:account.model_wizard_company_setup msgid "wizard.company.setup" -msgstr "向导.公司.设置" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form @@ -1506,7 +1506,7 @@ msgstr "电话:" #. module: account #: field:account.invoice.tax,tax_amount:0 msgid "Tax Code Amount" -msgstr "税务的金额" +msgstr "税事务金额" #. module: account #: selection:account.account.type,sign:0 @@ -1518,7 +1518,7 @@ msgstr "正数" #: model:ir.actions.wizard,name:account.wizard_general_journal #: model:ir.ui.menu,name:account.menu_general_journal msgid "Print General Journal" -msgstr "打印普通记录集合" +msgstr "打印普通日记帐" #. module: account #: model:ir.actions.act_window,name:account.action_account_chart_template_form @@ -1579,7 +1579,7 @@ msgstr "留空为使用费用科目" #. module: account #: wizard_field:account.automatic.reconcile,init,account_ids:0 msgid "Account to reconcile" -msgstr "科目核销" +msgstr "科目进行对账" #. module: account #: rml:account.invoice:0 @@ -1660,7 +1660,7 @@ msgstr "最大数量:" #. module: account #: wizard_button:account.invoice.refund,init,refund:0 msgid "Refund Invoice" -msgstr "退还发票" +msgstr "退款发票" #. module: account #: model:ir.actions.act_window,name:account.action_account_period_tree @@ -1707,7 +1707,7 @@ msgstr "重开" #. module: account #: wizard_view:account.fiscalyear.close,init:0 msgid "Are you sure you want to create entries?" -msgstr "你确定创建?" +msgstr "你确定创建分录?" #. module: account #: field:account.tax,include_base_amount:0 @@ -1723,7 +1723,7 @@ msgstr "第三贷方" #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile #: model:ir.actions.wizard,name:account.wizard_unreconcile msgid "Unreconcile Entries" -msgstr "取消核销" +msgstr "未对账分录" #. module: account #: model:process.node,note:account.process_node_supplierdraftinvoices0 @@ -1751,7 +1751,7 @@ msgstr "从" #: model:process.node,note:account.process_node_reconciliation0 #: model:process.node,note:account.process_node_supplierreconciliation0 msgid "Reconciliation of entries from invoice(s) and payment(s)" -msgstr "发票和付款的对账" +msgstr "发票和付款的对账分录" #. module: account #: wizard_view:account.central.journal.report,init:0 @@ -1811,7 +1811,7 @@ msgstr "科目管理员" #. module: account #: rml:account.analytic.account.journal:0 msgid "to :" -msgstr "到:" +msgstr "" #. module: account #: wizard_field:account.move.line.reconcile,init_full,debit:0 @@ -1876,7 +1876,7 @@ msgstr "未完税金额" #: field:account.tax,account_collected_id:0 #: field:account.tax.template,account_collected_id:0 msgid "Invoice Tax Account" -msgstr "开票的税科目" +msgstr "发票税科目" #. module: account #: view:account.move.line:0 @@ -1988,7 +1988,7 @@ msgstr "辅助核算业务类型报表" #: model:ir.actions.act_window,name:account.action_invoice_tree3 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3 msgid "Customer Refunds" -msgstr "客户退还" +msgstr "客户退款" #. module: account #: rml:account.vat.declaration:0 @@ -2066,7 +2066,7 @@ msgstr "客户发票处理" #. module: account #: rml:account.invoice:0 msgid "Fiscal Position Remark :" -msgstr "财务结构备注:" +msgstr "" #. module: account #: wizard_field:account.fiscalyear.close,init,period_id:0 @@ -2112,7 +2112,7 @@ msgstr "未支付的发票" #. module: account #: model:process.transition,name:account.process_transition_paymentreconcile0 msgid "Payment Reconcile" -msgstr "付款核销" +msgstr "付款对账" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form @@ -2134,13 +2134,13 @@ msgstr "计算" #. module: account #: view:account.analytic.line:0 msgid "Analytic Entry" -msgstr "辅助核算记录" +msgstr "辅助核算分录" #. module: account #: view:res.company:0 #: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" -msgstr "逾期付款信息" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_tax_code_tree @@ -2156,7 +2156,7 @@ msgstr "金额" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open msgid "Reconciled entries" -msgstr "已核销记录" +msgstr "对账分录" #. module: account #: field:account.invoice,address_contact_id:0 @@ -2311,7 +2311,7 @@ msgstr "参考类型" #: wizard_button:account.move.line.unreconcile,init,unrec:0 #: wizard_button:account.reconcile.unreconcile,init,unrec:0 msgid "Unreconcile" -msgstr "取消核销" +msgstr "未对账" #. module: account #: field:account.tax,type:0 @@ -2322,7 +2322,7 @@ msgstr "税类型" #. module: account #: model:process.transition,name:account.process_transition_statemententries0 msgid "Statement Entries" -msgstr "对帐单" +msgstr "项" #. module: account #: field:account.analytic.line,user_id:0 @@ -2418,7 +2418,7 @@ msgstr "结束日期" #: model:ir.actions.act_window,name:account.action_move_line_tree1 #: model:ir.ui.menu,name:account.menu_action_move_line_search msgid "Entry Lines" -msgstr "明细" +msgstr "分录明细" #. module: account #: view:account.tax:0 @@ -2434,7 +2434,7 @@ msgstr "打开业务类型" #. module: account #: rml:account.analytic.account.journal:0 msgid "KI" -msgstr "KI" +msgstr "" #. module: account #: model:ir.actions.wizard,name:account.action_account_analytic_line @@ -2472,7 +2472,7 @@ msgstr "附加信息" #: model:process.transition,name:account.process_transition_entriesreconcile0 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0 msgid "Entries Reconcile" -msgstr "核销" +msgstr "分录对账" #. module: account #: help:account.bank.statement.reconcile,total_second_amount:0 @@ -2602,7 +2602,7 @@ msgstr "付款单" #: help:account.account.template,reconcile:0 msgid "" "Check this option if you want the user to reconcile entries in this account." -msgstr "勾选此项, 如果你想用户在这科目核销." +msgstr "勾选此项, 如果你想用户在这科目对账分录." #. module: account #: rml:account.analytic.account.journal:0 @@ -2625,12 +2625,12 @@ msgstr "权益" #. module: account #: field:wizard.company.setup,overdue_msg:0 msgid "Overdue Payment Message" -msgstr "逾期付款信息" +msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax_code_template msgid "Tax Code Template" -msgstr "税务模板" +msgstr "税事务模板" #. module: account #: rml:account.partner.balance:0 @@ -2656,7 +2656,7 @@ msgstr "结束会计年度处理" #. module: account #: model:ir.ui.menu,name:account.menu_generic_report msgid "Generic Reports" -msgstr "通用报表" +msgstr "" #. module: account #: wizard_field:account.automatic.reconcile,init,power:0 @@ -2671,7 +2671,7 @@ msgstr "辅助核算明细分析" #. module: account #: rml:account.invoice:0 msgid "Price" -msgstr "价格" +msgstr "" #. module: account #: rml:account.analytic.account.journal:0 @@ -2683,7 +2683,7 @@ msgstr "-" #. module: account #: rml:account.analytic.account.journal:0 msgid "asgfas" -msgstr "asgfas" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2 @@ -2842,7 +2842,7 @@ msgstr "新的客户发票" #: wizard_button:account.move.line.reconcile,addendum,reconcile:0 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0 msgid "Reconcile" -msgstr "核销" +msgstr "对账" #. module: account #: rml:account.overdue:0 @@ -2857,7 +2857,7 @@ msgstr "辅助核算项目成本和收入" #. module: account #: wizard_view:account.invoice.refund,init:0 msgid "Are you sure you want to refund this invoice ?" -msgstr "你确定要退还该发票?" +msgstr "你确定要对此发票退款吗?" #. module: account #: model:ir.actions.wizard,name:account.wizard_paid_open @@ -2867,7 +2867,7 @@ msgstr "待处理状态" #. module: account #: field:account.journal,entry_posted:0 msgid "Skip 'Draft' State for Created Entries" -msgstr "跳过'草稿'状态创建" +msgstr "跳过'草稿'状态创建分录" #. module: account #: field:account.invoice.tax,account_id:0 @@ -2903,7 +2903,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm" #: model:ir.actions.act_window,name:account.action_invoice_tree12 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12 msgid "Draft Supplier Refunds" -msgstr "供应商退还草稿" +msgstr "供应商退款草稿" #. module: account #: model:process.node,name:account.process_node_accountingstatemententries0 @@ -2931,20 +2931,20 @@ msgstr "税一览" #: wizard_view:account.move.line.unreconcile,init:0 #: wizard_view:account.reconcile.unreconcile,init:0 msgid "Unreconciliation transactions" -msgstr "取消对账交易" +msgstr "未对账交易" #. module: account #: model:process.transition,note:account.process_transition_paymentorderbank0 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0 msgid "Reconcilation of entries from payment order." -msgstr "付款单的核销记录" +msgstr "付款单的对账分录" #. module: account #: field:account.bank.statement,move_line_ids:0 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line #: model:ir.model,name:account.model_account_move_line msgid "Entry lines" -msgstr "明细" +msgstr "分录明细" #. module: account #: wizard_view:account.automatic.reconcile,init:0 @@ -2969,7 +2969,7 @@ msgstr "汇总" #: field:account.tax.template,tax_code_id:0 #: model:ir.model,name:account.model_account_tax_code msgid "Tax Code" -msgstr "税务" +msgstr "税事务" #. module: account #: rml:account.analytic.account.journal:0 @@ -3003,7 +3003,7 @@ msgid "" "The maturity date of the generated entries for this model. You can chosse " "between the date of the creation action or the the date of the creation of " "the entries plus the partner payment terms." -msgstr "模型在付款到期日产生的记录. 你能从创建日期到到付款期限间选择." +msgstr "这模型在付款到期日产生分录. 你能从创建日期到到付款期限间选择." #. module: account #: selection:account.analytic.journal,type:0 @@ -3020,7 +3020,7 @@ msgstr "单据" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "凭证明细" +msgstr "凭证明细变动" #. module: account #: field:account.invoice.line,uos_id:0 @@ -3030,7 +3030,7 @@ msgstr "计量单位" #. module: account #: field:account.chart.template,property_account_receivable:0 msgid "Receivable Account" -msgstr "应收款科目" +msgstr "" #. module: account #: help:account.journal,group_invoice_lines:0 @@ -3043,7 +3043,7 @@ msgstr "如果勾选此项, 系统将试图在从发票生成分录明细时分 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0 #: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0 msgid "# of Transaction" -msgstr "# 交易" +msgstr "" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel @@ -3062,12 +3062,12 @@ msgstr "辅助核算业务类型" #. module: account #: rml:account.general.ledger:0 msgid "Entry Label" -msgstr "标签" +msgstr "分录标签" #. module: account #: model:process.transition,note:account.process_transition_paymentreconcile0 msgid "Reconcilate the entries from payment" -msgstr "从付款记录核销" +msgstr "付款的对账分录" #. module: account #: rml:account.tax.code.entries:0 @@ -3186,7 +3186,7 @@ msgstr "备注" msgid "" "The account moves of the invoice have been reconciled with account moves of " "the payment(s)." -msgstr "发票凭证与付款凭证核销." +msgstr "发票凭证与付款凭证对账." #. module: account #: rml:account.invoice:0 @@ -3254,12 +3254,12 @@ msgstr "产生会计年度开账分录" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile msgid "Reconcile Entries" -msgstr "核销记录" +msgstr "对账分录" #. module: account #: wizard_view:account.wizard_paid_open,init:0 msgid "(Invoice should be unreconciled if you want to open it)" -msgstr "(如果你想打开它, 发票应取消核销)" +msgstr "(如果你想打开它发票应未对账)" #. module: account #: view:account.invoice:0 @@ -3286,7 +3286,7 @@ msgstr "每月30天" #. module: account #: field:account.chart.template,tax_code_root_id:0 msgid "Root Tax Code" -msgstr "税务的根" +msgstr "税事务的根" #. module: account #: constraint:account.invoice:0 @@ -3389,7 +3389,7 @@ msgstr "如果默认税是业务伙伴只覆盖, 税款科目(或产品)在同 #. module: account #: view:account.bank.statement:0 msgid "Real Entries" -msgstr "实际记录" +msgstr "实际分录" #. module: account #: model:process.node,name:account.process_node_importinvoice0 @@ -3406,7 +3406,7 @@ msgstr "创建" #. module: account #: model:process.transition.action,name:account.process_transition_action_createentries0 msgid "Create entry" -msgstr "创建" +msgstr "创建分录" #. module: account #: model:ir.model,name:account.model_account_invoice_line @@ -3437,7 +3437,7 @@ msgstr "日期中的一天" msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." -msgstr "如果它是一个多货币记录这金额表示一个可选的的其它货币" +msgstr "如果它是一个多货币分录这金额表示一个可选的的其它货币" #. module: account #: field:account.tax,parent_id:0 @@ -3475,7 +3475,7 @@ msgstr "应收账" #. module: account #: wizard_button:account.invoice.pay,addendum,reconcile:0 msgid "Pay and reconcile" -msgstr "支付和核销" +msgstr "支付和对账" #. module: account #: rml:account.central.journal:0 @@ -3533,12 +3533,12 @@ msgstr "已打印" #: model:ir.actions.act_window,name:account.action_invoice_tree4_new #: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new msgid "New Supplier Refund" -msgstr "新的供应商退还" +msgstr "新的供应商退款" #. module: account #: view:account.model:0 msgid "Entry Model" -msgstr "模型" +msgstr "分录模型" #. module: account #: wizard_field:account.general.ledger.report,checktype,amount_currency:0 @@ -3638,7 +3638,7 @@ msgstr "财务结构模板" #. module: account #: view:account.bank.statement:0 msgid "Entry encoding" -msgstr "记录" +msgstr "明细" #. module: account #: wizard_view:account.invoice.refund,init:0 @@ -3664,14 +3664,14 @@ msgstr "季度" #. module: account #: wizard_view:account.move.journal,init:0 msgid "Standard entries" -msgstr "普通的" +msgstr "普通分录" #. module: account #: help:account.account,check_history:0 msgid "" "Check this box if you want to print all entries when printing the General " "Ledger, otherwise it will only print its balance." -msgstr "如果你想打印总账时打印所有, 勾选此项. 否则打印它的余额" +msgstr "如果你想打印总账时打印所有分录, 勾选此项. 否则打印它的余额" #. module: account #: model:ir.model,name:account.model_account_payment_term_line @@ -3727,7 +3727,7 @@ msgstr "选择一览表" #: selection:account.chart,init,target_move:0 #: model:ir.actions.report.xml,name:account.account_move_line_list msgid "All Entries" -msgstr "所有" +msgstr "所有分录" #. module: account #: model:process.node,name:account.process_node_draftinvoices0 @@ -3748,7 +3748,7 @@ msgstr "发票日期" #. module: account #: selection:account.account.type,close_method:0 msgid "Unreconciled" -msgstr "取消核销" +msgstr "未对账" #. module: account #: field:account.account,note:0 @@ -3782,7 +3782,7 @@ msgstr "" #. module: account #: field:account.journal,sequence_id:0 msgid "Entry Sequence" -msgstr "序列" +msgstr "分录序列" #. module: account #: selection:account.account,type:0 @@ -3798,20 +3798,20 @@ msgstr "付款分录" #. module: account #: help:account.move.line,tax_code_id:0 msgid "The Account can either be a base tax code or tax code account." -msgstr "可以选基于的税务或税务的科目" +msgstr "可以选基础税事务或税事务科目" #. module: account #: help:account.automatic.reconcile,init,account_ids:0 msgid "" "If no account is specified, the reconciliation will be made using every " "accounts that can be reconcilied" -msgstr "如果没有指定科目,对账将可用任何一个能核销的科目" +msgstr "如果没有指定科目,对账将可用任何一个能对账的科目" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form #: view:wizard.company.setup:0 msgid "Overdue Payment Report Message" -msgstr "逾期付款打印信息" +msgstr "" #. module: account #: selection:account.tax,tax_group:0 @@ -3935,7 +3935,7 @@ msgstr "客户会计属性" #. module: account #: view:account.bank.statement:0 msgid "Select entries" -msgstr "选择记录" +msgstr "选择分录" #. module: account #: selection:account.chart,init,target_move:0 @@ -3994,7 +3994,7 @@ msgstr "如果税计算是基于计算子税或基于总金额, 显示" #: field:account.tax,account_paid_id:0 #: field:account.tax.template,account_paid_id:0 msgid "Refund Tax Account" -msgstr "退还的税科目" +msgstr "退税科目" #. module: account #: field:account.tax.code,child_ids:0 @@ -4043,14 +4043,14 @@ msgstr "此行的可选数量表示: 售出产品数量. 这数量虽然不是 #. module: account #: wizard_field:account.third_party_ledger.report,init,reconcil:0 msgid " Include Reconciled Entries" -msgstr " 包括已核销记录" +msgstr " 包括已对账分录" #. module: account #: help:account.move.line,blocked:0 msgid "" "You can check this box to mark the entry line as a litigation with the " "associated partner" -msgstr "你能勾选此项去标记与有关业务伙伴的记录明细存在争议" +msgstr "你能勾选此项去标记与有关业务伙伴的分录明细存在争议" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree1 @@ -4202,7 +4202,7 @@ msgstr "这序列提供业务类型列表的显示顺序" #. module: account #: field:account.journal,type_control_ids:0 msgid "Type Controls" -msgstr "控制类型" +msgstr "类型控制" #. module: account #: field:account.analytic.account,name:0 @@ -4391,7 +4391,7 @@ msgstr "会计年度序列" #. module: account #: view:account.model.line:0 msgid "Entry Model Line" -msgstr "模型明细" +msgstr "分录模型明细" #. module: account #: view:account.tax.template:0 @@ -4401,7 +4401,7 @@ msgstr "税模板" #. module: account #: help:account.model,name:0 msgid "This is a model for recurring accounting entries" -msgstr "这是一个周期性的分录模型" +msgstr "这是一个循环分录模型" #. module: account #: wizard_view:account.wizard_paid_open,init:0 @@ -4421,7 +4421,7 @@ msgstr "你确定要打开这发票?" #. module: account #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other msgid "Partner Other Ledger" -msgstr "业务伙伴其它分类帐" +msgstr "" #. module: account #: view:res.partner:0 @@ -4486,20 +4486,20 @@ msgstr "合计" #: model:process.transition,note:account.process_transition_customerinvoice0 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0 msgid "Number of entries are generated" -msgstr "产生号码" +msgstr "产生编号" #. module: account #: model:process.transition,name:account.process_transition_suppliervalidentries0 #: model:process.transition,name:account.process_transition_validentries0 msgid "Valid Entries" -msgstr "有效记录" +msgstr "有效分录" #. module: account #: model:ir.actions.wizard,name:account.wizard_account_use_model #: model:ir.actions.wizard,name:account.wizard_line_account_use_model #: model:ir.ui.menu,name:account.menu_account_use_model msgid "Create Entries From Models" -msgstr "按模型创建" +msgstr "按模型创建分录" #. module: account #: field:account.account.template,reconcile:0 @@ -4518,12 +4518,12 @@ msgstr "按日期" #: model:ir.actions.act_window,name:account.action_invoice_tree4 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4 msgid "Supplier Refunds" -msgstr "供应商退还" +msgstr "供应商退款" #. module: account #: help:account.model.line,date:0 msgid "The date of the generated entries" -msgstr "生成的日期" +msgstr "产生的日期" #. module: account #: wizard_button:account.invoice.refund,init,modify_invoice:0 @@ -4585,7 +4585,7 @@ msgstr "辅助核算业务类型" #: model:process.transition,note:account.process_transition_suppliervalidentries0 #: model:process.transition,note:account.process_transition_validentries0 msgid "Valid entries from invoice" -msgstr "发票有效记录" +msgstr "发票有效分录" #. module: account #: field:account.account,company_id:0 @@ -4660,7 +4660,7 @@ msgstr "从发票或者付款导入" #: model:ir.actions.wizard,name:account.wizard_reconcile_select #: model:ir.ui.menu,name:account.menu_reconcile_select msgid "Reconcile entries" -msgstr "核销" +msgstr "对账分录" #. module: account #: xsl:account.transfer:0 @@ -4757,7 +4757,7 @@ msgstr "应收款科目" #. module: account #: wizard_button:account.move.line.unreconcile.select,init,open:0 msgid "Open for unreconciliation" -msgstr "打开取消对账" +msgstr "打开未对账" #. module: account #: field:account.bank.statement.reconcile,statement_line:0 @@ -4933,7 +4933,7 @@ msgstr "创建" #: field:account.tax,ref_tax_code_id:0 #: field:account.tax.template,ref_tax_code_id:0 msgid "Refund Tax Code" -msgstr "退还的税务" +msgstr "退税事务" #. module: account #: field:account.invoice.tax,name:0 @@ -4948,12 +4948,12 @@ msgstr "连接自动产生的凭证" #. module: account #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0 msgid "Reconciled transactions" -msgstr "已核销交易" +msgstr "已对账交易" #. module: account #: model:ir.ui.menu,name:account.menu_finance_reporting msgid "Reporting" -msgstr "报表" +msgstr "内部报表" #. module: account #: rml:account.third_party_ledger:0 @@ -5012,7 +5012,7 @@ msgstr "产品模板的收入科目" #: help:account.account,currency_id:0 #: help:account.account.template,currency_id:0 msgid "Force all moves for this account to have this secondary currency." -msgstr "强制这科目的所有凭证用这外币" +msgstr "强制所有凭证用这外币" #. module: account #: wizard_button:populate_statement_from_inv,go,end:0 @@ -5054,7 +5054,7 @@ msgstr "税组" #: model:ir.actions.act_window,name:account.action_invoice_tree3_new #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new msgid "New Customer Refund" -msgstr "新的客户退还" +msgstr "新的客户退款" #. module: account #: help:wizard.multi.charts.accounts,seq_journal:0 @@ -5073,7 +5073,7 @@ msgstr "导入发票" #: wizard_view:account.move.line.unreconcile.select,init:0 #: wizard_view:account.reconcile.unreconcile,init:0 msgid "Unreconciliation" -msgstr "取消对账" +msgstr "未对账" #. module: account #: model:ir.model,name:account.model_fiscalyear_seq @@ -5100,7 +5100,7 @@ msgstr "项信息" #. module: account #: view:account.tax.code.template:0 msgid "Account Tax Code Template" -msgstr "税务科目模板" +msgstr "税事务科目模板" #. module: account #: view:account.subscription:0 @@ -5171,7 +5171,7 @@ msgstr "从手动转为草稿" #. module: account #: model:ir.ui.menu,name:account.next_id_43 msgid "This Month" -msgstr "这月" +msgstr "本月" #. module: account #: field:account.account.type,sign:0 @@ -5181,7 +5181,7 @@ msgstr "报表上的符号" #. module: account #: help:account.move.line,currency_id:0 msgid "The optional other currency if it is a multi-currency entry." -msgstr "如果是一个多货币记录可选其它货币" +msgstr "如果是一个多货币凭证可选其它货币" #. module: account #: view:account.invoice:0 @@ -5198,7 +5198,7 @@ msgstr "在记账银行凭证产生的会计分录" #. module: account #: wizard_view:account_use_models,create:0 msgid "Use Model" -msgstr "使用模式" +msgstr "使用模型" #. module: account #: wizard_button:account.wizard_paid_open,init,end:0 @@ -5250,7 +5250,7 @@ msgstr "已付" #: model:ir.actions.act_window,name:account.action_invoice_tree11 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11 msgid "Unpaid Customer Refunds" -msgstr "未支付的客户退还" +msgstr "未支付的客户退款" #. module: account #: help:account.invoice,residual:0 @@ -5271,7 +5271,7 @@ msgstr "形式发票" #. module: account #: field:account.move.reconcile,line_partial_ids:0 msgid "Partial Entry lines" -msgstr "部分明细" +msgstr "部分分录明细" #. module: account #: help:account.move.line,statement_id:0 @@ -5286,7 +5286,7 @@ msgstr "会计年度" #. module: account #: wizard_button:account.analytic.line,init,open:0 msgid "Open Entries" -msgstr "打开记录" +msgstr "打开分录" #. module: account #: selection:account.analytic.account,type:0 @@ -5317,7 +5317,7 @@ msgstr "页" #: view:account.move:0 #: view:account.move.line:0 msgid "Optional Information" -msgstr "可选信息" +msgstr "其它信息" #. module: account #: model:ir.actions.act_window,name:account.action_payment_term_form @@ -5339,7 +5339,7 @@ msgstr "：" #. module: account #: field:account.bank.statement.line,reconcile_amount:0 msgid "Amount reconciled" -msgstr "已核销金额" +msgstr "已对账金额" #. module: account #: selection:account.account,currency_mode:0 @@ -5352,7 +5352,7 @@ msgid "" "If the Tax account is tax code account, this field will contain the taxed " "amount.If the tax account is base tax code, this field " "will contain the basic amount(without tax)." -msgstr "如果这税科目是税务科目, 这字段将含税款. 如果这科目是基于的税务这字段将含基础金额(不含税)." +msgstr "如果这税科目是税事务科目, 这字段将含税款. 如果这科目是基础税事务这字段将含基础金额(不含税)." #. module: account #: view:account.bank.statement:0 @@ -5434,7 +5434,7 @@ msgstr "余额" #. module: account #: rml:account.invoice:0 msgid "Refund" -msgstr "退还" +msgstr "退款" #. module: account #: model:ir.model,name:account.model_account_invoice_tax @@ -5455,7 +5455,7 @@ msgstr "科目.税.模板" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 msgid "Bank Accounts" -msgstr "银行科目" +msgstr "银行帐号" #. module: account #: constraint:account.period:0 @@ -5720,7 +5720,7 @@ msgstr "科目.序列.会计年度" #. module: account #: wizard_field:account.print.journal.report,init,sort_selection:0 msgid "Entries Sorted By" -msgstr "排序按" +msgstr "分录排序按" #. module: account #: rml:account.journal.period.print:0 @@ -5732,7 +5732,7 @@ msgstr "打印业务类型 -" #: field:account.chart.template,bank_account_view_id:0 #: field:account.invoice,partner_bank:0 msgid "Bank Account" -msgstr "银行科目" +msgstr "银行帐号" #. module: account #: model:ir.actions.act_window,name:account.action_model_form @@ -5786,18 +5786,18 @@ msgstr "留空为所有开启的会计年度" #: rml:account.invoice:0 #: selection:account.invoice,type:0 msgid "Supplier Refund" -msgstr "供应商退还" +msgstr "供应商退款" #. module: account #: model:process.transition,note:account.process_transition_entriesreconcile0 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 msgid "Reconcile Entries." -msgstr "核销" +msgstr "对账分录" #. module: account #: field:account.subscription.line,move_id:0 msgid "Entry" -msgstr "记录" +msgstr "分录" #. module: account #: model:process.node,note:account.process_node_paidinvoice0 @@ -5805,7 +5805,7 @@ msgstr "记录" #: model:process.transition,note:account.process_transition_reconcilepaid0 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0 msgid "Paid invoice when reconciled." -msgstr "支付发票时已核销" +msgstr "对账时支付发票" #. module: account #: field:account.tax,python_compute_inv:0 @@ -5930,7 +5930,7 @@ msgstr "是" #: help:account.account,reconcile:0 msgid "" "Check this if the user is allowed to reconcile entries in this account." -msgstr "勾选, 如果用户可以在这科目核销分录." +msgstr "勾选, 如果用户可以在这科目对账分录." #. module: account #: wizard_button:account.subscription.generate,init,generate:0 @@ -6112,7 +6112,7 @@ msgstr "显示对比 %" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period" -msgstr "选择会计期间" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index c2b8cf55c28..f5c5924240f 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:27+0000\n" +"PO-Revision-Date: 2010-08-03 12:03+0000\n" "Last-Translator: BlueT - Matthew Lien - 練喆明 \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:42+0000\n" +"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index f6dfd51b729..eb6695264de 100644 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -19,13 +19,13 @@ # ############################################################################## -import central_journal -import general_journal +import account_central_journal +import account_general_journal import account_journal import account_balance -import partner_balance -import general_ledger -import third_party_ledger +import account_partner_balance +import account_general_ledger +import account_partner_ledger import invoice import overdue import aged_trial_balance @@ -35,12 +35,12 @@ import account_balance_landscape import compare_account_balance import account_invoice_report import account_report -#import account_analytic_report +import account_analytic_report import account_account_report import account_entries_report import account_analytic_entries_report import voucher_print -import report_bs -import report_pl +import account_balance_sheet +import account_profit_loss # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml new file mode 100644 index 00000000000..bd9101a3382 --- /dev/null +++ b/addons/account/report/account_account_report_view.xml @@ -0,0 +1,94 @@ + + + + + account.account.report.tree + account.account.report + tree + + + + + + + + + + + + + + + + + + + + + account.account.report.graph + account.account.report + graph + + + + + + + + + + + + account.account.report.search + account.account.report + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Accounts Analysis + account.account.report + form + tree,graph + {"search_default_Account":1,"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]} + + + + + + + diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index da0269c227f..4e9049b853f 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -35,24 +35,24 @@ - - - - - - - - - + + + + + + + + + @@ -72,15 +72,15 @@ - - - - - + + + + + - - - + + + @@ -90,7 +90,7 @@ graph - + diff --git a/addons/account/report/account_analytic_report.py b/addons/account/report/account_analytic_report.py new file mode 100644 index 00000000000..a740076ad09 --- /dev/null +++ b/addons/account/report/account_analytic_report.py @@ -0,0 +1,94 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 . +# +############################################################################## + +import tools +from osv import fields,osv + +class analytic_report(osv.osv): + _name = "analytic.report" + _description = "Analytic Accounts Statistics" + _auto = False + _columns = { + 'date_start': fields.date('Date Start', readonly=True), + 'date_end': fields.date('Date End', readonly=True), + 'name' : fields.char('Analytic Account', size=128, readonly=True), + 'partner_id' : fields.many2one('res.partner', 'Associated Partner', readonly=True), + 'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', readonly=True), + 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', readonly=True), + 'user_id' : fields.many2one('res.users', 'Account Manager', readonly=True), + 'product_id' : fields.many2one('product.product', 'Product', readonly=True), + 'total_quantity': fields.float('# Total Quantity', readonly=True), + 'debit' : fields.float('Debit', readonly=True), + 'credit' : fields.float('Credit', readonly=True), + 'balance' : fields.float('Balance', readonly=True), + 'year': fields.char('Year', size=4, readonly=True), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), + ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), + 'day': fields.char('Day', size=128, readonly=True), + 'nbr':fields.integer('# of Lines', readonly=True), + 'company_id': fields.many2one('res.company', 'Company', readonly=True), + 'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type'), + + 'state': fields.selection([('draft','Draft'), + ('open','Open'), + ('pending','Pending'), + ('cancelled', 'Cancelled'), + ('close','Close'), + ('template', 'Template')], + 'State', readonly=True), + + } + _order = 'date_start desc' + def init(self, cr): + tools.drop_view_if_exists(cr, 'analytic_report') + cr.execute(""" + create or replace view analytic_report as ( + select + min(s.id) as id, + to_char(s.create_date, 'YYYY') as year, + to_char(s.create_date, 'MM') as month, + to_char(s.create_date, 'YYYY-MM-DD') as day, + l.journal_id, + l.product_id, + s.parent_id, + s.date_start, + s.date as date_end, + s.user_id, + s.company_id, + s.type, + s.name, + s.partner_id, + sum(s.quantity) as total_quantity, + s.debit, + s.credit, + s.balance, + count(*) as nbr, + s.state + from account_analytic_account s + left join account_analytic_line l on (s.id=l.account_id) + GROUP BY s.create_date,s.state,l.journal_id,s.name, + s.partner_id,s.date_start,s.date,s.user_id, + s.company_id,s.type, + s.debit,s.credit,s.balance,s.parent_id,l.product_id + ) + """) +analytic_report() diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index b3570a73da0..070b3a8c10a 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -1,6 +1,128 @@ + + analytic.report.tree + analytic.report + tree + + + + + + + + + + + + + + + + + + + + + + + + + + analytic.report.search + analytic.report + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + account.analytic.report.graph + analytic.report + graph + + + + + + + + + + + + Analytic Accounts Analysis + analytic.report + form + tree,graph + {'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} + + + diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 93a09db9edf..bcc9c75be57 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -19,169 +19,137 @@ # ############################################################################## -import xml -import copy -from operator import itemgetter -import datetime +import time + from report import report_sxw -import xml.dom.minidom -import os, time -import osv -import re -import tools -import pooler -import sys +from common_report_header import common_report_header -class account_balance(report_sxw.rml_parse): - _name = 'report.account.account.balance' - def __init__(self, cr, uid, name, context): - super(account_balance, self).__init__(cr, uid, name, context=context) - self.sum_debit = 0.00 - self.sum_credit = 0.00 - self.date_lst = [] - self.date_lst_string = '' - self.localcontext.update({ - 'time': time, - 'lines': self.lines, - 'sum_debit': self._sum_debit, - 'sum_credit': self._sum_credit, - 'get_fiscalyear':self.get_fiscalyear, - 'get_periods':self.get_periods, - }) - self.context = context +class account_balance(report_sxw.rml_parse, common_report_header): + _name = 'report.account.account.balance' - def _add_header(self, node, header=1): - if header==0: - self.rml_header = "" - return True - def get_fiscalyear(self, form): - res=[] - if form.has_key('fiscalyear'): - fisc_id = form['fiscalyear'] - if not (fisc_id): - return '' - self.cr.execute("select name from account_fiscalyear where id = %s" , (int(fisc_id),)) - res=self.cr.fetchone() - return res and res[0] or '' + def __init__(self, cr, uid, name, context=None): + super(account_balance, self).__init__(cr, uid, name, context=context) + self.sum_debit = 0.00 + self.sum_credit = 0.00 + self.date_lst = [] + self.date_lst_string = '' + self.localcontext.update({ + 'time': time, + 'lines': self.lines, + 'sum_debit': self._sum_debit, + 'sum_credit': self._sum_credit, + 'get_fiscalyear':self._get_fiscalyear, + 'get_filter': self._get_filter, + 'get_start_period': self.get_start_period, + 'get_end_period': self.get_end_period , + 'get_account': self._get_account, + 'get_journal': self._get_journal, + 'get_start_date':self._get_start_date, + 'get_end_date':self._get_end_date, + }) + self.context = context - def get_periods(self, form): - result='' - if form.has_key('periods') and form['periods']: - period_ids = form['periods'] - per_ids = self.pool.get('account.period').browse(self.cr, self.uid, form['periods']) - for r in per_ids: - if r == per_ids[len(per_ids)-1]: - result+=r.name+". " - else: - result+=r.name+", " - else: - fy_obj = self.pool.get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear']) - res = fy_obj.period_ids - len_res = len(res) - for r in res: - if r == res[len_res-1]: - result+=r.name+". " - else: - result+=r.name+", " + def set_context(self, objects, data, ids, report_type=None): + new_ids = ids + if (data['model'] == 'ir.ui.menu'): + new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or [] + objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids) + self.query_get_clause = data['form'].get('query_line', False) or '' + return super(account_balance, self).set_context(objects, data, new_ids, report_type=report_type) - return str(result and result[:-1]) or '' + def _add_header(self, node, header=1): + if header == 0: + self.rml_header = "" + return True + def _get_account(self, data): + if data['model']=='account.account': + return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name + return super(account_balance ,self)._get_account(data) - def lines(self, form, ids={}, done=None, level=1): - if not ids: - ids = self.ids - if not ids: - return [] - if not done: - done={} - if form.has_key('Account_list') and form['Account_list']: - ids = [form['Account_list']] - del form['Account_list'] - res={} - result_acc=[] - ctx = self.context.copy() - ctx['state'] = form['context'].get('state','all') - ctx['fiscalyear'] = form['fiscalyear'] - if form['state']=='byperiod' : - ctx['periods'] = form['periods'] - elif form['state']== 'bydate': - ctx['date_from'] = form['date_from'] - ctx['date_to'] = form['date_to'] - elif form['state'] == 'all' : - ctx['periods'] = form['periods'] - ctx['date_from'] = form['date_from'] - ctx['date_to'] = form['date_to'] -# accounts = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx) -# def cmp_code(x, y): -# return cmp(x.code, y.code) -# accounts.sort(cmp_code) - child_ids = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, ids, ctx) - if child_ids: - ids = child_ids - accounts = self.pool.get('account.account').read(self.cr, self.uid, ids, ['type','code','name','debit','credit','balance','parent_id'], ctx) - for account in accounts: - if account['id'] in done: - continue - done[account['id']] = 1 - res = { - 'id' : account['id'], - 'type' : account['type'], - 'code': account['code'], - 'name': account['name'], - 'level': level, - 'debit': account['debit'], - 'credit': account['credit'], - 'balance': account['balance'], - # 'leef': not bool(account['child_id']), - 'parent_id':account['parent_id'], - 'bal_type':'', - } - self.sum_debit += account['debit'] - self.sum_credit += account['credit'] -# if account.child_id: -# def _check_rec(account): -# if not account.child_id: -# return bool(account.credit or account.debit) -# for c in account.child_id: -# if not _check_rec(c) or _check_rec(c): -# return True -# return False -# if not _check_rec(account) : -# continue - if account['parent_id']: -# acc = self.pool.get('account.account').read(self.cr, self.uid, [ account['parent_id'][0] ] ,['name'], ctx) - for r in result_acc: - if r['id'] == account['parent_id'][0]: - res['level'] = r['level'] + 1 - break - if form['display_account'] == 'bal_mouvement': - if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 : - result_acc.append(res) - elif form['display_account'] == 'bal_solde': - if res['balance'] != 0: - result_acc.append(res) - else: + def lines(self, form, ids=[], done=None, level=1): + obj_account = self.pool.get('account.account') + if not ids: + ids = self.ids + if not ids: + return [] + if not done: + done={} + + res = {} + result_acc = [] + ctx = self.context.copy() + + ctx['fiscalyear'] = form['fiscalyear_id'] + if form['filter'] == 'filter_period': + ctx['periods'] = form['periods'] + elif form['filter'] == 'filter_date': + ctx['date_from'] = form['date_from'] + ctx['date_to'] = form['date_to'] +# accounts = obj_account.browse(self.cr, self.uid, ids, ctx) +# def cmp_code(x, y): +# return cmp(x.code, y.code) +# accounts.sort(cmp_code) + + child_ids = obj_account._get_children_and_consol(self.cr, self.uid, ids, ctx) + if child_ids: + ids = child_ids + accounts = obj_account.read(self.cr, self.uid, ids, ['type','code','name','debit','credit','balance','parent_id'], ctx) + for account in accounts: + if account['id'] in done: + continue + done[account['id']] = 1 + res = { + 'id': account['id'], + 'type': account['type'], + 'code': account['code'], + 'name': account['name'], + 'level': level, + 'debit': account['debit'], + 'credit': account['credit'], + 'balance': account['balance'], + # 'leef': not bool(account['child_id']), + 'parent_id':account['parent_id'], + 'bal_type':'', + } + self.sum_debit += account['debit'] + self.sum_credit += account['credit'] +# if account.child_id: +# def _check_rec(account): +# if not account.child_id: +# return bool(account.credit or account.debit) +# for c in account.child_id: +# if not _check_rec(c) or _check_rec(c): +# return True +# return False +# if not _check_rec(account) : +# continue + if account['parent_id']: +# acc = obj_account.read(self.cr, self.uid, [ account['parent_id'][0] ] ,['name'], ctx) + for r in result_acc: + if r['id'] == account['parent_id'][0]: + res['level'] = r['level'] + 1 + break + if form['display_account'] == 'bal_movement': + if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 : result_acc.append(res) -# if account.child_id: -# acc_id = [acc.id for acc in account.child_id] -# lst_string = '' -# lst_string = '\'' + '\',\''.join(map(str,acc_id)) + '\'' -# self.cr.execute("select code,id from account_account where id IN (%s)"%(lst_string)) -# a_id = self.cr.fetchall() -# a_id.sort() -# ids2 = [x[1] for x in a_id] + elif form['display_account'] == 'bal_solde': + if res['balance'] != 0: + result_acc.append(res) + else: + result_acc.append(res) +# if account.child_id: +# acc_id = [acc.id for acc in account.child_id] +# lst_string = '' +# lst_string = '\'' + '\',\''.join(map(str,acc_id)) + '\'' +# self.cr.execute("select code,id from account_account where id IN (%s)"%(lst_string)) +# a_id = self.cr.fetchall() +# a_id.sort() +# ids2 = [x[1] for x in a_id] # -# result_acc += self.lines(form, ids2, done, level+1) - return result_acc +# result_acc += self.lines(form, ids2, done, level+1) + return result_acc - def _sum_credit(self): - return self.sum_credit +report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header="internal") - def _sum_debit(self): - return self.sum_debit - - - - -report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=0) -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 8ee7e3e17dc..a5b4e211b33 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -2,26 +2,7 @@ @@ -29,186 +10,280 @@ - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - - - - - - - + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + Account Balance + + + + + + + + + + + + Company [[ data['model']=='account.account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] Fiscal Year - - End Date - - - Start Date - Display Account - Periods + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + + + Printing Date - - - [[ get_fiscalyear(data['form']) ]] + [[ get_account(data) or '' ]] - [[ data['form']['date_from'] ]] + [[ get_fiscalyear(data) or '' ]] + + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + + + Start Date + + + End Date + + + + + [[ get_start_date(data) ]] + + + [[ get_end_date(data) ]] + + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + + Start Period + + + End Period + + + + + [[ get_start_period(data) or removeParentNode('para') ]] + + + [[ get_end_period(data) or removeParentNode('para') ]] + + + - [[ data['form']['date_to'] ]] - - - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']] - - - [[data['form']['periods'] and get_periods(data['form']) or '']] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True)]] - - - - - - + + + + + + + Code Account @@ -224,5 +299,8 @@ [[ (a['level']>2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] + + + - + \ No newline at end of file diff --git a/addons/account/report/report_bs.py b/addons/account/report/account_balance_sheet.py similarity index 69% rename from addons/account/report/report_bs.py rename to addons/account/report/account_balance_sheet.py index 04fafd7ed30..08df077c779 100644 --- a/addons/account/report/report_bs.py +++ b/addons/account/report/account_balance_sheet.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,65 +15,76 @@ # 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 . # ############################################################################## -import pooler import time -import mx.DateTime + +import pooler import rml_parse from report import report_sxw -from account.report import report_pl +from account.report import account_profit_loss +from common_report_header import common_report_header -class report_balancesheet_horizontal(rml_parse.rml_parse): - def __init__(self, cr, uid, name, context): - super(report_balancesheet_horizontal, self).__init__(cr, uid, name, context) - self.obj_pl=report_pl.report_pl_account_horizontal(cr, uid, name, context) - self.result_sum_dr=0.0 - self.result_sum_cr=0.0 +class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): + def __init__(self, cr, uid, name, context=None): + super(report_balancesheet_horizontal, self).__init__(cr, uid, name, context=context) + self.obj_pl = account_profit_loss.report_pl_account_horizontal(cr, uid, name, context=context) + self.result_sum_dr = 0.0 + self.result_sum_cr = 0.0 self.result = {} - self.res_pl={} - self.result_temp=[] + self.res_bl = {} + self.result_temp = [] self.localcontext.update({ 'time': time, 'get_abs' : self.get_abs, 'get_lines' : self.get_lines, 'get_lines_another' : self.get_lines_another, - 'get_company': self.get_company, + 'get_company': self._get_company, 'get_currency': self._get_currency, 'sum_dr' : self.sum_dr, 'sum_cr' : self.sum_cr, 'get_data':self.get_data, 'get_pl_balance':self.get_pl_balance, - + 'get_fiscalyear': self._get_fiscalyear, + 'get_account': self._get_account, + 'get_start_period': self.get_start_period, + 'get_end_period': self.get_end_period, + 'get_sortby': self._get_sortby, + 'get_filter': self._get_filter, + 'get_journal': self._get_journal, + 'get_start_date':self._get_start_date, + 'get_end_date':self._get_end_date, + 'get_company':self._get_company, + }) self.context = context def get_abs(self,amount): return abs(amount) - + def sum_dr(self): - if self.res_pl['type'] == 'Net Profit': - self.result_sum_dr += self.res_pl['balance'] + if self.res_bl['type'] == 'Net Profit': + self.result_sum_dr += self.res_bl['balance'] return self.result_sum_dr or 0.0 - + def sum_cr(self): - if self.res_pl['type'] == 'Net Loss': - self.result_sum_cr += self.res_pl['balance'] + if self.res_bl['type'] == 'Net Loss': + self.result_sum_cr += self.res_bl['balance'] return self.result_sum_cr or 0.0 def get_pl_balance(self): - return self.res_pl or 0.0 - - def get_data(self,form): + return self.res_bl or 0.0 + + def get_data(self,data): cr, uid = self.cr, self.uid db_pool = pooler.get_pool(self.cr.dbname) - + #Getting Profit or Loss Balance from profit and Loss report - result_pl=self.obj_pl.get_data(form) - self.res_pl=self.obj_pl.final_result() - + result_pl=self.obj_pl.get_data(data) + self.res_bl = self.obj_pl.final_result() + type_pool = db_pool.get('account.account.type') account_pool = db_pool.get('account.account') year_pool = db_pool.get('account.fiscalyear') @@ -84,34 +95,31 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): ] ctx = self.context.copy() - ctx['state'] = form['context'].get('state','all') - ctx['fiscalyear'] = form['fiscalyear'] - if form['state']=='byperiod' : - ctx['periods'] = form['periods'] - elif form['state']== 'bydate': - ctx['date_from'] = form['date_from'] - ctx['date_to'] = form['date_to'] - elif form['state'] == 'all' : - ctx['periods'] = form['periods'] - ctx['date_from'] = form['date_from'] - ctx['date_to'] = form['date_to'] +# ctx['state'] = form['context'].get('state','filter_no') + ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False) - cal_list={} + if data['form']['filter'] == 'filter_period' : + ctx['periods'] = data['form'].get('periods', False) + elif data['form']['filter'] == 'filter_date': + ctx['date_from'] = data['form'].get('date_from', False) + ctx['date_to'] = data['form'].get('date_to', False) + + cal_list = {} pl_dict = {} account_dict = {} - account_id = [form['Account_list']] + account_id = data['form'].get('chart_account_id', False) account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx) accounts = account_pool.browse(cr, uid, account_ids, context=ctx) - if self.res_pl['type'] == 'Net Profit C.F.B.L.': - self.res_pl['type'] = 'Net Profit' + if self.res_bl['type'] == 'Net Profit C.F.B.L.': + self.res_bl['type'] = 'Net Profit' else: - self.res_pl['type'] = 'Net Loss' + self.res_bl['type'] = 'Net Loss' pl_dict = { 'code' : False, - 'name' : self.res_pl['type'], + 'name' : self.res_bl['type'], 'level': False, - 'balance':self.res_pl['balance'], + 'balance':self.res_bl['balance'], } for typ in types: accounts_temp = [] @@ -128,23 +136,23 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): self.result_sum_dr += abs(account.debit - account.credit) if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += abs(account.debit - account.credit) - if form['display_account'] == 'bal_mouvement': + if data['form']['display_account'] == 'bal_movement': if account.credit > 0 or account.debit > 0 or account.balance > 0 : accounts_temp.append(account_dict) - elif form['display_account'] == 'bal_solde': - if account.balance != 0: + elif data['form']['display_account'] == 'bal_solde': + if account.balance != 0: accounts_temp.append(account_dict) else: accounts_temp.append(account_dict) - if account.id == form['reserve_account_id']: + if account.id == data['form']['reserve_account_id']: pl_dict['level'] = account['level'] + 1 accounts_temp.append(pl_dict) - + self.result[typ] = accounts_temp cal_list[typ]=self.result[typ] if cal_list: - temp={} + temp = {} for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))): if i < len(cal_list['liability']) and i < len(cal_list['asset']): temp={ @@ -171,7 +179,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): 'balance1':cal_list['asset'][i]['balance'], } self.result_temp.append(temp) - if i < len(cal_list['liability']): + if i < len(cal_list['liability']): temp={ 'code' : cal_list['liability'][i]['code'], 'name' : cal_list['liability'][i]['name'], @@ -184,24 +192,19 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): } self.result_temp.append(temp) return None - + def get_lines(self): return self.result_temp def get_lines_another(self, group): return self.result.get(group, []) - - def _get_currency(self, form): - return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.code - - def get_company(self,form): - comp_obj=pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr,self.uid,form['company_id']) - return comp_obj.name report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account', - 'addons/account/report/report_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal, - header=False) + 'addons/account/report/account_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal, + header='internal') report_sxw.report_sxw('report.account.balancesheet', 'account.account', - 'addons/account/report/report_balance_sheet.rml',parser=report_balancesheet_horizontal, - header=False) + 'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal, + header='internal') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/report/report_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml similarity index 70% rename from addons/account/report/report_balance_sheet.rml rename to addons/account/report/account_balance_sheet.rml index 20f52cdd2f2..5ab769d6625 100644 --- a/addons/account/report/report_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -1,6 +1,6 @@ -