diff --git a/addons/account/account.py b/addons/account/account.py index b8c626c8209..9a8143fc283 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2533,8 +2533,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True), 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), - "sale_tax": fields.many2one("account.tax.template", "Sale Tax"), - "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"), + "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"), + "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} @@ -2542,12 +2542,12 @@ class wizard_multi_charts_accounts(osv.osv_memory): res['value']["sale_tax"] = False res['value']["purchase_tax"] = False if chart_template_id: - ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" - , "=", chart_template_id)], order="sequence") - if len(ids) > 0: - id=ids[0] - res['value']["sale_tax"] = id - res['value']["purchase_tax"] = id + sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence") + purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence") + res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False + res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False return res def _get_chart(self, cr, uid, context={}): diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index d0c966898d6..5f4ed44adfe 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -8,7 +8,7 @@ form {'search_default_draft': 1} - After closing a period, you will no longer be able to post entries to the period once it has been closed. + A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation. form tree,form + A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system. - - + +
@@ -2467,7 +2468,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context) New Company Financial Setting - STOCK_JUSTIFY_FILL + STOCK_EXECUTE diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index f45a9a30f4f..469b7dda7fa 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 07:28+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2010-11-03 10:55+0000\n" +"Last-Translator: Goran Kliska (Aplikacija d.o.o.) \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-10-30 05:26+0000\n" +"X-Launchpad-Export-Date: 2010-11-04 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1020,7 +1020,7 @@ msgstr "Ukupno netto:" #: model:ir.model,name:account.model_account_fiscal_position #: field:res.partner,property_account_position:0 msgid "Fiscal Mapping" -msgstr "" +msgstr "Fiskalno mapiranje" #. module: account #: field:account.analytic.line,product_uom_id:0 @@ -1163,7 +1163,7 @@ msgstr "Iznos je predstavljen opciono u drugoj valuti" #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Mapping Template" -msgstr "" +msgstr "Predložak fiskalnog mapiranja" #. module: account #: field:account.payment.term,line_ids:0 @@ -3675,7 +3675,7 @@ msgstr "Sekvenca" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template msgid "Template for Fiscal Mapping" -msgstr "" +msgstr "Predložak fiskalnog mapiranja" #. module: account #: view:account.bank.statement:0 @@ -3907,7 +3907,7 @@ msgstr "Po razdoblju" #. module: account #: help:account.invoice,date_invoice:0 msgid "Keep empty to use the current date" -msgstr "" +msgstr "Ostavite prazno za trenutni datum" #. module: account #: rml:account.overdue:0 @@ -4611,7 +4611,7 @@ msgstr "Unos stavaka po temeljnicama" #. module: account #: wizard_view:account.analytic.account.chart,init:0 msgid "Analytic Account Charts" -msgstr "" +msgstr "Analitički kontni planovi" #. module: account #: wizard_field:account.aged.trial.balance,init,result_selection:0 diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 9d335e29875..c87d93db84d 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-31 15:43+0000\n" -"Last-Translator: Lorenzo Battistini \n" +"PO-Revision-Date: 2010-11-04 04:13+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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-11-01 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-11-04 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -118,7 +118,7 @@ msgstr "Mastro" #. module: account #: selection:account.move,type:0 msgid "Journal Voucher" -msgstr "Registro giustificativi" +msgstr "Movimento contabile" #. module: account #: field:account.invoice,residual:0 @@ -1093,7 +1093,7 @@ msgstr "Stampa registri analitici" #. module: account #: rml:account.tax.code.entries:0 msgid "Voucher Nb" -msgstr "N. giustificativo" +msgstr "N. ricevuta contabile" #. module: account #: help:account.payment.term.line,sequence:0 @@ -2387,7 +2387,7 @@ msgstr "" #. module: account #: rml:account.journal.period.print:0 msgid "Voucher No" -msgstr "Numero giustificativo" +msgstr "Numero ricevuta contabile" #. module: account #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile @@ -3300,7 +3300,7 @@ msgstr "Nessuno" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close #: model:ir.ui.menu,name:account.menu_wizard_fy_close msgid "Generate Fiscal Year Opening Entries" -msgstr "" +msgstr "Genera le scritture di apertura anno fiscale" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile @@ -6140,7 +6140,7 @@ msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,landscape:0 msgid "Show Report in Landscape Form" -msgstr "" +msgstr "Visualizza il report in formato orizzontale" #. module: account #: rml:account.account.balance.landscape:0 @@ -6161,7 +6161,7 @@ msgstr "Selezionare periodo" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Report Options" -msgstr "" +msgstr "Opzioni Report" #. module: account #: selection:account.balance.account.balance.report,init,compare_pattern:0 diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 91b6ba1459d..947dbd1cf10 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.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-10-31 08:11+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2010-11-04 02:05+0000\n" +"Last-Translator: Jacara \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-11-01 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-11-04 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -528,7 +528,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 @@ -1356,7 +1356,7 @@ msgstr "Төлөх нэхэмжлэл сонгох" #: selection:account.analytic.account,type:0 #: field:account.journal,view_id:0 msgid "View" -msgstr "Дэлгэц" +msgstr "Харах" #. module: account #: selection:account.account.balance.report,checktype,display_account:0 diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index 20d8ca5644d..a6411b91788 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.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-09-29 08:58+0000\n" +"PO-Revision-Date: 2010-11-03 07:59+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-30 05:27+0000\n" +"X-Launchpad-Export-Date: 2010-11-04 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -56,7 +56,7 @@ msgstr "Tài sản" #. module: account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Tên mẫu không hợp lệ khi định nghĩa hành động" #. module: account #: help:account.journal,currency:0 @@ -251,12 +251,12 @@ msgstr "khách hàng mua hàng" #. module: account #: field:product.template,supplier_taxes_id:0 msgid "Supplier Taxes" -msgstr "" +msgstr "Thuế đầu vào" #. module: account #: view:account.move:0 msgid "Total Debit" -msgstr "" +msgstr "Tổng Nợ" #. module: account #: rml:account.tax.code.entries:0 @@ -345,7 +345,7 @@ msgstr "" #: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 msgid "Tax" -msgstr "" +msgstr "Thuế" #. module: account #: rml:account.general.journal:0 @@ -472,7 +472,7 @@ msgstr "Ngân hàng hòa giải(reconniliation)" #. module: account #: rml:account.invoice:0 msgid "Disc.(%)" -msgstr "" +msgstr "Giảm giá (%)" #. module: account #: rml:account.general.ledger:0 @@ -685,7 +685,7 @@ msgstr "" #. module: account #: selection:account.subscription,period_type:0 msgid "month" -msgstr "" +msgstr "tháng" #. module: account #: field:account.analytic.account,partner_id:0 diff --git a/addons/account/installer.py b/addons/account/installer.py index 83ddff6065d..a9c459cec86 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -86,8 +86,8 @@ class account_installer(osv.osv_memory): return 'configurable' _defaults = { - 'date_start': time.strftime('%Y-01-01'), - 'date_stop': time.strftime('%Y-12-31'), + 'date_start': lambda *a: time.strftime('%Y-01-01'), + 'date_stop': lambda *a: time.strftime('%Y-12-31'), 'period': 'month', 'sale_tax': 0.0, 'purchase_tax': 0.0, @@ -749,4 +749,4 @@ class account_installer_modules(osv.osv_memory): account_installer_modules() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml index c8210dfbdf1..a4200d69c2d 100644 --- a/addons/account/wizard/account_fiscalyear_close_state.xml +++ b/addons/account/wizard/account_fiscalyear_close_state.xml @@ -26,6 +26,7 @@ tree,form new + If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive. {'record_id' : active_id} new + This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore. diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 414c4cbfde1..3915463d8a2 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -192,6 +192,7 @@ tree,form + A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period. \n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-31 10:38+0000\n" +"PO-Revision-Date: 2010-11-01 08:41+0000\n" "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " "\n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-11-01 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-11-02 04:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 4d1cd131619..c601aaac13c 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -37,13 +37,12 @@ class report_rappel(report_sxw.rml_parse): 'get_text': self._get_text }) - def _ids_to_objects(self, partners_ids): + def _ids_to_objects(self, partner_ids): pool = pooler.get_pool(self.cr.dbname) all_partners = [] - for partner in partners_ids: - partners = pool.get('account_followup.stat').browse(self.cr, self.uid, [partner]) - for par in partners: - all_partners.append(par.name) + for partner in pool.get('res.partner').browse(self.cr, self.uid, partner_ids): + if partner not in all_partners: + all_partners.append(partner) return all_partners def _adr_get(self, partner, type): diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py index 00dfe3a9998..0cfc5cd4671 100644 --- a/addons/account_followup/report/account_followup_report.py +++ b/addons/account_followup/report/account_followup_report.py @@ -22,20 +22,13 @@ from osv import fields, osv import tools -def _code_get(self, cr, uid, context={}): - acc_type_obj = self.pool.get('account.account.type') - ids = acc_type_obj.search(cr, uid, []) - res = acc_type_obj.read(cr, uid, ids, ['code', 'name'], context) - return [(r['code'], r['name']) for r in res] - - class account_followup_stat(osv.osv): _name = "account_followup.stat" _description = "Followup Statistics" + _rec_name = 'partner_id' _auto = False _columns = { - 'name': fields.many2one('res.partner', 'Partner', readonly=True), - 'account_type': fields.selection(_code_get, 'Account Type', readonly=True), + 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), 'date_move':fields.date('First move', readonly=True), 'date_move_last':fields.date('Last move', readonly=True), 'date_followup':fields.date('Latest followup', readonly=True), @@ -58,10 +51,7 @@ class account_followup_stat(osv.osv): current_year = self.pool.get('account.fiscalyear').find(cr, uid) ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] args.append(['period_id','in',ids]) - for a in [['period_id','in','current_year']]: - temp_args = tuple(a) - if temp_args in args: - args.remove(temp_args) + args.remove(arg) return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, context=context, count=count) @@ -72,47 +62,37 @@ class account_followup_stat(osv.osv): current_year = self.pool.get('account.fiscalyear').find(cr, uid) ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] domain.append(['period_id','in',ids]) - todel.append(arg) - for a in [['period_id','in','current_year']]: - temp_args = tuple(a) - if temp_args in domain: - domain.remove(temp_args) + domain.remove(arg) return super(account_followup_stat, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context) def init(self, cr): tools.drop_view_if_exists(cr, 'account_followup_stat') cr.execute(""" create or replace view account_followup_stat as ( - select - l.partner_id as id, - l.partner_id as name, - min(l.date) as date_move, - max(l.date) as date_move_last, - max(l.followup_date) as date_followup, - max(l.followup_line_id) as followup_id, - sum(l.debit) as debit, - sum(l.credit) as credit, - sum(l.debit - l.credit) as balance, - a.type as account_type, - l.company_id as company_id, - l.blocked, - am.period_id as period_id - from + SELECT + l.id AS id, + l.partner_id AS partner_id, + min(l.date) AS date_move, + max(l.date) AS date_move_last, + max(l.followup_date) AS date_followup, + max(l.followup_line_id) AS followup_id, + sum(l.debit) AS debit, + sum(l.credit) AS credit, + sum(l.debit - l.credit) AS balance, + l.company_id AS company_id, + l.blocked as blocked, + l.period_id AS period_id + FROM account_move_line l - LEFT JOIN account_account a ON (l.account_id=a.id) - LEFT JOIN res_company c ON (l.company_id=c.id) - LEFT JOIN account_move am ON (am.id=l.move_id) - LEFT JOIN account_period p ON (am.period_id=p.id) - where - l.reconcile_id is NULL and - a.type = 'receivable' - and a.active and - l.partner_id is not NULL and - l.company_id is not NULL and - l.blocked is not NULL - group by - l.partner_id, a.type, l.company_id,l.blocked,am.period_id + LEFT JOIN account_account a ON (l.account_id = a.id) + WHERE + a.active AND + a.type = 'receivable' AND + l.reconcile_id is NULL AND + l.partner_id IS NOT NULL + GROUP BY + l.id, l.partner_id, l.company_id, l.blocked, l.period_id )""") account_followup_stat() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml index 73b2740a43b..fdde1f9300f 100644 --- a/addons/account_followup/report/account_followup_report.xml +++ b/addons/account_followup/report/account_followup_report.xml @@ -8,15 +8,15 @@ tree - + - - + + @@ -30,7 +30,7 @@ graph - + @@ -51,18 +51,20 @@ domain="[('blocked','=', False)]" help = "Including journal entries marked as a litigation"/> - + - - + + + + @@ -76,9 +78,8 @@ {'search_default_followup_level':1,'search_default_fiscalyear':1} - - + diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv index 60d179d3cbe..7b7e2af7ba8 100644 --- a/addons/account_followup/security/ir.model.access.csv +++ b/addons/account_followup/security/ir.model.access.csv @@ -4,3 +4,4 @@ "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1 "access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0 "access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1 +"access_account_followup_stat_by_partner_manager","account_followup.stat.by.partner","model_account_followup_stat_by_partner","account.group_account_manager",1,1,1,1 diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index be353220e99..22f432f77f6 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -67,14 +67,55 @@ class account_followup_print(osv.osv_memory): 'date': time.strftime('%Y-%m-%d'), 'followup_id': _get_followup, } - account_followup_print() +class account_followup_stat_by_partner(osv.osv): + _name = "account_followup.stat.by.partner" + _description = "Followup Statistics by Partner" + _rec_name = 'partner_id' + _auto = False + _columns = { + 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), + 'date_move':fields.date('First move', readonly=True), + 'date_move_last':fields.date('Last move', readonly=True), + 'date_followup':fields.date('Latest followup', readonly=True), + 'max_followup_id': fields.many2one('account_followup.followup.line', + 'Max Follow Up Level', readonly=True, ondelete="cascade"), + 'balance':fields.float('Balance', readonly=True), + 'company_id': fields.many2one('res.company', 'Company', readonly=True), + } + + def init(self, cr): + tools.drop_view_if_exists(cr, 'account_followup_stat_by_partner') + cr.execute(""" + create or replace view account_followup_stat_by_partner as ( + SELECT + l.partner_id AS id, + l.partner_id AS partner_id, + min(l.date) AS date_move, + max(l.date) AS date_move_last, + max(l.followup_date) AS date_followup, + max(l.followup_line_id) AS max_followup_id, + sum(l.debit - l.credit) AS balance, + l.company_id company_id + FROM + account_move_line l + LEFT JOIN account_account a ON (l.account_id = a.id) + WHERE + a.active AND + a.type = 'receivable' AND + l.reconcile_id is NULL AND + l.partner_id IS NOT NULL + GROUP BY + l.partner_id, l.company_id + )""") +account_followup_stat_by_partner() + class account_followup_print_all(osv.osv_memory): _name = 'account.followup.print.all' _description = 'Print Followup & Send Mail to Customers' _columns = { - 'partner_ids': fields.many2many('account_followup.stat', 'partner_stat_rel', 'followup_id', 'stat_id', 'Partners', required=True), + 'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True, domain="[('account_id.type', '=', 'receivable'), ('account_id.reconcile', '=', True), ('reconcile_id','=', False), ('state', '!=', 'draft'), ('account_id.active', '=' True), ('debit', '>', 0)]"), 'email_conf': fields.boolean('Send email confirmation'), 'email_subject': fields.char('Email Subject', size=64), 'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'), @@ -94,7 +135,7 @@ class account_followup_print_all(osv.osv_memory): _defaults = { 'email_body': _get_msg, - 'email_subject': 'Invoices Reminder', + 'email_subject': _('Invoices Reminder'), 'partner_lang': True, 'partner_ids': _get_partners, 'summary': _get_summary, @@ -295,4 +336,4 @@ class account_followup_print_all(osv.osv_memory): account_followup_print_all() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml index d21a1162a41..f647c569358 100644 --- a/addons/account_followup/wizard/account_followup_print_view.xml +++ b/addons/account_followup/wizard/account_followup_print_view.xml @@ -36,8 +36,38 @@ parent="account.menu_finance_periodical_processing_billing" sequence="10"/> + + account_followup.stat.by.partner.search + account_followup.stat.by.partner + search + + + + + + + + + + + + + account_followup.stat.by.partner.tree + account_followup.stat.by.partner + tree + + + + + + + + + + + account.followup.print.all.form @@ -48,8 +78,8 @@ - - + + diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index 750edccf389..3e4de9ff87d 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -32,7 +32,7 @@ class payment_mode(osv.osv): 'bank_id': fields.many2one('res.partner.bank', "Bank account", required=True,help='Bank Account for the Payment Mode'), 'journal': fields.many2one('account.journal', 'Journal', required=True, - domain=[('type', '=', 'cash')], help='Cash Journal for the Payment Mode'), + domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'), 'company_id': fields.many2one('res.company', 'Company', required=True), } _defaults = { @@ -452,4 +452,4 @@ class payment_line(osv.osv): payment_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index fed50bdd749..d0543d72242 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -221,6 +221,7 @@ form tree,form + A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for. diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po index bde25e33ed4..df58402f75c 100644 --- a/addons/account_voucher/i18n/es.po +++ b/addons/account_voucher/i18n/es.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-31 11:49+0000\n" +"PO-Revision-Date: 2010-11-01 08:41+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-11-01 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-11-02 04:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po index 93d8f98e4f8..ca1bf9ed592 100644 --- a/addons/account_voucher/i18n/it.po +++ b/addons/account_voucher/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-31 15:09+0000\n" +"PO-Revision-Date: 2010-11-02 07:21+0000\n" "Last-Translator: Lorenzo Battistini \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-11-01 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-11-03 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher @@ -233,7 +233,7 @@ msgstr "" #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt msgid "Supplier Vouchers" -msgstr "Giustificativi fornitori" +msgstr "Ricevute contabili fornitori" #. module: account_voucher #: field:account.voucher,tax_id:0 @@ -327,13 +327,13 @@ msgstr "Stato" #. module: account_voucher #: model:ir.module.module,shortdesc:account_voucher.module_meta_information msgid "Accounting Voucher Entries" -msgstr "Registrazioni giustificativi contabili" +msgstr "Movimenti contabili" #. module: account_voucher #: view:account.voucher:0 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open msgid "Voucher Entries" -msgstr "Registrazioni giustificativi" +msgstr "Movimenti contabili" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:0 @@ -344,12 +344,12 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 msgid "Supplier Voucher" -msgstr "Giustificativo fornitore" +msgstr "Ricevuta contabile fornitore" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list msgid "Vouchers Entries" -msgstr "Registrazioni giustificativi" +msgstr "Movimenti contabili" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -412,7 +412,7 @@ msgstr "Importo tasse" #. module: account_voucher #: view:account.voucher:0 msgid "Voucher Entry" -msgstr "" +msgstr "Movimento contabile" #. module: account_voucher #: view:account.voucher:0 @@ -439,7 +439,7 @@ msgstr "" #: field:account.voucher,line_ids:0 #: model:ir.model,name:account_voucher.model_account_voucher_line msgid "Voucher Lines" -msgstr "Righe giustificativo" +msgstr "Righe ricevuta contabile" #. module: account_voucher #: field:account.voucher,currency_id:0 @@ -551,7 +551,7 @@ msgstr "" #: model:ir.actions.act_window,name:account_voucher.action_voucher_list #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher msgid "Journal Vouchers" -msgstr "" +msgstr "Movimenti contabili" #. module: account_voucher #: selection:account.voucher.line,type:0 @@ -601,7 +601,7 @@ msgstr "" #: view:account.voucher:0 #: model:ir.model,name:account_voucher.model_account_voucher msgid "Accounting Voucher" -msgstr "Giustificativo contabile" +msgstr "Ricevuta contabile" #. module: account_voucher #: field:account.voucher,number:0 @@ -633,7 +633,7 @@ msgstr "" #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher #: model:res.request.link,name:account_voucher.req_link_voucher msgid "Voucher" -msgstr "Giustificativo" +msgstr "Ricevuta contabile" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_invoice @@ -643,7 +643,7 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 msgid "Voucher Items" -msgstr "Elementi del Giustificativo" +msgstr "Voci della ricevuta contabile" #. module: account_voucher #: view:account.statement.from.invoice:0 diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po index e8f3f10435f..6668aa95781 100644 --- a/addons/analytic/i18n/es.po +++ b/addons/analytic/i18n/es.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-31 11:02+0000\n" +"PO-Revision-Date: 2010-11-01 08:34+0000\n" "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " "\n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-11-01 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-11-02 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po new file mode 100644 index 00000000000..59e44dba646 --- /dev/null +++ b/addons/analytic/i18n/fr.po @@ -0,0 +1,235 @@ +# French translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-11-03 16:43+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-11-04 04:51+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "" + +#. module: analytic +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "" +"Module for defining analytic accounting object.\n" +" " +msgstr "" + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +msgid "Account currency" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price. Always expressed in the company main currency." +msgstr "" + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "" + +#. module: analytic +#: help:account.analytic.account,type:0 +msgid "" +"If you select the View Type, it means you won't allow to create journal " +"entries using that account." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "" + +#. module: analytic +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "" diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 6213cc07f9a..e55938d2ecd 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -278,6 +278,7 @@ +