Merge lp:~openerp-dev/openobject-addons/trunk-dev-addons3 into lp:openobject-addons

Proposed by Husen Daudi
Status: Merged
Merged at revision: 4238
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-dev-addons3
Merge into: lp:openobject-addons
Diff against target: 22835 lines (+5012/-2265)
319 files modified
account/account.py (+28/-8)
account/account_analytic_line.py (+0/-2)
account/account_bank_statement.py (+21/-0)
account/account_installer.xml (+1/-1)
account/account_invoice_view.xml (+0/-1)
account/account_move_line.py (+14/-7)
account/account_report.xml (+1/-0)
account/account_view.xml (+12/-18)
account/board_account_view.xml (+1/-0)
account/i18n/account.pot (+13/-1)
account/i18n/ar.po (+13/-1)
account/i18n/bg.po (+14/-2)
account/i18n/br.po (+13/-1)
account/i18n/bs.po (+13/-1)
account/i18n/ca.po (+13/-2)
account/i18n/cs.po (+13/-1)
account/i18n/da.po (+13/-1)
account/i18n/de.po (+13/-2)
account/i18n/el.po (+13/-2)
account/i18n/en_US.po (+12/-0)
account/i18n/es.po (+13/-3)
account/i18n/es_AR.po (+13/-3)
account/i18n/es_EC.po (+14/-2)
account/i18n/et.po (+13/-1)
account/i18n/eu.po (+13/-1)
account/i18n/fa.po (+13/-1)
account/i18n/fi.po (+14/-2)
account/i18n/fr.po (+13/-3)
account/i18n/fr_BE.po (+13/-1)
account/i18n/gl.po (+13/-1)
account/i18n/gu.po (+13/-1)
account/i18n/he.po (+13/-1)
account/i18n/hi.po (+13/-1)
account/i18n/hr.po (+13/-1)
account/i18n/hu.po (+13/-1)
account/i18n/id.po (+13/-1)
account/i18n/it.po (+13/-3)
account/i18n/kab.po (+13/-1)
account/i18n/ko.po (+14/-2)
account/i18n/lt.po (+13/-1)
account/i18n/lv.po (+14/-2)
account/i18n/mn.po (+13/-1)
account/i18n/nb.po (+13/-1)
account/i18n/nl.po (+13/-2)
account/i18n/nl_BE.po (+13/-1)
account/i18n/oc.po (+13/-1)
account/i18n/pl.po (+13/-2)
account/i18n/pt.po (+14/-2)
account/i18n/pt_BR.po (+14/-2)
account/i18n/ro.po (+13/-2)
account/i18n/ru.po (+14/-2)
account/i18n/si.po (+13/-1)
account/i18n/sk.po (+13/-1)
account/i18n/sl.po (+14/-2)
account/i18n/sq.po (+13/-1)
account/i18n/sr.po (+13/-1)
account/i18n/sr@latin.po (+13/-1)
account/i18n/sv.po (+14/-2)
account/i18n/ta.po (+13/-1)
account/i18n/te.po (+13/-1)
account/i18n/th.po (+13/-1)
account/i18n/tlh.po (+13/-1)
account/i18n/tr.po (+14/-2)
account/i18n/ug.po (+13/-1)
account/i18n/uk.po (+13/-1)
account/i18n/vi.po (+13/-1)
account/i18n/zh_CN.po (+14/-2)
account/i18n/zh_HK.po (+13/-1)
account/i18n/zh_TW.po (+14/-2)
account/invoice.py (+19/-11)
account/report/__init__.py (+0/-2)
account/report/account_balance.py (+1/-0)
account/report/account_entries_report.py (+13/-17)
account/report/account_entries_report_view.xml (+3/-3)
account/report/account_general_ledger.py (+3/-1)
account/report/account_invoice_report_view.xml (+1/-0)
account/report/account_voucher_print.py (+0/-69)
account/report/account_voucher_print.rml (+0/-470)
account/res_currency.py (+4/-1)
account/security/ir.model.access.csv (+1/-0)
account/test/account_bank_statement.yml (+2/-2)
account/test/account_cash_statement.yml (+2/-2)
account/test/account_customer_invoice.yml (+1/-1)
account/test/account_period_close.yml (+4/-4)
account/test/account_report.yml (+6/-14)
account/test/account_validate_account_move.yml (+6/-6)
account/test/chart_of_account.yml (+2/-2)
account/wizard/account_open_closed_fiscalyear.py (+1/-1)
account/wizard/account_tax_chart_view.xml (+1/-1)
account_budget/account_budget.py (+1/-1)
account_budget/account_budget_view.xml (+2/-2)
account_budget/test/account_budget.yml (+7/-7)
account_followup/report/account_followup_report.py (+1/-2)
account_followup/test/account_followup.yml (+3/-2)
account_followup/wizard/account_followup_print.py (+8/-5)
account_payment/test/account_payment.yml (+2/-2)
account_voucher/account_voucher.py (+7/-3)
account_voucher/security/ir.model.access.csv (+2/-0)
account_voucher/voucher_sales_purchase_view.xml (+2/-2)
auction/test/auction.yml (+6/-6)
auction/test/auction_wizard.yml (+8/-8)
base_calendar/test/base_calendar_test.yml (+6/-6)
crm/test/test_crm_meeting.yml (+5/-3)
crm/test/test_crm_opportunity.yml (+4/-4)
crm/test/test_crm_phonecall.yml (+5/-4)
crm_claim/test/test_crm_claim.yml (+1/-1)
crm_helpdesk/crm_helpdesk_demo.xml (+4/-4)
crm_helpdesk/test/test_crm_helpdesk.yml (+1/-1)
delivery/test/delivery_report.yml (+3/-3)
event/test/test_event.yml (+2/-2)
hr_attendance/test/test_hr_attendance.yml (+2/-2)
hr_contract/test/test_hr_contract.yml (+4/-4)
hr_evaluation/hr_evaluation.py (+1/-1)
hr_evaluation/test/test_hr_evaluation.yml (+2/-2)
hr_expense/hr_expense_demo.xml (+6/-6)
hr_expense/test/test_hr_expense.yml (+2/-2)
hr_holidays/hr_holidays_view.xml (+2/-2)
hr_holidays/test/test_hr_holiday.yml (+4/-4)
hr_payroll/hr_payroll.py (+4/-4)
hr_payroll/hr_payroll_data.xml (+3/-3)
hr_payroll/hr_payroll_demo.xml (+2/-2)
hr_payroll/hr_payroll_view.xml (+0/-2)
hr_payroll/i18n/de.po (+2/-2)
hr_payroll/i18n/es.po (+2/-2)
hr_payroll/i18n/et.po (+2/-2)
hr_payroll/i18n/fr.po (+2/-2)
hr_payroll/i18n/hr.po (+2/-2)
hr_payroll/i18n/hr_payroll.pot (+2/-2)
hr_payroll/i18n/hu.po (+2/-2)
hr_payroll/i18n/it.po (+2/-2)
hr_payroll/i18n/mn.po (+2/-2)
hr_payroll/i18n/nl.po (+2/-2)
hr_payroll/i18n/pl.po (+2/-2)
hr_payroll/i18n/pt.po (+2/-2)
hr_payroll/i18n/ru.po (+2/-2)
hr_payroll/i18n/sr@latin.po (+2/-2)
hr_payroll/i18n/sv.po (+2/-2)
hr_payroll/i18n/zh_CN.po (+2/-2)
hr_payroll/test/payment_advice.yml (+2/-2)
hr_payroll/test/payroll_register.yml (+3/-3)
hr_payroll/test/payslip.yml (+2/-2)
hr_recruitment/test/test_hr_recruitment.yml (+3/-3)
hr_timesheet/test/test_hr_timesheet.yml (+5/-4)
hr_timesheet_invoice/report/account_analytic_profit.rml (+1/-1)
hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml (+1/-1)
hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py (+1/-1)
hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml (+3/-3)
hr_timesheet_sheet/hr_timesheet_sheet.py (+1/-1)
hr_timesheet_sheet/hr_timesheet_sheet_view.xml (+15/-1)
hr_timesheet_sheet/i18n/ar.po (+1/-5)
hr_timesheet_sheet/i18n/bg.po (+1/-5)
hr_timesheet_sheet/i18n/bs.po (+1/-5)
hr_timesheet_sheet/i18n/ca.po (+1/-5)
hr_timesheet_sheet/i18n/cs.po (+1/-5)
hr_timesheet_sheet/i18n/de.po (+1/-5)
hr_timesheet_sheet/i18n/el.po (+1/-5)
hr_timesheet_sheet/i18n/es.po (+1/-5)
hr_timesheet_sheet/i18n/es_AR.po (+1/-5)
hr_timesheet_sheet/i18n/et.po (+1/-5)
hr_timesheet_sheet/i18n/fi.po (+1/-5)
hr_timesheet_sheet/i18n/fr.po (+1/-5)
hr_timesheet_sheet/i18n/hr.po (+1/-5)
hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot (+1/-5)
hr_timesheet_sheet/i18n/hu.po (+1/-5)
hr_timesheet_sheet/i18n/id.po (+1/-5)
hr_timesheet_sheet/i18n/it.po (+1/-5)
hr_timesheet_sheet/i18n/ko.po (+1/-5)
hr_timesheet_sheet/i18n/lt.po (+1/-5)
hr_timesheet_sheet/i18n/lv.po (+1/-5)
hr_timesheet_sheet/i18n/mn.po (+1/-5)
hr_timesheet_sheet/i18n/nl.po (+1/-5)
hr_timesheet_sheet/i18n/nl_BE.po (+1/-7)
hr_timesheet_sheet/i18n/pl.po (+1/-5)
hr_timesheet_sheet/i18n/pt.po (+1/-5)
hr_timesheet_sheet/i18n/pt_BR.po (+1/-5)
hr_timesheet_sheet/i18n/ro.po (+1/-5)
hr_timesheet_sheet/i18n/ru.po (+1/-5)
hr_timesheet_sheet/i18n/sl.po (+1/-5)
hr_timesheet_sheet/i18n/sq.po (+1/-5)
hr_timesheet_sheet/i18n/sv.po (+1/-5)
hr_timesheet_sheet/i18n/tlh.po (+1/-5)
hr_timesheet_sheet/i18n/tr.po (+1/-5)
hr_timesheet_sheet/i18n/uk.po (+1/-5)
hr_timesheet_sheet/i18n/vi.po (+1/-5)
hr_timesheet_sheet/i18n/zh_CN.po (+1/-5)
hr_timesheet_sheet/i18n/zh_TW.po (+1/-5)
hr_timesheet_sheet/security/ir.model.access.csv (+1/-0)
hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml (+8/-8)
idea/test/test_idea.yml (+1/-1)
l10n_br/i18n/de.po (+29/-0)
l10n_br/i18n/en_US.po (+29/-0)
l10n_br/i18n/fr.po (+29/-0)
l10n_br/i18n/l10n_br.pot (+29/-0)
l10n_cn/i18n/de.po (+36/-0)
l10n_cn/i18n/en_US.po (+36/-0)
l10n_cn/i18n/fr.po (+36/-0)
l10n_cn/i18n/l10n_cn.pot (+36/-0)
l10n_cr/i18n/de.po (+159/-0)
l10n_cr/i18n/en_US.po (+159/-0)
l10n_cr/i18n/fr.po (+159/-0)
l10n_cr/i18n/l10n_cr.pot (+159/-0)
l10n_de/account_chart_skr04.xml (+34/-34)
l10n_ec/account_chart.xml (+12/-12)
l10n_ec/i18n/de.po (+35/-0)
l10n_ec/i18n/en_US.po (+35/-0)
l10n_ec/i18n/fr.po (+35/-0)
l10n_ec/i18n/l10n_ec.pot (+35/-0)
l10n_fr/plan_comptable_general_demo.xml (+185/-185)
l10n_in/l10n_in_chart.xml (+1/-1)
l10n_it/data/account.account.template.csv (+233/-233)
l10n_it/i18n/de.po (+155/-0)
l10n_it/i18n/en_US.po (+155/-0)
l10n_it/i18n/fr.po (+155/-0)
l10n_it/i18n/l10n_it.pot (+155/-0)
l10n_mx/account_chart.xml (+1/-1)
l10n_mx/i18n/de.po (+33/-0)
l10n_mx/i18n/en_US.po (+33/-0)
l10n_mx/i18n/fr.po (+33/-0)
l10n_mx/i18n/l10n_mx.pot (+33/-0)
l10n_nl/i18n/de.po (+54/-0)
l10n_nl/i18n/en_US.po (+54/-0)
l10n_nl/i18n/fr.po (+54/-0)
l10n_nl/i18n/l10n_nl.pot (+54/-0)
l10n_pl/account_chart.xml (+1/-1)
l10n_pl/i18n/de.po (+39/-0)
l10n_pl/i18n/en_US.po (+39/-0)
l10n_pl/i18n/fr.po (+39/-0)
l10n_pl/i18n/l10n_pl.pot (+39/-0)
l10n_ro/account_chart.xml (+6/-6)
l10n_ro/i18n/de.po (+48/-0)
l10n_ro/i18n/en_US.po (+48/-0)
l10n_ro/i18n/fr.po (+48/-0)
l10n_ro/i18n/l10n_ro.pot (+48/-0)
l10n_th/account_data.xml (+4/-4)
l10n_th/i18n/de.po (+35/-0)
l10n_th/i18n/en_US.po (+35/-0)
l10n_th/i18n/fr.po (+35/-0)
l10n_th/i18n/l10n_th.pot (+35/-0)
l10n_uk/l10n_uk_chart.xml (+1/-1)
l10n_ve/account_chart.xml (+2/-2)
l10n_ve/i18n/de.po (+39/-0)
l10n_ve/i18n/en_US.po (+39/-0)
l10n_ve/i18n/fr.po (+39/-0)
l10n_ve/i18n/l10n_ve.pot (+39/-0)
lunch/test/test_lunch.yml (+2/-2)
membership/membership_view.xml (+0/-1)
membership/test/test_membership.yml (+22/-22)
mrp/mrp.py (+1/-1)
mrp/test/mrp_phantom_bom.yml (+27/-27)
mrp/test/mrp_procurement.yml (+2/-2)
mrp/test/mrp_production_order.yml (+5/-5)
mrp_jit/test/mrp_jit.yml (+3/-3)
mrp_operations/test/mrp_operations.yml (+13/-13)
mrp_repair/test/test_mrp_repair.yml (+14/-14)
mrp_subproduct/test/mrp_subproduct.yml (+1/-1)
multi_company/multi_company_demo.xml (+4/-0)
point_of_sale/point_of_sale_demo.xml (+15/-15)
point_of_sale/report/pos_sales_user.py (+1/-2)
point_of_sale/report/pos_users_product.py (+2/-2)
point_of_sale/test/point_of_sale_report.yml (+2/-2)
point_of_sale/test/point_of_sale_test.yml (+15/-7)
project/project.py (+1/-1)
project/test/test_project.yml (+7/-7)
project_long_term/test/schedule_phase_tasks.yml (+1/-1)
project_long_term/test/schedule_project_phases.yml (+62/-62)
project_long_term/test/schedule_project_tasks.yml (+1/-1)
project_mrp/test/project_task_procurement.yml (+1/-1)
project_planning/test/planning_states.yml (+2/-2)
project_retro_planning/test/deadline_change.yml (+3/-3)
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml (+31/-31)
purchase/purchase.py (+2/-2)
purchase/purchase_demo.xml (+3/-3)
purchase/test/procurement_buy.yml (+18/-18)
purchase/test/purchase_from_manual.yml (+2/-2)
purchase/test/purchase_from_order.yml (+12/-12)
purchase/test/purchase_from_picking.yml (+4/-3)
purchase_requisition/purchase_requisition_demo.xml (+1/-1)
purchase_requisition/test/purchase_requisition.yml (+39/-39)
purchase_requisition/test/purchase_requisition_exclusive.yml (+24/-24)
resource/resource.py (+1/-1)
sale/test/advance_invoice.yml (+11/-11)
sale/test/invoice_on_ordered_qty.yml (+12/-12)
sale/test/invoice_on_shipped_qty.yml (+13/-12)
sale/test/manual_order_policy.yml (+2/-2)
sale/test/picking_order_policy.yml (+14/-13)
sale/test/postpaid_order_policy.yml (+23/-23)
sale/test/prepaid_order_policy.yml (+11/-11)
sale/test/sale_procurement.yml (+5/-5)
sale/test/so_make_invoice.yml (+3/-3)
sale/test/so_make_line_invoice.yml (+14/-14)
sale_margin/test/sale_margin.yml (+2/-2)
sale_mrp/test/sale_mrp.yml (+4/-4)
stock/stock.py (+2/-2)
stock/test/stock_test.yml (+97/-97)
stock_invoice_directly/test/stock_invoice_directly.yml (+11/-11)
stock_location/test/stock_location_pull_flow.yml (+47/-47)
stock_location/test/stock_location_push_flow.yml (+17/-17)
stock_no_autopicking/test/stock_no_autopicking.yml (+2/-2)
stock_planning/test/stock_planning.yml (+28/-28)
survey/i18n/bg.po (+1/-1)
survey/i18n/cs.po (+1/-1)
survey/i18n/de.po (+1/-1)
survey/i18n/es.po (+1/-1)
survey/i18n/et.po (+1/-1)
survey/i18n/fr.po (+2/-2)
survey/i18n/hr.po (+1/-1)
survey/i18n/mn.po (+1/-1)
survey/i18n/nl.po (+1/-1)
survey/i18n/pl.po (+1/-1)
survey/i18n/pt.po (+1/-1)
survey/i18n/ru.po (+1/-1)
survey/i18n/sl.po (+1/-1)
survey/i18n/sr.po (+1/-1)
survey/i18n/sr@latin.po (+1/-1)
survey/i18n/survey.pot (+1/-1)
survey/i18n/sv.po (+1/-1)
survey/i18n/zh_CN.po (+1/-1)
survey/survey.py (+1/-1)
survey/survey_demo.xml (+34/-34)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-dev-addons3
Reviewer Review Type Date Requested Status
xrg (community) Needs Fixing
Review via email: mp+44905@code.launchpad.net

Description of the change

Bug and typo fixing by module 3 team.

To post a comment you must log in.
Revision history for this message
xrg (xrg) wrote :

Can you please not chmod +x the data files?
Please fix them and resubmit.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore' (properties changed: -x to +x)
2=== modified file 'account/__init__.py' (properties changed: -x to +x)
3=== modified file 'account/__openerp__.py' (properties changed: -x to +x)
4=== modified file 'account/account.py' (properties changed: -x to +x)
5--- account/account.py 2011-01-11 10:55:11 +0000
6+++ account/account.py 2011-01-13 18:00:31 +0000
7@@ -419,8 +419,18 @@
8 ids = child_ids
9 return True
10
11+ def _check_type(self, cr, uid, ids, context=None):
12+ if context is None:
13+ context = {}
14+ accounts = self.browse(cr, uid, ids, context=context)
15+ for account in accounts:
16+ if account.child_id and account.type != 'view':
17+ return False
18+ return True
19+
20 _constraints = [
21- (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
22+ (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']),
23+ (_check_type, 'Configuration Error! \nYou cannot define children to an account with internal type different of "View"! ', ['type']),
24 ]
25 _sql_constraints = [
26 ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
27@@ -965,7 +975,7 @@
28 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
29 help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
30 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
31- 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company')
32+ 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
33 }
34
35 def _check(self, cr, uid, ids, context=None):
36@@ -1118,14 +1128,14 @@
37 'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
38 'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
39 'narration':fields.text('Narration'),
40- 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
41+ 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
42 }
43 _defaults = {
44 'name': '/',
45 'state': 'draft',
46 'period_id': _get_period,
47 'date': lambda *a: time.strftime('%Y-%m-%d'),
48- 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
49+ 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
50 }
51
52 def _check_centralisation(self, cursor, user, ids, context=None):
53@@ -1612,7 +1622,6 @@
54 ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
55 return self.name_get(cr, user, ids, context)
56
57-
58 def name_get(self, cr, uid, ids, context=None):
59 if isinstance(ids, (int, long)):
60 ids = [ids]
61@@ -1647,6 +1656,7 @@
62 (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
63 ]
64 _order = 'code'
65+
66 account_tax_code()
67
68 class account_tax(osv.osv):
69@@ -2295,12 +2305,22 @@
70 'nocreate': False,
71 }
72
73+ def _check_type(self, cr, uid, ids, context=None):
74+ if context is None:
75+ context = {}
76+ accounts = self.browse(cr, uid, ids, context=context)
77+ for account in accounts:
78+ if account.parent_id and account.parent_id.type != 'view':
79+ return False
80+ return True
81+
82 _check_recursion = check_cycle
83 _constraints = [
84- (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id'])
85+ (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']),
86+ (_check_type, 'Configuration Error! \nYou cannot define children to an account with internal type different of "View"! ', ['type']),
87+
88 ]
89
90-
91 def name_get(self, cr, uid, ids, context=None):
92 if not ids:
93 return []
94@@ -3007,4 +3027,4 @@
95
96 account_bank_accounts_wizard()
97
98-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
99+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
100\ No newline at end of file
101
102=== modified file 'account/account_analytic_line.py' (properties changed: -x to +x)
103--- account/account_analytic_line.py 2010-12-27 07:31:56 +0000
104+++ account/account_analytic_line.py 2011-01-13 18:00:31 +0000
105@@ -51,7 +51,6 @@
106 context = {}
107 if context.get('from_date',False):
108 args.append(['date', '>=', context['from_date']])
109-
110 if context.get('to_date',False):
111 args.append(['date','<=', context['to_date']])
112 return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
113@@ -125,7 +124,6 @@
114 result = round(amount, prec)
115 if not flag:
116 result *= -1
117-
118 return {'value': {
119 'amount': result,
120 'general_account_id': a,
121
122=== modified file 'account/account_assert_test.xml' (properties changed: -x to +x)
123=== modified file 'account/account_bank_statement.py' (properties changed: -x to +x)
124--- account/account_bank_statement.py 2010-12-22 17:41:59 +0000
125+++ account/account_bank_statement.py 2011-01-13 18:00:31 +0000
126@@ -405,6 +405,27 @@
127
128 class account_bank_statement_line(osv.osv):
129
130+ def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
131+ obj_partner = self.pool.get('res.partner')
132+ if context is None:
133+ context = {}
134+ if not partner_id:
135+ return {}
136+ part = obj_partner.browse(cr, uid, partner_id, context=context)
137+ if not part.supplier and not part.customer:
138+ type = 'general'
139+ elif part.supplier and part.customer:
140+ type = 'general'
141+ else:
142+ if part.supplier == True:
143+ type = 'supplier'
144+ if part.customer == True:
145+ type = 'customer'
146+ res_type = self.onchange_type(cr, uid, ids, partner_id=partner_id, type=type, context=context)
147+ if res_type['value'] and res_type['value'].get('account_id', False):
148+ return {'value': {'type': type, 'account_id': res_type['value']['account_id']}}
149+ return {'value': {'type': type}}
150+
151 def onchange_type(self, cr, uid, line_id, partner_id, type, context=None):
152 res = {'value': {}}
153 obj_partner = self.pool.get('res.partner')
154
155=== modified file 'account/account_cash_statement.py' (properties changed: -x to +x)
156=== modified file 'account/account_demo.xml' (properties changed: -x to +x)
157=== modified file 'account/account_end_fy.xml' (properties changed: -x to +x)
158=== modified file 'account/account_installer.xml' (properties changed: -x to +x)
159--- account/account_installer.xml 2011-01-06 10:55:24 +0000
160+++ account/account_installer.xml 2011-01-13 18:00:31 +0000
161@@ -28,7 +28,7 @@
162 <field name="charts"/>
163 <group colspan="4" groups="base.group_extended">
164 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
165- <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
166+ <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
167 <field name="date_start" on_change="on_change_start_date(date_start)"/>
168 <field name="date_stop"/>
169 <field name="period" colspan="4"/>
170
171=== modified file 'account/account_invoice_view.xml' (properties changed: -x to +x)
172--- account/account_invoice_view.xml 2011-01-12 22:01:56 +0000
173+++ account/account_invoice_view.xml 2011-01-13 18:00:31 +0000
174@@ -434,7 +434,6 @@
175 <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
176 <field name="search_view_id" ref="view_account_invoice_filter"/>
177 <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
178- <field name="groups_id" eval="[(6,0,[ref('account.group_account_manager'),ref('account.group_account_user')])]"/>
179 </record>
180
181
182
183=== modified file 'account/account_invoice_workflow.xml' (properties changed: -x to +x)
184=== modified file 'account/account_menuitem.xml' (properties changed: -x to +x)
185=== modified file 'account/account_move_line.py' (properties changed: -x to +x)
186--- account/account_move_line.py 2011-01-10 11:44:00 +0000
187+++ account/account_move_line.py 2011-01-13 18:00:31 +0000
188@@ -101,14 +101,13 @@
189 query += ' AND '+obj+'.account_id IN (%s)' % ','.join(map(str, child_ids))
190
191 query += company_clause
192-
193 return query
194
195 def _amount_residual(self, cr, uid, ids, field_names, args, context=None):
196 """
197- This function returns the residual amount on a receivable or payable account.move.line.
198- By default, it returns an amount in the currency of this journal entry (maybe different
199- of the company currency), but if you pass 'residual_in_company_currency' = True in the
200+ This function returns the residual amount on a receivable or payable account.move.line.
201+ By default, it returns an amount in the currency of this journal entry (maybe different
202+ of the company currency), but if you pass 'residual_in_company_currency' = True in the
203 context then the returned amount will be in company currency.
204 """
205 res = {}
206@@ -120,13 +119,13 @@
207 'amount_residual': 0.0,
208 'amount_residual_currency': 0.0,
209 }
210-
211+
212 if move_line.reconcile_id:
213 continue
214 if not move_line.account_id.type in ('payable', 'receivable'):
215 #this function does not suport to be used on move lines not related to payable or receivable accounts
216 continue
217-
218+
219 if move_line.currency_id:
220 move_line_total = move_line.amount_currency
221 sign = move_line.amount_currency < 0 and -1 or 1
222@@ -911,7 +910,7 @@
223 cr.execute('SELECT code FROM account_period WHERE id = %s', (context['period_id'], ))
224 p = cr.fetchone()[0] or ''
225 if j or p:
226- return j+(p and (':'+p) or '')
227+ return j + (p and (':' + p) or '')
228 return False
229
230 def onchange_date(self, cr, user, ids, date, context=None):
231@@ -954,6 +953,14 @@
232 #Restrict the list of journal view in search view
233 if view_type == 'search' and result['fields'].get('journal_id', False):
234 result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
235+ ctx = context.copy()
236+ #we add the refunds journal in the selection field of journal
237+ if context.get('journal_type', False) == 'sale':
238+ ctx.update({'journal_type': 'sale_refund'})
239+ result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
240+ elif context.get('journal_type', False) == 'purchase':
241+ ctx.update({'journal_type': 'purchase_refund'})
242+ result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
243 return result
244 if context.get('view_mode', False):
245 return result
246
247=== modified file 'account/account_report.xml' (properties changed: -x to +x)
248--- account/account_report.xml 2010-12-07 05:17:37 +0000
249+++ account/account_report.xml 2011-01-13 18:00:31 +0000
250@@ -2,6 +2,7 @@
251 <openerp>
252 <data>
253 <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
254+ <report auto="False" id="account_general_ledger_landscape" menu="False" model="account.account" name="account.general.ledger_landscape" rml="account/report/account_general_ledger_landscape.rml" string="General Ledger"/>
255 <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
256 <report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Ledger"/>
257 <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Trial Balance"/>
258
259=== modified file 'account/account_unit_test.xml' (properties changed: -x to +x)
260=== modified file 'account/account_view.xml' (properties changed: -x to +x)
261--- account/account_view.xml 2011-01-11 09:55:13 +0000
262+++ account/account_view.xml 2011-01-13 18:00:31 +0000
263@@ -170,6 +170,8 @@
264 </group>
265 <notebook colspan="4">
266 <page string="General Information">
267+ <field name="active" groups="base.group_extended" />
268+ <newline/>
269 <group col="2" colspan="2">
270 <separator string="Currency" colspan="2"/>
271 <field name="currency_id"/>
272@@ -565,7 +567,7 @@
273 <field name="date" groups="base.group_extended"/>
274 <field name="name"/>
275 <field name="ref"/>
276- <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
277+ <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
278 <field name="type" on_change="onchange_type(partner_id, type)"/>
279 <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
280 <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
281@@ -574,12 +576,12 @@
282 <form string="Statement lines">
283 <field name="date"/>
284 <field name="name"/>
285+ <field name="ref"/>
286+ <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
287 <field name="type" on_change="onchange_type(partner_id, type)"/>
288- <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
289 <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
290 <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
291 <field name="amount"/>
292- <field name="ref"/>
293 <field name="sequence" readonly="0"/>
294 <separator colspan="4" string="Notes"/>
295 <field colspan="4" name="note" nolabel="1"/>
296@@ -744,7 +746,6 @@
297 <group col="2" colspan="2">
298 <separator string="Reporting Configuration" colspan="4"/>
299 <field name="report_type" select="2"/>
300- <field name="sign"/>
301 </group>
302 <group col="2" colspan="2">
303 <separator string="Closing Method" colspan="4"/>
304@@ -2385,12 +2386,13 @@
305 <attribute name='string'></attribute>
306 </xpath>
307 <group string="res_config_contents" position="replace">
308- <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
309+ <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
310 <field name ="code_digits" groups="base.group_extended"/>
311 <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
312 <field name ="seq_journal" groups="base.group_extended"/>
313- <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
314- <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
315+ <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
316+ <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
317+ <newline/>
318 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
319 <form string="Bank Information">
320 <field name="acc_name"/>
321@@ -2567,7 +2569,7 @@
322 <field name="date" groups="base.group_extended"/>
323 <field name="name"/>
324 <field name="ref"/>
325- <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
326+ <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
327 <field name="type" on_change="onchange_type(partner_id, type)"/>
328 <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
329 <field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
330@@ -2576,12 +2578,12 @@
331 <form string="Statement lines">
332 <field name="date"/>
333 <field name="name"/>
334+ <field name="ref"/>
335+ <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
336 <field name="type" on_change="onchange_type(partner_id, type)"/>
337- <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
338 <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
339 <field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
340 <field name="amount"/>
341- <field name="ref"/>
342 <field name="sequence"/>
343 <separator colspan="4" string="Notes"/>
344 <field colspan="4" name="note" nolabel="1"/>
345@@ -2693,14 +2695,6 @@
346 <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines"
347 parent="menu_finance_bank_and_cash"/>
348
349- <record id="action_partner_all" model="ir.actions.act_window">
350- <field name="name">Partners</field>
351- <field name="type">ir.actions.act_window</field>
352- <field name="res_model">res.partner</field>
353- <field name="view_type">form</field>
354- <field name="filter" eval="True"/>
355- </record>
356-
357 <menuitem id="menu_account_customer" name="Customers"
358 parent="menu_finance_receivables"
359 action="base.action_partner_customer_form" sequence="100"/>
360
361=== modified file 'account/board_account_view.xml' (properties changed: -x to +x)
362--- account/board_account_view.xml 2010-12-30 15:03:40 +0000
363+++ account/board_account_view.xml 2011-01-13 18:00:31 +0000
364@@ -27,6 +27,7 @@
365 <field name="view_mode">tree,graph</field>
366 <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
367 <field name="view_id" ref="account.view_account_entries_report_tree"/>
368+ <field name="domain">[('year','=',time.strftime('%Y'))]</field>
369 </record>
370 <record id="action_treasory_graph" model="ir.actions.act_window">
371 <field name="name">Treasury</field>
372
373=== modified file 'account/company.py' (properties changed: -x to +x)
374=== modified file 'account/company_view.xml' (properties changed: -x to +x)
375=== modified file 'account/configurable_account_chart.xml' (properties changed: -x to +x)
376=== modified file 'account/data/account_data2.xml' (properties changed: -x to +x)
377=== modified file 'account/data/account_invoice.xml' (properties changed: -x to +x)
378=== modified file 'account/demo/account_minimal.xml' (properties changed: -x to +x)
379=== modified file 'account/i18n/account.pot' (properties changed: -x to +x)
380--- account/i18n/account.pot 2011-01-11 11:21:50 +0000
381+++ account/i18n/account.pot 2011-01-13 18:00:31 +0000
382@@ -28,7 +28,7 @@
383 #. module: account
384 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
385 #, python-format
386-msgid "No journal for ending writing has been defined for the fiscal year"
387+msgid "No End of year journal defined for the fiscal year"
388 msgstr ""
389
390 #. module: account
391@@ -3921,6 +3921,12 @@
392 msgstr ""
393
394 #. module: account
395+#: constraint:account.account:0
396+msgid "You cannot create an account! \n"
397+"Make sure if the account has children then it should be type \"View\"!"
398+msgstr ""
399+
400+#. module: account
401 #: view:account.subscription.generate:0
402 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
403 #: model:ir.ui.menu,name:account.menu_generate_subscription
404@@ -8719,6 +8725,12 @@
405 msgstr ""
406
407 #. module: account
408+#: constraint:account.account.template:0
409+msgid "You cannot create an account template! \n"
410+"Make sure if the account template has parent then it should be type \"View\"! "
411+msgstr ""
412+
413+#. module: account
414 #: view:account.subscription:0
415 msgid "Recurring"
416 msgstr ""
417
418=== modified file 'account/i18n/ar.po' (properties changed: -x to +x)
419--- account/i18n/ar.po 2011-01-06 05:38:49 +0000
420+++ account/i18n/ar.po 2011-01-13 18:00:31 +0000
421@@ -29,7 +29,7 @@
422 #. module: account
423 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
424 #, python-format
425-msgid "No journal for ending writing has been defined for the fiscal year"
426+msgid "No End of year journal defined for the fiscal year"
427 msgstr ""
428
429 #. module: account
430@@ -4095,6 +4095,12 @@
431 msgstr ""
432
433 #. module: account
434+#: constraint:account.account:0
435+msgid "You cannot create an account! \n"
436+"Make sure if the account has children then it should be type \"View\"!"
437+msgstr ""
438+
439+#. module: account
440 #: view:account.subscription.generate:0
441 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
442 #: model:ir.ui.menu,name:account.menu_generate_subscription
443@@ -9173,6 +9179,12 @@
444 msgstr ""
445
446 #. module: account
447+#: constraint:account.account.template:0
448+msgid "You cannot create an account template! \n"
449+"Make sure if the account template has parent then it should be type \"View\"! "
450+msgstr ""
451+
452+#. module: account
453 #: view:account.subscription:0
454 msgid "Recurring"
455 msgstr ""
456
457=== modified file 'account/i18n/bg.po' (properties changed: -x to +x)
458--- account/i18n/bg.po 2011-01-06 05:38:49 +0000
459+++ account/i18n/bg.po 2011-01-13 18:00:31 +0000
460@@ -29,8 +29,8 @@
461 #. module: account
462 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
463 #, python-format
464-msgid "No journal for ending writing has been defined for the fiscal year"
465-msgstr "Не е зададен дневник за краен запис за финансовата година"
466+msgid "No End of year journal defined for the fiscal year"
467+msgstr ""
468
469 #. module: account
470 #: code:addons/account/account.py:506
471@@ -4112,6 +4112,12 @@
472 msgstr "Грешка! Не могат да бъдат създавани рекурсивни сметки."
473
474 #. module: account
475+#: constraint:account.account:0
476+msgid "You cannot create an account! \n"
477+"Make sure if the account has children then it should be type \"View\"!"
478+msgstr ""
479+
480+#. module: account
481 #: view:account.subscription.generate:0
482 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
483 #: model:ir.ui.menu,name:account.menu_generate_subscription
484@@ -9209,6 +9215,12 @@
485 msgstr ""
486
487 #. module: account
488+#: constraint:account.account.template:0
489+msgid "You cannot create an account template! \n"
490+"Make sure if the account template has parent then it should be type \"View\"! "
491+msgstr ""
492+
493+#. module: account
494 #: view:account.subscription:0
495 msgid "Recurring"
496 msgstr ""
497
498=== modified file 'account/i18n/br.po' (properties changed: -x to +x)
499--- account/i18n/br.po 2011-01-06 05:38:49 +0000
500+++ account/i18n/br.po 2011-01-13 18:00:31 +0000
501@@ -30,7 +30,7 @@
502 #. module: account
503 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
504 #, python-format
505-msgid "No journal for ending writing has been defined for the fiscal year"
506+msgid "No End of year journal defined for the fiscal year"
507 msgstr ""
508
509 #. module: account
510@@ -4096,6 +4096,12 @@
511 msgstr ""
512
513 #. module: account
514+#: constraint:account.account:0
515+msgid "You cannot create an account! \n"
516+"Make sure if the account has children then it should be type \"View\"!"
517+msgstr ""
518+
519+#. module: account
520 #: view:account.subscription.generate:0
521 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
522 #: model:ir.ui.menu,name:account.menu_generate_subscription
523@@ -9171,6 +9177,12 @@
524 msgstr ""
525
526 #. module: account
527+#: constraint:account.account.template:0
528+msgid "You cannot create an account template! \n"
529+"Make sure if the account template has parent then it should be type \"View\"! "
530+msgstr ""
531+
532+#. module: account
533 #: view:account.subscription:0
534 msgid "Recurring"
535 msgstr ""
536
537=== modified file 'account/i18n/bs.po' (properties changed: -x to +x)
538--- account/i18n/bs.po 2011-01-06 05:38:49 +0000
539+++ account/i18n/bs.po 2011-01-13 18:00:31 +0000
540@@ -29,7 +29,7 @@
541 #. module: account
542 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
543 #, python-format
544-msgid "No journal for ending writing has been defined for the fiscal year"
545+msgid "No End of year journal defined for the fiscal year"
546 msgstr ""
547
548 #. module: account
549@@ -4123,6 +4123,12 @@
550 msgstr "Greška: ne mogu se praviti rekurzivni nalozi."
551
552 #. module: account
553+#: constraint:account.account:0
554+msgid "You cannot create an account! \n"
555+"Make sure if the account has children then it should be type \"View\"!"
556+msgstr ""
557+
558+#. module: account
559 #: view:account.subscription.generate:0
560 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
561 #: model:ir.ui.menu,name:account.menu_generate_subscription
562@@ -9232,6 +9238,12 @@
563 msgstr ""
564
565 #. module: account
566+#: constraint:account.account.template:0
567+msgid "You cannot create an account template! \n"
568+"Make sure if the account template has parent then it should be type \"View\"! "
569+msgstr ""
570+
571+#. module: account
572 #: view:account.subscription:0
573 msgid "Recurring"
574 msgstr ""
575
576=== modified file 'account/i18n/ca.po' (properties changed: -x to +x)
577--- account/i18n/ca.po 2011-01-06 05:38:49 +0000
578+++ account/i18n/ca.po 2011-01-13 18:00:31 +0000
579@@ -30,9 +30,8 @@
580 #. module: account
581 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
582 #, python-format
583-msgid "No journal for ending writing has been defined for the fiscal year"
584+msgid "No End of year journal defined for the fiscal year"
585 msgstr ""
586-"No s'ha definit un diari per l'assentament de tancament per l'exercici fiscal"
587
588 #. module: account
589 #: code:addons/account/account.py:506
590@@ -4142,6 +4141,12 @@
591 msgstr "Error! No es poden crear comptes recursius."
592
593 #. module: account
594+#: constraint:account.account:0
595+msgid "You cannot create an account! \n"
596+"Make sure if the account has children then it should be type \"View\"!"
597+msgstr ""
598+
599+#. module: account
600 #: view:account.subscription.generate:0
601 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
602 #: model:ir.ui.menu,name:account.menu_generate_subscription
603@@ -9271,6 +9276,12 @@
604 msgstr ""
605
606 #. module: account
607+#: constraint:account.account.template:0
608+msgid "You cannot create an account template! \n"
609+"Make sure if the account template has parent then it should be type \"View\"! "
610+msgstr ""
611+
612+#. module: account
613 #: view:account.subscription:0
614 msgid "Recurring"
615 msgstr ""
616
617=== modified file 'account/i18n/cs.po' (properties changed: -x to +x)
618--- account/i18n/cs.po 2011-01-06 05:38:49 +0000
619+++ account/i18n/cs.po 2011-01-13 18:00:31 +0000
620@@ -29,7 +29,7 @@
621 #. module: account
622 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
623 #, python-format
624-msgid "No journal for ending writing has been defined for the fiscal year"
625+msgid "No End of year journal defined for the fiscal year"
626 msgstr ""
627
628 #. module: account
629@@ -4095,6 +4095,12 @@
630 msgstr ""
631
632 #. module: account
633+#: constraint:account.account:0
634+msgid "You cannot create an account! \n"
635+"Make sure if the account has children then it should be type \"View\"!"
636+msgstr ""
637+
638+#. module: account
639 #: view:account.subscription.generate:0
640 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
641 #: model:ir.ui.menu,name:account.menu_generate_subscription
642@@ -9170,6 +9176,12 @@
643 msgstr ""
644
645 #. module: account
646+#: constraint:account.account.template:0
647+msgid "You cannot create an account template! \n"
648+"Make sure if the account template has parent then it should be type \"View\"! "
649+msgstr ""
650+
651+#. module: account
652 #: view:account.subscription:0
653 msgid "Recurring"
654 msgstr ""
655
656=== modified file 'account/i18n/da.po' (properties changed: -x to +x)
657--- account/i18n/da.po 2011-01-06 05:38:49 +0000
658+++ account/i18n/da.po 2011-01-13 18:00:31 +0000
659@@ -30,7 +30,7 @@
660 #. module: account
661 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
662 #, python-format
663-msgid "No journal for ending writing has been defined for the fiscal year"
664+msgid "No End of year journal defined for the fiscal year"
665 msgstr ""
666
667 #. module: account
668@@ -4110,6 +4110,12 @@
669 msgstr ""
670
671 #. module: account
672+#: constraint:account.account:0
673+msgid "You cannot create an account! \n"
674+"Make sure if the account has children then it should be type \"View\"!"
675+msgstr ""
676+
677+#. module: account
678 #: view:account.subscription.generate:0
679 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
680 #: model:ir.ui.menu,name:account.menu_generate_subscription
681@@ -9190,6 +9196,12 @@
682 msgstr ""
683
684 #. module: account
685+#: constraint:account.account.template:0
686+msgid "You cannot create an account template! \n"
687+"Make sure if the account template has parent then it should be type \"View\"! "
688+msgstr ""
689+
690+#. module: account
691 #: view:account.subscription:0
692 msgid "Recurring"
693 msgstr ""
694
695=== modified file 'account/i18n/de.po' (properties changed: -x to +x)
696--- account/i18n/de.po 2011-01-11 05:03:13 +0000
697+++ account/i18n/de.po 2011-01-13 18:00:31 +0000
698@@ -30,9 +30,8 @@
699 #. module: account
700 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
701 #, python-format
702-msgid "No journal for ending writing has been defined for the fiscal year"
703+msgid "No End of year journal defined for the fiscal year"
704 msgstr ""
705-"Es ist kein Journal für die Abschlussbuchungen des Geschäftsjahres definiert"
706
707 #. module: account
708 #: code:addons/account/account.py:506
709@@ -4346,6 +4345,12 @@
710 msgstr "Fehler! Sie können keine rekursiven Konten definieren."
711
712 #. module: account
713+#: constraint:account.account:0
714+msgid "You cannot create an account! \n"
715+"Make sure if the account has children then it should be type \"View\"!"
716+msgstr ""
717+
718+#. module: account
719 #: view:account.subscription.generate:0
720 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
721 #: model:ir.ui.menu,name:account.menu_generate_subscription
722@@ -9835,6 +9840,12 @@
723 msgstr "Fehler ! Rekursive Finanzkontenvorlagen sind nicht erlaubt"
724
725 #. module: account
726+#: constraint:account.account.template:0
727+msgid "You cannot create an account template! \n"
728+"Make sure if the account template has parent then it should be type \"View\"! "
729+msgstr ""
730+
731+#. module: account
732 #: view:account.subscription:0
733 msgid "Recurring"
734 msgstr "Wiederkehrend"
735
736=== modified file 'account/i18n/el.po' (properties changed: -x to +x)
737--- account/i18n/el.po 2011-01-06 05:38:49 +0000
738+++ account/i18n/el.po 2011-01-13 18:00:31 +0000
739@@ -30,9 +30,8 @@
740 #. module: account
741 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
742 #, python-format
743-msgid "No journal for ending writing has been defined for the fiscal year"
744+msgid "No End of year journal defined for the fiscal year"
745 msgstr ""
746-"Δεν έχει καθοριστεί ημερολόγιο τέλους εγγραφών για την διαχειριστική χρήση"
747
748 #. module: account
749 #: code:addons/account/account.py:506
750@@ -4173,6 +4172,12 @@
751 "Σφάλμα! Δεν μπορείτε να χρησιμοποιήσετε επαναλαμβανόμενους λογαριασμούς."
752
753 #. module: account
754+#: constraint:account.account:0
755+msgid "You cannot create an account! \n"
756+"Make sure if the account has children then it should be type \"View\"!"
757+msgstr ""
758+
759+#. module: account
760 #: view:account.subscription.generate:0
761 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
762 #: model:ir.ui.menu,name:account.menu_generate_subscription
763@@ -9303,6 +9308,12 @@
764 msgstr ""
765
766 #. module: account
767+#: constraint:account.account.template:0
768+msgid "You cannot create an account template! \n"
769+"Make sure if the account template has parent then it should be type \"View\"! "
770+msgstr ""
771+
772+#. module: account
773 #: view:account.subscription:0
774 msgid "Recurring"
775 msgstr ""
776
777=== modified file 'account/i18n/en_US.po'
778--- account/i18n/en_US.po 2011-01-10 05:19:37 +0000
779+++ account/i18n/en_US.po 2011-01-13 18:00:31 +0000
780@@ -4100,6 +4100,12 @@
781 msgstr ""
782
783 #. module: account
784+#: constraint:account.account:0
785+msgid "You cannot create an account! \n"
786+"Make sure if the account has children then it should be type \"View\"!"
787+msgstr ""
788+
789+#. module: account
790 #: view:account.subscription.generate:0
791 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
792 #: model:ir.ui.menu,name:account.menu_generate_subscription
793@@ -9175,6 +9181,12 @@
794 msgstr ""
795
796 #. module: account
797+#: constraint:account.account.template:0
798+msgid "You cannot create an account template! \n"
799+"Make sure if the account template has parent then it should be type \"View\"! "
800+msgstr ""
801+
802+#. module: account
803 #: view:account.subscription:0
804 msgid "Recurring"
805 msgstr ""
806
807=== modified file 'account/i18n/es.po' (properties changed: -x to +x)
808--- account/i18n/es.po 2011-01-11 05:03:13 +0000
809+++ account/i18n/es.po 2011-01-13 18:00:31 +0000
810@@ -29,10 +29,8 @@
811 #. module: account
812 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
813 #, python-format
814-msgid "No journal for ending writing has been defined for the fiscal year"
815+msgid "No End of year journal defined for the fiscal year"
816 msgstr ""
817-"No se ha definido un diario para el asiento de cierre para el ejercicio "
818-"fiscal"
819
820 #. module: account
821 #: code:addons/account/account.py:506
822@@ -4317,6 +4315,12 @@
823 msgstr "¡Error! No se pueden crear cuentas recursivas."
824
825 #. module: account
826+#: constraint:account.account:0
827+msgid "You cannot create an account! \n"
828+"Make sure if the account has children then it should be type \"View\"!"
829+msgstr ""
830+
831+#. module: account
832 #: view:account.subscription.generate:0
833 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
834 #: model:ir.ui.menu,name:account.menu_generate_subscription
835@@ -9700,6 +9704,12 @@
836 msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
837
838 #. module: account
839+#: constraint:account.account.template:0
840+msgid "You cannot create an account template! \n"
841+"Make sure if the account template has parent then it should be type \"View\"! "
842+msgstr ""
843+
844+#. module: account
845 #: view:account.subscription:0
846 msgid "Recurring"
847 msgstr "Recurrente"
848
849=== modified file 'account/i18n/es_AR.po' (properties changed: -x to +x)
850--- account/i18n/es_AR.po 2011-01-06 05:38:49 +0000
851+++ account/i18n/es_AR.po 2011-01-13 18:00:31 +0000
852@@ -29,10 +29,8 @@
853 #. module: account
854 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
855 #, python-format
856-msgid "No journal for ending writing has been defined for the fiscal year"
857+msgid "No End of year journal defined for the fiscal year"
858 msgstr ""
859-"No se ha definido un libro diario para el asiento de cierre para el "
860-"ejercicio fiscal"
861
862 #. module: account
863 #: code:addons/account/account.py:506
864@@ -4143,6 +4141,12 @@
865 msgstr "Error! No se pueden crear cuentas recursivas."
866
867 #. module: account
868+#: constraint:account.account:0
869+msgid "You cannot create an account! \n"
870+"Make sure if the account has children then it should be type \"View\"!"
871+msgstr ""
872+
873+#. module: account
874 #: view:account.subscription.generate:0
875 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
876 #: model:ir.ui.menu,name:account.menu_generate_subscription
877@@ -9276,6 +9280,12 @@
878 msgstr ""
879
880 #. module: account
881+#: constraint:account.account.template:0
882+msgid "You cannot create an account template! \n"
883+"Make sure if the account template has parent then it should be type \"View\"! "
884+msgstr ""
885+
886+#. module: account
887 #: view:account.subscription:0
888 msgid "Recurring"
889 msgstr ""
890
891=== modified file 'account/i18n/es_EC.po' (properties changed: -x to +x)
892--- account/i18n/es_EC.po 2011-01-12 04:58:46 +0000
893+++ account/i18n/es_EC.po 2011-01-13 18:00:31 +0000
894@@ -32,8 +32,8 @@
895 #. module: account
896 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
897 #, python-format
898-msgid "No journal for ending writing has been defined for the fiscal year"
899-msgstr "No hay diario definido para el cierre de ejercicio fiscal"
900+msgid "No End of year journal defined for the fiscal year"
901+msgstr ""
902
903 #. module: account
904 #: code:addons/account/account.py:506
905@@ -4305,6 +4305,12 @@
906 msgstr "¡Error! No se pueden crear cuentas recursivas."
907
908 #. module: account
909+#: constraint:account.account:0
910+msgid "You cannot create an account! \n"
911+"Make sure if the account has children then it should be type \"View\"!"
912+msgstr ""
913+
914+#. module: account
915 #: view:account.subscription.generate:0
916 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
917 #: model:ir.ui.menu,name:account.menu_generate_subscription
918@@ -9726,6 +9732,12 @@
919 msgstr "Error ! You can not create recursive account templates."
920
921 #. module: account
922+#: constraint:account.account.template:0
923+msgid "You cannot create an account template! \n"
924+"Make sure if the account template has parent then it should be type \"View\"! "
925+msgstr ""
926+
927+#. module: account
928 #: view:account.subscription:0
929 msgid "Recurring"
930 msgstr "Recurring"
931
932=== modified file 'account/i18n/et.po' (properties changed: -x to +x)
933--- account/i18n/et.po 2011-01-06 05:38:49 +0000
934+++ account/i18n/et.po 2011-01-13 18:00:31 +0000
935@@ -29,7 +29,7 @@
936 #. module: account
937 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
938 #, python-format
939-msgid "No journal for ending writing has been defined for the fiscal year"
940+msgid "No End of year journal defined for the fiscal year"
941 msgstr ""
942
943 #. module: account
944@@ -4095,6 +4095,12 @@
945 msgstr "Viga! Sa ei saa luua rekursiivseid kontosid."
946
947 #. module: account
948+#: constraint:account.account:0
949+msgid "You cannot create an account! \n"
950+"Make sure if the account has children then it should be type \"View\"!"
951+msgstr ""
952+
953+#. module: account
954 #: view:account.subscription.generate:0
955 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
956 #: model:ir.ui.menu,name:account.menu_generate_subscription
957@@ -9171,6 +9177,12 @@
958 msgstr ""
959
960 #. module: account
961+#: constraint:account.account.template:0
962+msgid "You cannot create an account template! \n"
963+"Make sure if the account template has parent then it should be type \"View\"! "
964+msgstr ""
965+
966+#. module: account
967 #: view:account.subscription:0
968 msgid "Recurring"
969 msgstr ""
970
971=== modified file 'account/i18n/eu.po' (properties changed: -x to +x)
972--- account/i18n/eu.po 2011-01-06 05:38:49 +0000
973+++ account/i18n/eu.po 2011-01-13 18:00:31 +0000
974@@ -30,7 +30,7 @@
975 #. module: account
976 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
977 #, python-format
978-msgid "No journal for ending writing has been defined for the fiscal year"
979+msgid "No End of year journal defined for the fiscal year"
980 msgstr ""
981
982 #. module: account
983@@ -4096,6 +4096,12 @@
984 msgstr ""
985
986 #. module: account
987+#: constraint:account.account:0
988+msgid "You cannot create an account! \n"
989+"Make sure if the account has children then it should be type \"View\"!"
990+msgstr ""
991+
992+#. module: account
993 #: view:account.subscription.generate:0
994 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
995 #: model:ir.ui.menu,name:account.menu_generate_subscription
996@@ -9171,6 +9177,12 @@
997 msgstr ""
998
999 #. module: account
1000+#: constraint:account.account.template:0
1001+msgid "You cannot create an account template! \n"
1002+"Make sure if the account template has parent then it should be type \"View\"! "
1003+msgstr ""
1004+
1005+#. module: account
1006 #: view:account.subscription:0
1007 msgid "Recurring"
1008 msgstr ""
1009
1010=== modified file 'account/i18n/fa.po' (properties changed: -x to +x)
1011--- account/i18n/fa.po 2011-01-06 05:38:49 +0000
1012+++ account/i18n/fa.po 2011-01-13 18:00:31 +0000
1013@@ -30,7 +30,7 @@
1014 #. module: account
1015 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1016 #, python-format
1017-msgid "No journal for ending writing has been defined for the fiscal year"
1018+msgid "No End of year journal defined for the fiscal year"
1019 msgstr ""
1020
1021 #. module: account
1022@@ -4096,6 +4096,12 @@
1023 msgstr ""
1024
1025 #. module: account
1026+#: constraint:account.account:0
1027+msgid "You cannot create an account! \n"
1028+"Make sure if the account has children then it should be type \"View\"!"
1029+msgstr ""
1030+
1031+#. module: account
1032 #: view:account.subscription.generate:0
1033 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1034 #: model:ir.ui.menu,name:account.menu_generate_subscription
1035@@ -9171,6 +9177,12 @@
1036 msgstr ""
1037
1038 #. module: account
1039+#: constraint:account.account.template:0
1040+msgid "You cannot create an account template! \n"
1041+"Make sure if the account template has parent then it should be type \"View\"! "
1042+msgstr ""
1043+
1044+#. module: account
1045 #: view:account.subscription:0
1046 msgid "Recurring"
1047 msgstr ""
1048
1049=== modified file 'account/i18n/fi.po' (properties changed: -x to +x)
1050--- account/i18n/fi.po 2011-01-06 05:38:49 +0000
1051+++ account/i18n/fi.po 2011-01-13 18:00:31 +0000
1052@@ -30,8 +30,8 @@
1053 #. module: account
1054 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1055 #, python-format
1056-msgid "No journal for ending writing has been defined for the fiscal year"
1057-msgstr "Tilinpäätökselle ei ole määritelty päiväkirjaa tälle tilikaudelle"
1058+msgid "No End of year journal defined for the fiscal year"
1059+msgstr ""
1060
1061 #. module: account
1062 #: code:addons/account/account.py:506
1063@@ -4127,6 +4127,12 @@
1064 msgstr "Virhe! et voi luoda rekursiivisia tilejä"
1065
1066 #. module: account
1067+#: constraint:account.account:0
1068+msgid "You cannot create an account! \n"
1069+"Make sure if the account has children then it should be type \"View\"!"
1070+msgstr ""
1071+
1072+#. module: account
1073 #: view:account.subscription.generate:0
1074 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1075 #: model:ir.ui.menu,name:account.menu_generate_subscription
1076@@ -9242,6 +9248,12 @@
1077 msgstr ""
1078
1079 #. module: account
1080+#: constraint:account.account.template:0
1081+msgid "You cannot create an account template! \n"
1082+"Make sure if the account template has parent then it should be type \"View\"! "
1083+msgstr ""
1084+
1085+#. module: account
1086 #: view:account.subscription:0
1087 msgid "Recurring"
1088 msgstr ""
1089
1090=== modified file 'account/i18n/fr.po' (properties changed: -x to +x)
1091--- account/i18n/fr.po 2011-01-08 05:02:08 +0000
1092+++ account/i18n/fr.po 2011-01-13 18:00:31 +0000
1093@@ -104,10 +104,8 @@
1094 #. module: account
1095 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1096 #, python-format
1097-msgid "No journal for ending writing has been defined for the fiscal year"
1098+msgid "No End of year journal defined for the fiscal year"
1099 msgstr ""
1100-"Aucun journal n'a été défini pour l'écriture finale pour cet exercice "
1101-"comptable"
1102
1103 #. module: account
1104 #: code:addons/account/account.py:506
1105@@ -4379,6 +4377,12 @@
1106 msgstr "Erreur ! Vous ne pouvez pas créer de comptes récursifs."
1107
1108 #. module: account
1109+#: constraint:account.account:0
1110+msgid "You cannot create an account! \n"
1111+"Make sure if the account has children then it should be type \"View\"!"
1112+msgstr ""
1113+
1114+#. module: account
1115 #: view:account.subscription.generate:0
1116 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1117 #: model:ir.ui.menu,name:account.menu_generate_subscription
1118@@ -9825,6 +9829,12 @@
1119 msgstr "Erreur ! Vous ne pouvez pas créer de modèles de compte récursifs"
1120
1121 #. module: account
1122+#: constraint:account.account.template:0
1123+msgid "You cannot create an account template! \n"
1124+"Make sure if the account template has parent then it should be type \"View\"! "
1125+msgstr ""
1126+
1127+#. module: account
1128 #: view:account.subscription:0
1129 msgid "Recurring"
1130 msgstr "Récurrent"
1131
1132=== modified file 'account/i18n/fr_BE.po'
1133--- account/i18n/fr_BE.po 2011-01-06 05:38:49 +0000
1134+++ account/i18n/fr_BE.po 2011-01-13 18:00:31 +0000
1135@@ -30,7 +30,7 @@
1136 #. module: account
1137 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1138 #, python-format
1139-msgid "No journal for ending writing has been defined for the fiscal year"
1140+msgid "No End of year journal defined for the fiscal year"
1141 msgstr ""
1142
1143 #. module: account
1144@@ -4098,6 +4098,12 @@
1145 msgstr ""
1146
1147 #. module: account
1148+#: constraint:account.account:0
1149+msgid "You cannot create an account! \n"
1150+"Make sure if the account has children then it should be type \"View\"!"
1151+msgstr ""
1152+
1153+#. module: account
1154 #: view:account.subscription.generate:0
1155 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1156 #: model:ir.ui.menu,name:account.menu_generate_subscription
1157@@ -9174,6 +9180,12 @@
1158 msgstr ""
1159
1160 #. module: account
1161+#: constraint:account.account.template:0
1162+msgid "You cannot create an account template! \n"
1163+"Make sure if the account template has parent then it should be type \"View\"! "
1164+msgstr ""
1165+
1166+#. module: account
1167 #: view:account.subscription:0
1168 msgid "Recurring"
1169 msgstr ""
1170
1171=== modified file 'account/i18n/gl.po' (properties changed: -x to +x)
1172--- account/i18n/gl.po 2011-01-08 05:02:08 +0000
1173+++ account/i18n/gl.po 2011-01-13 18:00:31 +0000
1174@@ -30,7 +30,7 @@
1175 #. module: account
1176 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1177 #, python-format
1178-msgid "No journal for ending writing has been defined for the fiscal year"
1179+msgid "No End of year journal defined for the fiscal year"
1180 msgstr ""
1181
1182 #. module: account
1183@@ -4096,6 +4096,12 @@
1184 msgstr ""
1185
1186 #. module: account
1187+#: constraint:account.account:0
1188+msgid "You cannot create an account! \n"
1189+"Make sure if the account has children then it should be type \"View\"!"
1190+msgstr ""
1191+
1192+#. module: account
1193 #: view:account.subscription.generate:0
1194 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1195 #: model:ir.ui.menu,name:account.menu_generate_subscription
1196@@ -9171,6 +9177,12 @@
1197 msgstr ""
1198
1199 #. module: account
1200+#: constraint:account.account.template:0
1201+msgid "You cannot create an account template! \n"
1202+"Make sure if the account template has parent then it should be type \"View\"! "
1203+msgstr ""
1204+
1205+#. module: account
1206 #: view:account.subscription:0
1207 msgid "Recurring"
1208 msgstr ""
1209
1210=== modified file 'account/i18n/gu.po' (properties changed: -x to +x)
1211--- account/i18n/gu.po 2011-01-06 05:38:49 +0000
1212+++ account/i18n/gu.po 2011-01-13 18:00:31 +0000
1213@@ -30,7 +30,7 @@
1214 #. module: account
1215 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1216 #, python-format
1217-msgid "No journal for ending writing has been defined for the fiscal year"
1218+msgid "No End of year journal defined for the fiscal year"
1219 msgstr ""
1220
1221 #. module: account
1222@@ -4096,6 +4096,12 @@
1223 msgstr ""
1224
1225 #. module: account
1226+#: constraint:account.account:0
1227+msgid "You cannot create an account! \n"
1228+"Make sure if the account has children then it should be type \"View\"!"
1229+msgstr ""
1230+
1231+#. module: account
1232 #: view:account.subscription.generate:0
1233 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1234 #: model:ir.ui.menu,name:account.menu_generate_subscription
1235@@ -9171,6 +9177,12 @@
1236 msgstr ""
1237
1238 #. module: account
1239+#: constraint:account.account.template:0
1240+msgid "You cannot create an account template! \n"
1241+"Make sure if the account template has parent then it should be type \"View\"! "
1242+msgstr ""
1243+
1244+#. module: account
1245 #: view:account.subscription:0
1246 msgid "Recurring"
1247 msgstr ""
1248
1249=== modified file 'account/i18n/he.po' (properties changed: -x to +x)
1250--- account/i18n/he.po 2011-01-06 05:38:49 +0000
1251+++ account/i18n/he.po 2011-01-13 18:00:31 +0000
1252@@ -30,7 +30,7 @@
1253 #. module: account
1254 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1255 #, python-format
1256-msgid "No journal for ending writing has been defined for the fiscal year"
1257+msgid "No End of year journal defined for the fiscal year"
1258 msgstr ""
1259
1260 #. module: account
1261@@ -4096,6 +4096,12 @@
1262 msgstr ""
1263
1264 #. module: account
1265+#: constraint:account.account:0
1266+msgid "You cannot create an account! \n"
1267+"Make sure if the account has children then it should be type \"View\"!"
1268+msgstr ""
1269+
1270+#. module: account
1271 #: view:account.subscription.generate:0
1272 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1273 #: model:ir.ui.menu,name:account.menu_generate_subscription
1274@@ -9171,6 +9177,12 @@
1275 msgstr ""
1276
1277 #. module: account
1278+#: constraint:account.account.template:0
1279+msgid "You cannot create an account template! \n"
1280+"Make sure if the account template has parent then it should be type \"View\"! "
1281+msgstr ""
1282+
1283+#. module: account
1284 #: view:account.subscription:0
1285 msgid "Recurring"
1286 msgstr ""
1287
1288=== modified file 'account/i18n/hi.po' (properties changed: -x to +x)
1289--- account/i18n/hi.po 2011-01-06 05:38:49 +0000
1290+++ account/i18n/hi.po 2011-01-13 18:00:31 +0000
1291@@ -30,7 +30,7 @@
1292 #. module: account
1293 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1294 #, python-format
1295-msgid "No journal for ending writing has been defined for the fiscal year"
1296+msgid "No End of year journal defined for the fiscal year"
1297 msgstr "वितीय वर्ष की समाप्ति के लिए जोर्नल परिभाषित नहीं है"
1298
1299 #. module: account
1300@@ -4097,6 +4097,12 @@
1301 msgstr ""
1302
1303 #. module: account
1304+#: constraint:account.account:0
1305+msgid "You cannot create an account! \n"
1306+"Make sure if the account has children then it should be type \"View\"!"
1307+msgstr ""
1308+
1309+#. module: account
1310 #: view:account.subscription.generate:0
1311 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1312 #: model:ir.ui.menu,name:account.menu_generate_subscription
1313@@ -9172,6 +9178,12 @@
1314 msgstr ""
1315
1316 #. module: account
1317+#: constraint:account.account.template:0
1318+msgid "You cannot create an account template! \n"
1319+"Make sure if the account template has parent then it should be type \"View\"! "
1320+msgstr ""
1321+
1322+#. module: account
1323 #: view:account.subscription:0
1324 msgid "Recurring"
1325 msgstr ""
1326
1327=== modified file 'account/i18n/hr.po' (properties changed: -x to +x)
1328--- account/i18n/hr.po 2011-01-06 05:38:49 +0000
1329+++ account/i18n/hr.po 2011-01-13 18:00:31 +0000
1330@@ -29,7 +29,7 @@
1331 #. module: account
1332 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1333 #, python-format
1334-msgid "No journal for ending writing has been defined for the fiscal year"
1335+msgid "No End of year journal defined for the fiscal year"
1336 msgstr ""
1337
1338 #. module: account
1339@@ -4109,6 +4109,12 @@
1340 msgstr "Greška ! Ne možete kreirati rekurzivna konta."
1341
1342 #. module: account
1343+#: constraint:account.account:0
1344+msgid "You cannot create an account! \n"
1345+"Make sure if the account has children then it should be type \"View\"!"
1346+msgstr ""
1347+
1348+#. module: account
1349 #: view:account.subscription.generate:0
1350 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1351 #: model:ir.ui.menu,name:account.menu_generate_subscription
1352@@ -9202,6 +9208,12 @@
1353 msgstr ""
1354
1355 #. module: account
1356+#: constraint:account.account.template:0
1357+msgid "You cannot create an account template! \n"
1358+"Make sure if the account template has parent then it should be type \"View\"! "
1359+msgstr ""
1360+
1361+#. module: account
1362 #: view:account.subscription:0
1363 msgid "Recurring"
1364 msgstr ""
1365
1366=== modified file 'account/i18n/hu.po' (properties changed: -x to +x)
1367--- account/i18n/hu.po 2011-01-06 05:38:49 +0000
1368+++ account/i18n/hu.po 2011-01-13 18:00:31 +0000
1369@@ -29,7 +29,7 @@
1370 #. module: account
1371 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1372 #, python-format
1373-msgid "No journal for ending writing has been defined for the fiscal year"
1374+msgid "No End of year journal defined for the fiscal year"
1375 msgstr ""
1376
1377 #. module: account
1378@@ -4095,6 +4095,12 @@
1379 msgstr "Hiba! Nem lehet létrehozni rekurzív számlákat."
1380
1381 #. module: account
1382+#: constraint:account.account:0
1383+msgid "You cannot create an account! \n"
1384+"Make sure if the account has children then it should be type \"View\"!"
1385+msgstr ""
1386+
1387+#. module: account
1388 #: view:account.subscription.generate:0
1389 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1390 #: model:ir.ui.menu,name:account.menu_generate_subscription
1391@@ -9177,6 +9183,12 @@
1392 msgstr ""
1393
1394 #. module: account
1395+#: constraint:account.account.template:0
1396+msgid "You cannot create an account template! \n"
1397+"Make sure if the account template has parent then it should be type \"View\"! "
1398+msgstr ""
1399+
1400+#. module: account
1401 #: view:account.subscription:0
1402 msgid "Recurring"
1403 msgstr ""
1404
1405=== modified file 'account/i18n/id.po' (properties changed: -x to +x)
1406--- account/i18n/id.po 2011-01-12 04:58:46 +0000
1407+++ account/i18n/id.po 2011-01-13 18:00:31 +0000
1408@@ -30,7 +30,7 @@
1409 #. module: account
1410 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1411 #, python-format
1412-msgid "No journal for ending writing has been defined for the fiscal year"
1413+msgid "No End of year journal defined for the fiscal year"
1414 msgstr ""
1415
1416 #. module: account
1417@@ -4098,6 +4098,12 @@
1418 msgstr ""
1419
1420 #. module: account
1421+#: constraint:account.account:0
1422+msgid "You cannot create an account! \n"
1423+"Make sure if the account has children then it should be type \"View\"!"
1424+msgstr ""
1425+
1426+#. module: account
1427 #: view:account.subscription.generate:0
1428 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1429 #: model:ir.ui.menu,name:account.menu_generate_subscription
1430@@ -9177,6 +9183,12 @@
1431 msgstr ""
1432
1433 #. module: account
1434+#: constraint:account.account.template:0
1435+msgid "You cannot create an account template! \n"
1436+"Make sure if the account template has parent then it should be type \"View\"! "
1437+msgstr ""
1438+
1439+#. module: account
1440 #: view:account.subscription:0
1441 msgid "Recurring"
1442 msgstr ""
1443
1444=== modified file 'account/i18n/it.po' (properties changed: -x to +x)
1445--- account/i18n/it.po 2011-01-11 05:03:13 +0000
1446+++ account/i18n/it.po 2011-01-13 18:00:31 +0000
1447@@ -29,10 +29,8 @@
1448 #. module: account
1449 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1450 #, python-format
1451-msgid "No journal for ending writing has been defined for the fiscal year"
1452+msgid "No End of year journal defined for the fiscal year"
1453 msgstr ""
1454-"Nessun giornale è stato definito per l'anno fiscale per le scritture di "
1455-"chiusura"
1456
1457 #. module: account
1458 #: code:addons/account/account.py:506
1459@@ -4285,6 +4283,12 @@
1460 msgstr "Errore! Non puoi creare conti ricorsivi"
1461
1462 #. module: account
1463+#: constraint:account.account:0
1464+msgid "You cannot create an account! \n"
1465+"Make sure if the account has children then it should be type \"View\"!"
1466+msgstr ""
1467+
1468+#. module: account
1469 #: view:account.subscription.generate:0
1470 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1471 #: model:ir.ui.menu,name:account.menu_generate_subscription
1472@@ -9455,6 +9459,12 @@
1473 msgstr "Errore! Non puoi creare un modello di conto ricorsivo"
1474
1475 #. module: account
1476+#: constraint:account.account.template:0
1477+msgid "You cannot create an account template! \n"
1478+"Make sure if the account template has parent then it should be type \"View\"! "
1479+msgstr ""
1480+
1481+#. module: account
1482 #: view:account.subscription:0
1483 msgid "Recurring"
1484 msgstr "Ricorrente"
1485
1486=== modified file 'account/i18n/kab.po' (properties changed: -x to +x)
1487--- account/i18n/kab.po 2011-01-06 05:38:49 +0000
1488+++ account/i18n/kab.po 2011-01-13 18:00:31 +0000
1489@@ -30,7 +30,7 @@
1490 #. module: account
1491 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1492 #, python-format
1493-msgid "No journal for ending writing has been defined for the fiscal year"
1494+msgid "No End of year journal defined for the fiscal year"
1495 msgstr ""
1496
1497 #. module: account
1498@@ -4096,6 +4096,12 @@
1499 msgstr ""
1500
1501 #. module: account
1502+#: constraint:account.account:0
1503+msgid "You cannot create an account! \n"
1504+"Make sure if the account has children then it should be type \"View\"!"
1505+msgstr ""
1506+
1507+#. module: account
1508 #: view:account.subscription.generate:0
1509 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1510 #: model:ir.ui.menu,name:account.menu_generate_subscription
1511@@ -9171,6 +9177,12 @@
1512 msgstr ""
1513
1514 #. module: account
1515+#: constraint:account.account.template:0
1516+msgid "You cannot create an account template! \n"
1517+"Make sure if the account template has parent then it should be type \"View\"! "
1518+msgstr ""
1519+
1520+#. module: account
1521 #: view:account.subscription:0
1522 msgid "Recurring"
1523 msgstr ""
1524
1525=== modified file 'account/i18n/ko.po' (properties changed: -x to +x)
1526--- account/i18n/ko.po 2011-01-06 05:38:49 +0000
1527+++ account/i18n/ko.po 2011-01-13 18:00:31 +0000
1528@@ -30,8 +30,8 @@
1529 #. module: account
1530 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1531 #, python-format
1532-msgid "No journal for ending writing has been defined for the fiscal year"
1533-msgstr "당기에 정의된 마감 저널이 없음"
1534+msgid "No End of year journal defined for the fiscal year"
1535+msgstr ""
1536
1537 #. module: account
1538 #: code:addons/account/account.py:506
1539@@ -4096,6 +4096,12 @@
1540 msgstr ""
1541
1542 #. module: account
1543+#: constraint:account.account:0
1544+msgid "You cannot create an account! \n"
1545+"Make sure if the account has children then it should be type \"View\"!"
1546+msgstr ""
1547+
1548+#. module: account
1549 #: view:account.subscription.generate:0
1550 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1551 #: model:ir.ui.menu,name:account.menu_generate_subscription
1552@@ -9171,6 +9177,12 @@
1553 msgstr ""
1554
1555 #. module: account
1556+#: constraint:account.account.template:0
1557+msgid "You cannot create an account template! \n"
1558+"Make sure if the account template has parent then it should be type \"View\"! "
1559+msgstr ""
1560+
1561+#. module: account
1562 #: view:account.subscription:0
1563 msgid "Recurring"
1564 msgstr ""
1565
1566=== modified file 'account/i18n/lt.po' (properties changed: -x to +x)
1567--- account/i18n/lt.po 2011-01-06 05:38:49 +0000
1568+++ account/i18n/lt.po 2011-01-13 18:00:31 +0000
1569@@ -29,7 +29,7 @@
1570 #. module: account
1571 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1572 #, python-format
1573-msgid "No journal for ending writing has been defined for the fiscal year"
1574+msgid "No End of year journal defined for the fiscal year"
1575 msgstr ""
1576
1577 #. module: account
1578@@ -4117,6 +4117,12 @@
1579 msgstr "Klaida! Negalima sukurti rekursyvių sąskaitų."
1580
1581 #. module: account
1582+#: constraint:account.account:0
1583+msgid "You cannot create an account! \n"
1584+"Make sure if the account has children then it should be type \"View\"!"
1585+msgstr ""
1586+
1587+#. module: account
1588 #: view:account.subscription.generate:0
1589 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1590 #: model:ir.ui.menu,name:account.menu_generate_subscription
1591@@ -9220,6 +9226,12 @@
1592 msgstr ""
1593
1594 #. module: account
1595+#: constraint:account.account.template:0
1596+msgid "You cannot create an account template! \n"
1597+"Make sure if the account template has parent then it should be type \"View\"! "
1598+msgstr ""
1599+
1600+#. module: account
1601 #: view:account.subscription:0
1602 msgid "Recurring"
1603 msgstr ""
1604
1605=== modified file 'account/i18n/lv.po' (properties changed: -x to +x)
1606--- account/i18n/lv.po 2011-01-06 05:38:49 +0000
1607+++ account/i18n/lv.po 2011-01-13 18:00:31 +0000
1608@@ -30,8 +30,8 @@
1609 #. module: account
1610 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1611 #, python-format
1612-msgid "No journal for ending writing has been defined for the fiscal year"
1613-msgstr "Fiskālajam gadam nav definēts slēguma ierakstu žurnāls"
1614+msgid "No End of year journal defined for the fiscal year"
1615+msgstr ""
1616
1617 #. module: account
1618 #: code:addons/account/account.py:506
1619@@ -4103,6 +4103,12 @@
1620 msgstr ""
1621
1622 #. module: account
1623+#: constraint:account.account:0
1624+msgid "You cannot create an account! \n"
1625+"Make sure if the account has children then it should be type \"View\"!"
1626+msgstr ""
1627+
1628+#. module: account
1629 #: view:account.subscription.generate:0
1630 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1631 #: model:ir.ui.menu,name:account.menu_generate_subscription
1632@@ -9183,6 +9189,12 @@
1633 msgstr ""
1634
1635 #. module: account
1636+#: constraint:account.account.template:0
1637+msgid "You cannot create an account template! \n"
1638+"Make sure if the account template has parent then it should be type \"View\"! "
1639+msgstr ""
1640+
1641+#. module: account
1642 #: view:account.subscription:0
1643 msgid "Recurring"
1644 msgstr ""
1645
1646=== modified file 'account/i18n/mn.po' (properties changed: -x to +x)
1647--- account/i18n/mn.po 2011-01-06 05:38:49 +0000
1648+++ account/i18n/mn.po 2011-01-13 18:00:31 +0000
1649@@ -30,7 +30,7 @@
1650 #. module: account
1651 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1652 #, python-format
1653-msgid "No journal for ending writing has been defined for the fiscal year"
1654+msgid "No End of year journal defined for the fiscal year"
1655 msgstr ""
1656
1657 #. module: account
1658@@ -4192,6 +4192,12 @@
1659 msgstr "Алдаа ! Та цикл хэлбэрийн данс үүсгэх боломжтой."
1660
1661 #. module: account
1662+#: constraint:account.account:0
1663+msgid "You cannot create an account! \n"
1664+"Make sure if the account has children then it should be type \"View\"!"
1665+msgstr ""
1666+
1667+#. module: account
1668 #: view:account.subscription.generate:0
1669 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1670 #: model:ir.ui.menu,name:account.menu_generate_subscription
1671@@ -9364,6 +9370,12 @@
1672 msgstr ""
1673
1674 #. module: account
1675+#: constraint:account.account.template:0
1676+msgid "You cannot create an account template! \n"
1677+"Make sure if the account template has parent then it should be type \"View\"! "
1678+msgstr ""
1679+
1680+#. module: account
1681 #: view:account.subscription:0
1682 msgid "Recurring"
1683 msgstr "Давтан гүйлгээ"
1684
1685=== modified file 'account/i18n/nb.po' (properties changed: -x to +x)
1686--- account/i18n/nb.po 2011-01-06 05:38:49 +0000
1687+++ account/i18n/nb.po 2011-01-13 18:00:31 +0000
1688@@ -30,7 +30,7 @@
1689 #. module: account
1690 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1691 #, python-format
1692-msgid "No journal for ending writing has been defined for the fiscal year"
1693+msgid "No End of year journal defined for the fiscal year"
1694 msgstr ""
1695
1696 #. module: account
1697@@ -4096,6 +4096,12 @@
1698 msgstr ""
1699
1700 #. module: account
1701+#: constraint:account.account:0
1702+msgid "You cannot create an account! \n"
1703+"Make sure if the account has children then it should be type \"View\"!"
1704+msgstr ""
1705+
1706+#. module: account
1707 #: view:account.subscription.generate:0
1708 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1709 #: model:ir.ui.menu,name:account.menu_generate_subscription
1710@@ -9171,6 +9177,12 @@
1711 msgstr ""
1712
1713 #. module: account
1714+#: constraint:account.account.template:0
1715+msgid "You cannot create an account template! \n"
1716+"Make sure if the account template has parent then it should be type \"View\"! "
1717+msgstr ""
1718+
1719+#. module: account
1720 #: view:account.subscription:0
1721 msgid "Recurring"
1722 msgstr ""
1723
1724=== modified file 'account/i18n/nl.po' (properties changed: -x to +x)
1725--- account/i18n/nl.po 2011-01-10 05:19:37 +0000
1726+++ account/i18n/nl.po 2011-01-13 18:00:31 +0000
1727@@ -35,9 +35,8 @@
1728 #. module: account
1729 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1730 #, python-format
1731-msgid "No journal for ending writing has been defined for the fiscal year"
1732+msgid "No End of year journal defined for the fiscal year"
1733 msgstr ""
1734-"Geen dagboek voor het maken van sluitposten gedefinieerd voor het boekjaar."
1735
1736 #. module: account
1737 #: code:addons/account/account.py:506
1738@@ -4209,6 +4208,12 @@
1739 msgstr "Fout ! U kunt geen recursieve rekeningen aanmaken."
1740
1741 #. module: account
1742+#: constraint:account.account:0
1743+msgid "You cannot create an account! \n"
1744+"Make sure if the account has children then it should be type \"View\"!"
1745+msgstr ""
1746+
1747+#. module: account
1748 #: view:account.subscription.generate:0
1749 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1750 #: model:ir.ui.menu,name:account.menu_generate_subscription
1751@@ -9339,6 +9344,12 @@
1752 msgstr ""
1753
1754 #. module: account
1755+#: constraint:account.account.template:0
1756+msgid "You cannot create an account template! \n"
1757+"Make sure if the account template has parent then it should be type \"View\"! "
1758+msgstr ""
1759+
1760+#. module: account
1761 #: view:account.subscription:0
1762 msgid "Recurring"
1763 msgstr ""
1764
1765=== modified file 'account/i18n/nl_BE.po' (properties changed: -x to +x)
1766--- account/i18n/nl_BE.po 2011-01-06 05:38:49 +0000
1767+++ account/i18n/nl_BE.po 2011-01-13 18:00:31 +0000
1768@@ -29,7 +29,7 @@
1769 #. module: account
1770 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1771 #, python-format
1772-msgid "No journal for ending writing has been defined for the fiscal year"
1773+msgid "No End of year journal defined for the fiscal year"
1774 msgstr ""
1775
1776 #. module: account
1777@@ -4117,6 +4117,12 @@
1778 msgstr ""
1779
1780 #. module: account
1781+#: constraint:account.account:0
1782+msgid "You cannot create an account! \n"
1783+"Make sure if the account has children then it should be type \"View\"!"
1784+msgstr ""
1785+
1786+#. module: account
1787 #: view:account.subscription.generate:0
1788 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1789 #: model:ir.ui.menu,name:account.menu_generate_subscription
1790@@ -9204,6 +9210,12 @@
1791 msgstr ""
1792
1793 #. module: account
1794+#: constraint:account.account.template:0
1795+msgid "You cannot create an account template! \n"
1796+"Make sure if the account template has parent then it should be type \"View\"! "
1797+msgstr ""
1798+
1799+#. module: account
1800 #: view:account.subscription:0
1801 msgid "Recurring"
1802 msgstr ""
1803
1804=== modified file 'account/i18n/oc.po' (properties changed: -x to +x)
1805--- account/i18n/oc.po 2011-01-06 05:38:49 +0000
1806+++ account/i18n/oc.po 2011-01-13 18:00:31 +0000
1807@@ -30,7 +30,7 @@
1808 #. module: account
1809 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1810 #, python-format
1811-msgid "No journal for ending writing has been defined for the fiscal year"
1812+msgid "No End of year journal defined for the fiscal year"
1813 msgstr ""
1814
1815 #. module: account
1816@@ -4096,6 +4096,12 @@
1817 msgstr ""
1818
1819 #. module: account
1820+#: constraint:account.account:0
1821+msgid "You cannot create an account! \n"
1822+"Make sure if the account has children then it should be type \"View\"!"
1823+msgstr ""
1824+
1825+#. module: account
1826 #: view:account.subscription.generate:0
1827 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1828 #: model:ir.ui.menu,name:account.menu_generate_subscription
1829@@ -9171,6 +9177,12 @@
1830 msgstr ""
1831
1832 #. module: account
1833+#: constraint:account.account.template:0
1834+msgid "You cannot create an account template! \n"
1835+"Make sure if the account template has parent then it should be type \"View\"! "
1836+msgstr ""
1837+
1838+#. module: account
1839 #: view:account.subscription:0
1840 msgid "Recurring"
1841 msgstr ""
1842
1843=== modified file 'account/i18n/pl.po' (properties changed: -x to +x)
1844--- account/i18n/pl.po 2011-01-12 04:58:46 +0000
1845+++ account/i18n/pl.po 2011-01-13 18:00:31 +0000
1846@@ -29,9 +29,8 @@
1847 #. module: account
1848 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1849 #, python-format
1850-msgid "No journal for ending writing has been defined for the fiscal year"
1851+msgid "No End of year journal defined for the fiscal year"
1852 msgstr ""
1853-"Nie został zdefiniowany dziennik dla zapisów końcowych dla roku podatkowego"
1854
1855 #. module: account
1856 #: code:addons/account/account.py:506
1857@@ -4226,6 +4225,12 @@
1858 msgstr "Błąd ! Nie możesz tworzyć kont rekurencyjnych."
1859
1860 #. module: account
1861+#: constraint:account.account:0
1862+msgid "You cannot create an account! \n"
1863+"Make sure if the account has children then it should be type \"View\"!"
1864+msgstr ""
1865+
1866+#. module: account
1867 #: view:account.subscription.generate:0
1868 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1869 #: model:ir.ui.menu,name:account.menu_generate_subscription
1870@@ -9468,6 +9473,12 @@
1871 msgstr "Błąd ! Nie możesz tworzyć rekurencyjnego szablonu kont."
1872
1873 #. module: account
1874+#: constraint:account.account.template:0
1875+msgid "You cannot create an account template! \n"
1876+"Make sure if the account template has parent then it should be type \"View\"! "
1877+msgstr ""
1878+
1879+#. module: account
1880 #: view:account.subscription:0
1881 msgid "Recurring"
1882 msgstr "Powtarzanie"
1883
1884=== modified file 'account/i18n/pt.po' (properties changed: -x to +x)
1885--- account/i18n/pt.po 2011-01-06 05:38:49 +0000
1886+++ account/i18n/pt.po 2011-01-13 18:00:31 +0000
1887@@ -29,8 +29,8 @@
1888 #. module: account
1889 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1890 #, python-format
1891-msgid "No journal for ending writing has been defined for the fiscal year"
1892-msgstr "Não foi definido nenhum diário para o fecho do ano fiscal"
1893+msgid "No End of year journal defined for the fiscal year"
1894+msgstr ""
1895
1896 #. module: account
1897 #: code:addons/account/account.py:506
1898@@ -4176,6 +4176,12 @@
1899 msgstr "Erro! Não pode criar contas recursivas"
1900
1901 #. module: account
1902+#: constraint:account.account:0
1903+msgid "You cannot create an account! \n"
1904+"Make sure if the account has children then it should be type \"View\"!"
1905+msgstr ""
1906+
1907+#. module: account
1908 #: view:account.subscription.generate:0
1909 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1910 #: model:ir.ui.menu,name:account.menu_generate_subscription
1911@@ -9320,6 +9326,12 @@
1912 msgstr "Erro! Não pode criar modelos de conta recursivamente."
1913
1914 #. module: account
1915+#: constraint:account.account.template:0
1916+msgid "You cannot create an account template! \n"
1917+"Make sure if the account template has parent then it should be type \"View\"! "
1918+msgstr ""
1919+
1920+#. module: account
1921 #: view:account.subscription:0
1922 msgid "Recurring"
1923 msgstr "Recorrente"
1924
1925=== modified file 'account/i18n/pt_BR.po' (properties changed: -x to +x)
1926--- account/i18n/pt_BR.po 2011-01-12 04:58:46 +0000
1927+++ account/i18n/pt_BR.po 2011-01-13 18:00:31 +0000
1928@@ -29,8 +29,8 @@
1929 #. module: account
1930 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1931 #, python-format
1932-msgid "No journal for ending writing has been defined for the fiscal year"
1933-msgstr "Nenhum diário para escrituração foi definido para o ano fiscal"
1934+msgid "No End of year journal defined for the fiscal year"
1935+msgstr ""
1936
1937 #. module: account
1938 #: code:addons/account/account.py:506
1939@@ -4270,6 +4270,12 @@
1940 msgstr "Erro ! Você não pode criar contas recursivas"
1941
1942 #. module: account
1943+#: constraint:account.account:0
1944+msgid "You cannot create an account! \n"
1945+"Make sure if the account has children then it should be type \"View\"!"
1946+msgstr ""
1947+
1948+#. module: account
1949 #: view:account.subscription.generate:0
1950 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1951 #: model:ir.ui.menu,name:account.menu_generate_subscription
1952@@ -9398,6 +9404,12 @@
1953 msgstr ""
1954
1955 #. module: account
1956+#: constraint:account.account.template:0
1957+msgid "You cannot create an account template! \n"
1958+"Make sure if the account template has parent then it should be type \"View\"! "
1959+msgstr ""
1960+
1961+#. module: account
1962 #: view:account.subscription:0
1963 msgid "Recurring"
1964 msgstr ""
1965
1966=== modified file 'account/i18n/ro.po' (properties changed: -x to +x)
1967--- account/i18n/ro.po 2011-01-06 05:38:49 +0000
1968+++ account/i18n/ro.po 2011-01-13 18:00:31 +0000
1969@@ -29,9 +29,8 @@
1970 #. module: account
1971 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
1972 #, python-format
1973-msgid "No journal for ending writing has been defined for the fiscal year"
1974+msgid "No End of year journal defined for the fiscal year"
1975 msgstr ""
1976-"Nu a fost definit nici un jurnal pentru înregistrările de închidere de an"
1977
1978 #. module: account
1979 #: code:addons/account/account.py:506
1980@@ -4133,6 +4132,12 @@
1981 msgstr "Eroare ! Nu puteţi crea conturi recursive."
1982
1983 #. module: account
1984+#: constraint:account.account:0
1985+msgid "You cannot create an account! \n"
1986+"Make sure if the account has children then it should be type \"View\"!"
1987+msgstr ""
1988+
1989+#. module: account
1990 #: view:account.subscription.generate:0
1991 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
1992 #: model:ir.ui.menu,name:account.menu_generate_subscription
1993@@ -9256,6 +9261,12 @@
1994 msgstr ""
1995
1996 #. module: account
1997+#: constraint:account.account.template:0
1998+msgid "You cannot create an account template! \n"
1999+"Make sure if the account template has parent then it should be type \"View\"! "
2000+msgstr ""
2001+
2002+#. module: account
2003 #: view:account.subscription:0
2004 msgid "Recurring"
2005 msgstr ""
2006
2007=== modified file 'account/i18n/ru.po' (properties changed: -x to +x)
2008--- account/i18n/ru.po 2011-01-11 05:03:13 +0000
2009+++ account/i18n/ru.po 2011-01-13 18:00:31 +0000
2010@@ -29,8 +29,8 @@
2011 #. module: account
2012 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2013 #, python-format
2014-msgid "No journal for ending writing has been defined for the fiscal year"
2015-msgstr "Не определен Журнал для закрытия в финансовом году"
2016+msgid "No End of year journal defined for the fiscal year"
2017+msgstr ""
2018
2019 #. module: account
2020 #: code:addons/account/account.py:506
2021@@ -4127,6 +4127,12 @@
2022 msgstr "Ошибка! Вы не можете создать рекурсивные счета."
2023
2024 #. module: account
2025+#: constraint:account.account:0
2026+msgid "You cannot create an account! \n"
2027+"Make sure if the account has children then it should be type \"View\"!"
2028+msgstr ""
2029+
2030+#. module: account
2031 #: view:account.subscription.generate:0
2032 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2033 #: model:ir.ui.menu,name:account.menu_generate_subscription
2034@@ -9225,6 +9231,12 @@
2035 msgstr "Ошибка ! Нельзя создать рекурсивные шаблоны счетов."
2036
2037 #. module: account
2038+#: constraint:account.account.template:0
2039+msgid "You cannot create an account template! \n"
2040+"Make sure if the account template has parent then it should be type \"View\"! "
2041+msgstr ""
2042+
2043+#. module: account
2044 #: view:account.subscription:0
2045 msgid "Recurring"
2046 msgstr "Повторение"
2047
2048=== modified file 'account/i18n/si.po' (properties changed: -x to +x)
2049--- account/i18n/si.po 2011-01-06 05:38:49 +0000
2050+++ account/i18n/si.po 2011-01-13 18:00:31 +0000
2051@@ -30,7 +30,7 @@
2052 #. module: account
2053 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2054 #, python-format
2055-msgid "No journal for ending writing has been defined for the fiscal year"
2056+msgid "No End of year journal defined for the fiscal year"
2057 msgstr ""
2058
2059 #. module: account
2060@@ -4096,6 +4096,12 @@
2061 msgstr ""
2062
2063 #. module: account
2064+#: constraint:account.account:0
2065+msgid "You cannot create an account! \n"
2066+"Make sure if the account has children then it should be type \"View\"!"
2067+msgstr ""
2068+
2069+#. module: account
2070 #: view:account.subscription.generate:0
2071 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2072 #: model:ir.ui.menu,name:account.menu_generate_subscription
2073@@ -9171,6 +9177,12 @@
2074 msgstr ""
2075
2076 #. module: account
2077+#: constraint:account.account.template:0
2078+msgid "You cannot create an account template! \n"
2079+"Make sure if the account template has parent then it should be type \"View\"! "
2080+msgstr ""
2081+
2082+#. module: account
2083 #: view:account.subscription:0
2084 msgid "Recurring"
2085 msgstr ""
2086
2087=== modified file 'account/i18n/sk.po' (properties changed: -x to +x)
2088--- account/i18n/sk.po 2011-01-06 05:38:49 +0000
2089+++ account/i18n/sk.po 2011-01-13 18:00:31 +0000
2090@@ -30,7 +30,7 @@
2091 #. module: account
2092 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2093 #, python-format
2094-msgid "No journal for ending writing has been defined for the fiscal year"
2095+msgid "No End of year journal defined for the fiscal year"
2096 msgstr ""
2097
2098 #. module: account
2099@@ -4096,6 +4096,12 @@
2100 msgstr ""
2101
2102 #. module: account
2103+#: constraint:account.account:0
2104+msgid "You cannot create an account! \n"
2105+"Make sure if the account has children then it should be type \"View\"!"
2106+msgstr ""
2107+
2108+#. module: account
2109 #: view:account.subscription.generate:0
2110 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2111 #: model:ir.ui.menu,name:account.menu_generate_subscription
2112@@ -9174,6 +9180,12 @@
2113 msgstr ""
2114
2115 #. module: account
2116+#: constraint:account.account.template:0
2117+msgid "You cannot create an account template! \n"
2118+"Make sure if the account template has parent then it should be type \"View\"! "
2119+msgstr ""
2120+
2121+#. module: account
2122 #: view:account.subscription:0
2123 msgid "Recurring"
2124 msgstr ""
2125
2126=== modified file 'account/i18n/sl.po' (properties changed: -x to +x)
2127--- account/i18n/sl.po 2011-01-09 04:54:51 +0000
2128+++ account/i18n/sl.po 2011-01-13 18:00:31 +0000
2129@@ -29,8 +29,8 @@
2130 #. module: account
2131 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2132 #, python-format
2133-msgid "No journal for ending writing has been defined for the fiscal year"
2134-msgstr "Manjka dnevnik zaključnih vpisov za poslovno leto"
2135+msgid "No End of year journal defined for the fiscal year"
2136+msgstr ""
2137
2138 #. module: account
2139 #: code:addons/account/account.py:506
2140@@ -4106,6 +4106,12 @@
2141 msgstr "Napaka! Ne morete krerati rekurzivnih kontov."
2142
2143 #. module: account
2144+#: constraint:account.account:0
2145+msgid "You cannot create an account! \n"
2146+"Make sure if the account has children then it should be type \"View\"!"
2147+msgstr ""
2148+
2149+#. module: account
2150 #: view:account.subscription.generate:0
2151 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2152 #: model:ir.ui.menu,name:account.menu_generate_subscription
2153@@ -9194,6 +9200,12 @@
2154 msgstr ""
2155
2156 #. module: account
2157+#: constraint:account.account.template:0
2158+msgid "You cannot create an account template! \n"
2159+"Make sure if the account template has parent then it should be type \"View\"! "
2160+msgstr ""
2161+
2162+#. module: account
2163 #: view:account.subscription:0
2164 msgid "Recurring"
2165 msgstr ""
2166
2167=== modified file 'account/i18n/sq.po' (properties changed: -x to +x)
2168--- account/i18n/sq.po 2011-01-06 05:38:49 +0000
2169+++ account/i18n/sq.po 2011-01-13 18:00:31 +0000
2170@@ -30,7 +30,7 @@
2171 #. module: account
2172 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2173 #, python-format
2174-msgid "No journal for ending writing has been defined for the fiscal year"
2175+msgid "No End of year journal defined for the fiscal year"
2176 msgstr ""
2177
2178 #. module: account
2179@@ -4106,6 +4106,12 @@
2180 msgstr ""
2181
2182 #. module: account
2183+#: constraint:account.account:0
2184+msgid "You cannot create an account! \n"
2185+"Make sure if the account has children then it should be type \"View\"!"
2186+msgstr ""
2187+
2188+#. module: account
2189 #: view:account.subscription.generate:0
2190 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2191 #: model:ir.ui.menu,name:account.menu_generate_subscription
2192@@ -9187,6 +9193,12 @@
2193 msgstr ""
2194
2195 #. module: account
2196+#: constraint:account.account.template:0
2197+msgid "You cannot create an account template! \n"
2198+"Make sure if the account template has parent then it should be type \"View\"! "
2199+msgstr ""
2200+
2201+#. module: account
2202 #: view:account.subscription:0
2203 msgid "Recurring"
2204 msgstr ""
2205
2206=== modified file 'account/i18n/sr.po' (properties changed: -x to +x)
2207--- account/i18n/sr.po 2011-01-06 05:38:49 +0000
2208+++ account/i18n/sr.po 2011-01-13 18:00:31 +0000
2209@@ -30,7 +30,7 @@
2210 #. module: account
2211 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2212 #, python-format
2213-msgid "No journal for ending writing has been defined for the fiscal year"
2214+msgid "No End of year journal defined for the fiscal year"
2215 msgstr ""
2216
2217 #. module: account
2218@@ -4125,6 +4125,12 @@
2219 msgstr "Greška ! Ne možete kreirati rekurzivna konta"
2220
2221 #. module: account
2222+#: constraint:account.account:0
2223+msgid "You cannot create an account! \n"
2224+"Make sure if the account has children then it should be type \"View\"!"
2225+msgstr ""
2226+
2227+#. module: account
2228 #: view:account.subscription.generate:0
2229 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2230 #: model:ir.ui.menu,name:account.menu_generate_subscription
2231@@ -9233,6 +9239,12 @@
2232 msgstr ""
2233
2234 #. module: account
2235+#: constraint:account.account.template:0
2236+msgid "You cannot create an account template! \n"
2237+"Make sure if the account template has parent then it should be type \"View\"! "
2238+msgstr ""
2239+
2240+#. module: account
2241 #: view:account.subscription:0
2242 msgid "Recurring"
2243 msgstr ""
2244
2245=== modified file 'account/i18n/sr@latin.po' (properties changed: -x to +x)
2246--- account/i18n/sr@latin.po 2011-01-06 05:38:49 +0000
2247+++ account/i18n/sr@latin.po 2011-01-13 18:00:31 +0000
2248@@ -30,7 +30,7 @@
2249 #. module: account
2250 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2251 #, python-format
2252-msgid "No journal for ending writing has been defined for the fiscal year"
2253+msgid "No End of year journal defined for the fiscal year"
2254 msgstr ""
2255
2256 #. module: account
2257@@ -4125,6 +4125,12 @@
2258 msgstr "Greška ! Ne možete kreirati rekurzivna konta"
2259
2260 #. module: account
2261+#: constraint:account.account:0
2262+msgid "You cannot create an account! \n"
2263+"Make sure if the account has children then it should be type \"View\"!"
2264+msgstr ""
2265+
2266+#. module: account
2267 #: view:account.subscription.generate:0
2268 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2269 #: model:ir.ui.menu,name:account.menu_generate_subscription
2270@@ -9233,6 +9239,12 @@
2271 msgstr ""
2272
2273 #. module: account
2274+#: constraint:account.account.template:0
2275+msgid "You cannot create an account template! \n"
2276+"Make sure if the account template has parent then it should be type \"View\"! "
2277+msgstr ""
2278+
2279+#. module: account
2280 #: view:account.subscription:0
2281 msgid "Recurring"
2282 msgstr ""
2283
2284=== modified file 'account/i18n/sv.po' (properties changed: -x to +x)
2285--- account/i18n/sv.po 2011-01-09 04:54:51 +0000
2286+++ account/i18n/sv.po 2011-01-13 18:00:31 +0000
2287@@ -29,8 +29,8 @@
2288 #. module: account
2289 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2290 #, python-format
2291-msgid "No journal for ending writing has been defined for the fiscal year"
2292-msgstr "Inga journal för att avsluta räkenskapsåret har definierats"
2293+msgid "No End of year journal defined for the fiscal year"
2294+msgstr ""
2295
2296 #. module: account
2297 #: code:addons/account/account.py:506
2298@@ -4170,6 +4170,12 @@
2299 msgstr "Fel! Du kan inte skapa rekursiva konton."
2300
2301 #. module: account
2302+#: constraint:account.account:0
2303+msgid "You cannot create an account! \n"
2304+"Make sure if the account has children then it should be type \"View\"!"
2305+msgstr ""
2306+
2307+#. module: account
2308 #: view:account.subscription.generate:0
2309 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2310 #: model:ir.ui.menu,name:account.menu_generate_subscription
2311@@ -9307,6 +9313,12 @@
2312 msgstr ""
2313
2314 #. module: account
2315+#: constraint:account.account.template:0
2316+msgid "You cannot create an account template! \n"
2317+"Make sure if the account template has parent then it should be type \"View\"! "
2318+msgstr ""
2319+
2320+#. module: account
2321 #: view:account.subscription:0
2322 msgid "Recurring"
2323 msgstr "Återkommande"
2324
2325=== modified file 'account/i18n/ta.po' (properties changed: -x to +x)
2326--- account/i18n/ta.po 2011-01-06 05:38:49 +0000
2327+++ account/i18n/ta.po 2011-01-13 18:00:31 +0000
2328@@ -30,7 +30,7 @@
2329 #. module: account
2330 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2331 #, python-format
2332-msgid "No journal for ending writing has been defined for the fiscal year"
2333+msgid "No End of year journal defined for the fiscal year"
2334 msgstr ""
2335
2336 #. module: account
2337@@ -4096,6 +4096,12 @@
2338 msgstr ""
2339
2340 #. module: account
2341+#: constraint:account.account:0
2342+msgid "You cannot create an account! \n"
2343+"Make sure if the account has children then it should be type \"View\"!"
2344+msgstr ""
2345+
2346+#. module: account
2347 #: view:account.subscription.generate:0
2348 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2349 #: model:ir.ui.menu,name:account.menu_generate_subscription
2350@@ -9171,6 +9177,12 @@
2351 msgstr ""
2352
2353 #. module: account
2354+#: constraint:account.account.template:0
2355+msgid "You cannot create an account template! \n"
2356+"Make sure if the account template has parent then it should be type \"View\"! "
2357+msgstr ""
2358+
2359+#. module: account
2360 #: view:account.subscription:0
2361 msgid "Recurring"
2362 msgstr ""
2363
2364=== modified file 'account/i18n/te.po' (properties changed: -x to +x)
2365--- account/i18n/te.po 2011-01-06 05:38:49 +0000
2366+++ account/i18n/te.po 2011-01-13 18:00:31 +0000
2367@@ -30,7 +30,7 @@
2368 #. module: account
2369 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2370 #, python-format
2371-msgid "No journal for ending writing has been defined for the fiscal year"
2372+msgid "No End of year journal defined for the fiscal year"
2373 msgstr ""
2374
2375 #. module: account
2376@@ -4096,6 +4096,12 @@
2377 msgstr ""
2378
2379 #. module: account
2380+#: constraint:account.account:0
2381+msgid "You cannot create an account! \n"
2382+"Make sure if the account has children then it should be type \"View\"!"
2383+msgstr ""
2384+
2385+#. module: account
2386 #: view:account.subscription.generate:0
2387 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2388 #: model:ir.ui.menu,name:account.menu_generate_subscription
2389@@ -9171,6 +9177,12 @@
2390 msgstr ""
2391
2392 #. module: account
2393+#: constraint:account.account.template:0
2394+msgid "You cannot create an account template! \n"
2395+"Make sure if the account template has parent then it should be type \"View\"! "
2396+msgstr ""
2397+
2398+#. module: account
2399 #: view:account.subscription:0
2400 msgid "Recurring"
2401 msgstr ""
2402
2403=== modified file 'account/i18n/th.po' (properties changed: -x to +x)
2404--- account/i18n/th.po 2011-01-06 05:38:49 +0000
2405+++ account/i18n/th.po 2011-01-13 18:00:31 +0000
2406@@ -30,7 +30,7 @@
2407 #. module: account
2408 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2409 #, python-format
2410-msgid "No journal for ending writing has been defined for the fiscal year"
2411+msgid "No End of year journal defined for the fiscal year"
2412 msgstr ""
2413
2414 #. module: account
2415@@ -4096,6 +4096,12 @@
2416 msgstr ""
2417
2418 #. module: account
2419+#: constraint:account.account:0
2420+msgid "You cannot create an account! \n"
2421+"Make sure if the account has children then it should be type \"View\"!"
2422+msgstr ""
2423+
2424+#. module: account
2425 #: view:account.subscription.generate:0
2426 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2427 #: model:ir.ui.menu,name:account.menu_generate_subscription
2428@@ -9171,6 +9177,12 @@
2429 msgstr ""
2430
2431 #. module: account
2432+#: constraint:account.account.template:0
2433+msgid "You cannot create an account template! \n"
2434+"Make sure if the account template has parent then it should be type \"View\"! "
2435+msgstr ""
2436+
2437+#. module: account
2438 #: view:account.subscription:0
2439 msgid "Recurring"
2440 msgstr ""
2441
2442=== modified file 'account/i18n/tlh.po' (properties changed: -x to +x)
2443--- account/i18n/tlh.po 2011-01-06 05:38:49 +0000
2444+++ account/i18n/tlh.po 2011-01-13 18:00:31 +0000
2445@@ -29,7 +29,7 @@
2446 #. module: account
2447 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2448 #, python-format
2449-msgid "No journal for ending writing has been defined for the fiscal year"
2450+msgid "No End of year journal defined for the fiscal year"
2451 msgstr ""
2452
2453 #. module: account
2454@@ -4095,6 +4095,12 @@
2455 msgstr ""
2456
2457 #. module: account
2458+#: constraint:account.account:0
2459+msgid "You cannot create an account! \n"
2460+"Make sure if the account has children then it should be type \"View\"!"
2461+msgstr ""
2462+
2463+#. module: account
2464 #: view:account.subscription.generate:0
2465 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2466 #: model:ir.ui.menu,name:account.menu_generate_subscription
2467@@ -9170,6 +9176,12 @@
2468 msgstr ""
2469
2470 #. module: account
2471+#: constraint:account.account.template:0
2472+msgid "You cannot create an account template! \n"
2473+"Make sure if the account template has parent then it should be type \"View\"! "
2474+msgstr ""
2475+
2476+#. module: account
2477 #: view:account.subscription:0
2478 msgid "Recurring"
2479 msgstr ""
2480
2481=== modified file 'account/i18n/tr.po' (properties changed: -x to +x)
2482--- account/i18n/tr.po 2011-01-12 04:58:46 +0000
2483+++ account/i18n/tr.po 2011-01-13 18:00:31 +0000
2484@@ -29,8 +29,8 @@
2485 #. module: account
2486 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2487 #, python-format
2488-msgid "No journal for ending writing has been defined for the fiscal year"
2489-msgstr "No journal for ending writing has been defined for the fiscal year"
2490+msgid "No End of year journal defined for the fiscal year"
2491+msgstr ""
2492
2493 #. module: account
2494 #: code:addons/account/account.py:506
2495@@ -4220,6 +4220,12 @@
2496 msgstr ""
2497
2498 #. module: account
2499+#: constraint:account.account:0
2500+msgid "You cannot create an account! \n"
2501+"Make sure if the account has children then it should be type \"View\"!"
2502+msgstr ""
2503+
2504+#. module: account
2505 #: view:account.subscription.generate:0
2506 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2507 #: model:ir.ui.menu,name:account.menu_generate_subscription
2508@@ -9477,6 +9483,12 @@
2509 msgstr "Error ! You can not create recursive account templates."
2510
2511 #. module: account
2512+#: constraint:account.account.template:0
2513+msgid "You cannot create an account template! \n"
2514+"Make sure if the account template has parent then it should be type \"View\"! "
2515+msgstr ""
2516+
2517+#. module: account
2518 #: view:account.subscription:0
2519 msgid "Recurring"
2520 msgstr "Recurring"
2521
2522=== modified file 'account/i18n/ug.po' (properties changed: -x to +x)
2523--- account/i18n/ug.po 2011-01-06 05:38:49 +0000
2524+++ account/i18n/ug.po 2011-01-13 18:00:31 +0000
2525@@ -30,7 +30,7 @@
2526 #. module: account
2527 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2528 #, python-format
2529-msgid "No journal for ending writing has been defined for the fiscal year"
2530+msgid "No End of year journal defined for the fiscal year"
2531 msgstr ""
2532
2533 #. module: account
2534@@ -4096,6 +4096,12 @@
2535 msgstr ""
2536
2537 #. module: account
2538+#: constraint:account.account:0
2539+msgid "You cannot create an account! \n"
2540+"Make sure if the account has children then it should be type \"View\"!"
2541+msgstr ""
2542+
2543+#. module: account
2544 #: view:account.subscription.generate:0
2545 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2546 #: model:ir.ui.menu,name:account.menu_generate_subscription
2547@@ -9171,6 +9177,12 @@
2548 msgstr ""
2549
2550 #. module: account
2551+#: constraint:account.account.template:0
2552+msgid "You cannot create an account template! \n"
2553+"Make sure if the account template has parent then it should be type \"View\"! "
2554+msgstr ""
2555+
2556+#. module: account
2557 #: view:account.subscription:0
2558 msgid "Recurring"
2559 msgstr ""
2560
2561=== modified file 'account/i18n/uk.po' (properties changed: -x to +x)
2562--- account/i18n/uk.po 2011-01-06 05:38:49 +0000
2563+++ account/i18n/uk.po 2011-01-13 18:00:31 +0000
2564@@ -29,7 +29,7 @@
2565 #. module: account
2566 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2567 #, python-format
2568-msgid "No journal for ending writing has been defined for the fiscal year"
2569+msgid "No End of year journal defined for the fiscal year"
2570 msgstr ""
2571
2572 #. module: account
2573@@ -4097,6 +4097,12 @@
2574 msgstr ""
2575
2576 #. module: account
2577+#: constraint:account.account:0
2578+msgid "You cannot create an account! \n"
2579+"Make sure if the account has children then it should be type \"View\"!"
2580+msgstr ""
2581+
2582+#. module: account
2583 #: view:account.subscription.generate:0
2584 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2585 #: model:ir.ui.menu,name:account.menu_generate_subscription
2586@@ -9176,6 +9182,12 @@
2587 msgstr ""
2588
2589 #. module: account
2590+#: constraint:account.account.template:0
2591+msgid "You cannot create an account template! \n"
2592+"Make sure if the account template has parent then it should be type \"View\"! "
2593+msgstr ""
2594+
2595+#. module: account
2596 #: view:account.subscription:0
2597 msgid "Recurring"
2598 msgstr ""
2599
2600=== modified file 'account/i18n/vi.po' (properties changed: -x to +x)
2601--- account/i18n/vi.po 2011-01-06 05:38:49 +0000
2602+++ account/i18n/vi.po 2011-01-13 18:00:31 +0000
2603@@ -30,7 +30,7 @@
2604 #. module: account
2605 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2606 #, python-format
2607-msgid "No journal for ending writing has been defined for the fiscal year"
2608+msgid "No End of year journal defined for the fiscal year"
2609 msgstr ""
2610
2611 #. module: account
2612@@ -4243,6 +4243,12 @@
2613 msgstr "Lỗi ! Bạn không thể tạo các tài khoản đệ quy."
2614
2615 #. module: account
2616+#: constraint:account.account:0
2617+msgid "You cannot create an account! \n"
2618+"Make sure if the account has children then it should be type \"View\"!"
2619+msgstr ""
2620+
2621+#. module: account
2622 #: view:account.subscription.generate:0
2623 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2624 #: model:ir.ui.menu,name:account.menu_generate_subscription
2625@@ -9561,6 +9567,12 @@
2626 msgstr ""
2627
2628 #. module: account
2629+#: constraint:account.account.template:0
2630+msgid "You cannot create an account template! \n"
2631+"Make sure if the account template has parent then it should be type \"View\"! "
2632+msgstr ""
2633+
2634+#. module: account
2635 #: view:account.subscription:0
2636 msgid "Recurring"
2637 msgstr "Recurring"
2638
2639=== modified file 'account/i18n/zh_CN.po' (properties changed: -x to +x)
2640--- account/i18n/zh_CN.po 2011-01-06 05:38:49 +0000
2641+++ account/i18n/zh_CN.po 2011-01-13 18:00:31 +0000
2642@@ -29,8 +29,8 @@
2643 #. module: account
2644 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2645 #, python-format
2646-msgid "No journal for ending writing has been defined for the fiscal year"
2647-msgstr "会计年度未定义结账凭证的业务类型"
2648+msgid "No End of year journal defined for the fiscal year"
2649+msgstr ""
2650
2651 #. module: account
2652 #: code:addons/account/account.py:506
2653@@ -4100,6 +4100,12 @@
2654 msgstr "错误!你不能创建递归的科目"
2655
2656 #. module: account
2657+#: constraint:account.account:0
2658+msgid "You cannot create an account! \n"
2659+"Make sure if the account has children then it should be type \"View\"!"
2660+msgstr ""
2661+
2662+#. module: account
2663 #: view:account.subscription.generate:0
2664 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2665 #: model:ir.ui.menu,name:account.menu_generate_subscription
2666@@ -9179,6 +9185,12 @@
2667 msgstr ""
2668
2669 #. module: account
2670+#: constraint:account.account.template:0
2671+msgid "You cannot create an account template! \n"
2672+"Make sure if the account template has parent then it should be type \"View\"! "
2673+msgstr ""
2674+
2675+#. module: account
2676 #: view:account.subscription:0
2677 msgid "Recurring"
2678 msgstr ""
2679
2680=== modified file 'account/i18n/zh_HK.po' (properties changed: -x to +x)
2681--- account/i18n/zh_HK.po 2011-01-06 05:38:49 +0000
2682+++ account/i18n/zh_HK.po 2011-01-13 18:00:31 +0000
2683@@ -30,7 +30,7 @@
2684 #. module: account
2685 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2686 #, python-format
2687-msgid "No journal for ending writing has been defined for the fiscal year"
2688+msgid "No End of year journal defined for the fiscal year"
2689 msgstr ""
2690
2691 #. module: account
2692@@ -4096,6 +4096,12 @@
2693 msgstr ""
2694
2695 #. module: account
2696+#: constraint:account.account:0
2697+msgid "You cannot create an account! \n"
2698+"Make sure if the account has children then it should be type \"View\"!"
2699+msgstr ""
2700+
2701+#. module: account
2702 #: view:account.subscription.generate:0
2703 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2704 #: model:ir.ui.menu,name:account.menu_generate_subscription
2705@@ -9171,6 +9177,12 @@
2706 msgstr ""
2707
2708 #. module: account
2709+#: constraint:account.account.template:0
2710+msgid "You cannot create an account template! \n"
2711+"Make sure if the account template has parent then it should be type \"View\"! "
2712+msgstr ""
2713+
2714+#. module: account
2715 #: view:account.subscription:0
2716 msgid "Recurring"
2717 msgstr ""
2718
2719=== modified file 'account/i18n/zh_TW.po' (properties changed: -x to +x)
2720--- account/i18n/zh_TW.po 2011-01-06 05:38:49 +0000
2721+++ account/i18n/zh_TW.po 2011-01-13 18:00:31 +0000
2722@@ -29,8 +29,8 @@
2723 #. module: account
2724 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
2725 #, python-format
2726-msgid "No journal for ending writing has been defined for the fiscal year"
2727-msgstr "沒有日誌紀錄了已經結束本財政年度"
2728+msgid "No End of year journal defined for the fiscal year"
2729+msgstr ""
2730
2731 #. module: account
2732 #: code:addons/account/account.py:506
2733@@ -4095,6 +4095,12 @@
2734 msgstr ""
2735
2736 #. module: account
2737+#: constraint:account.account:0
2738+msgid "You cannot create an account! \n"
2739+"Make sure if the account has children then it should be type \"View\"!"
2740+msgstr ""
2741+
2742+#. module: account
2743 #: view:account.subscription.generate:0
2744 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
2745 #: model:ir.ui.menu,name:account.menu_generate_subscription
2746@@ -9170,6 +9176,12 @@
2747 msgstr ""
2748
2749 #. module: account
2750+#: constraint:account.account.template:0
2751+msgid "You cannot create an account template! \n"
2752+"Make sure if the account template has parent then it should be type \"View\"! "
2753+msgstr ""
2754+
2755+#. module: account
2756 #: view:account.subscription:0
2757 msgid "Recurring"
2758 msgstr ""
2759
2760=== modified file 'account/images/accounting-hover.png' (properties changed: -x to +x)
2761=== modified file 'account/images/accounting.png' (properties changed: -x to +x)
2762=== modified file 'account/installer.py' (properties changed: -x to +x)
2763=== modified file 'account/invoice.py' (properties changed: -x to +x)
2764--- account/invoice.py 2011-01-05 13:46:54 +0000
2765+++ account/invoice.py 2011-01-13 18:00:31 +0000
2766@@ -328,8 +328,7 @@
2767 def get_log_context(self, cr, uid, context=None):
2768 if context is None:
2769 context = {}
2770- mob_obj = self.pool.get('ir.model.data')
2771- res = mob_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
2772+ res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
2773 view_id = res and res[1] or False
2774 context.update({'view_id': view_id})
2775 return context
2776@@ -541,7 +540,11 @@
2777 journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
2778 if journal_ids:
2779 val['journal_id'] = journal_ids[0]
2780- else:
2781+ res_journal_default = self.pool.get('ir.values').get(cr, uid, 'default', 'type=%s' % (type), ['account.invoice'])
2782+ for r in res_journal_default:
2783+ if r[1] == 'journal_id' and r[2] in journal_ids:
2784+ val['journal_id'] = r[2]
2785+ if not val.get('journal_id', False):
2786 raise osv.except_osv(_('Configuration Error !'), (_('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (journal_type)))
2787 dom = {'journal_id': [('id', 'in', journal_ids)]}
2788 else:
2789@@ -559,7 +562,6 @@
2790 val['currency_id'] = False
2791 else:
2792 val['currency_id'] = company.currency_id.id
2793-
2794 return {'value': val, 'domain': dom}
2795
2796 # go from canceled state to draft state
2797@@ -991,15 +993,13 @@
2798 return True
2799
2800 def action_cancel(self, cr, uid, ids, *args):
2801+ context = {} # TODO: Use context from arguments
2802 account_move_obj = self.pool.get('account.move')
2803 invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
2804+ move_ids = [] # ones that we will need to remove
2805 for i in invoices:
2806 if i['move_id']:
2807- account_move_obj.button_cancel(cr, uid, [i['move_id'][0]])
2808- # delete the move this invoice was pointing to
2809- # Note that the corresponding move_lines and move_reconciles
2810- # will be automatically deleted too
2811- account_move_obj.unlink(cr, uid, [i['move_id'][0]])
2812+ move_ids.append(i['move_id'][0])
2813 if i['payment_ids']:
2814 account_move_line_obj = self.pool.get('account.move.line')
2815 pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
2816@@ -1007,7 +1007,15 @@
2817 if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
2818 raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
2819
2820+ # First, set the invoices as cancelled and detach the move ids
2821 self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
2822+ if move_ids:
2823+ # second, invalidate the move(s)
2824+ account_move_obj.button_cancel(cr, uid, move_ids, context=context)
2825+ # delete the move this invoice was pointing to
2826+ # Note that the corresponding move_lines and move_reconciles
2827+ # will be automatically deleted too
2828+ account_move_obj.unlink(cr, uid, move_ids, context=context)
2829 self._log_event(cr, uid, ids, -1.0, 'Cancel Invoice')
2830 return True
2831
2832@@ -1267,7 +1275,7 @@
2833 'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
2834 'note': fields.text('Notes'),
2835 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
2836- 'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
2837+ 'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
2838 'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
2839 }
2840 _defaults = {
2841@@ -1524,7 +1532,7 @@
2842 'base_amount': fields.float('Base Code Amount', digits_compute=dp.get_precision('Account')),
2843 'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
2844 'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
2845- 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
2846+ 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
2847 'factor_base': fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
2848 'factor_tax': fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
2849 }
2850
2851=== modified file 'account/partner.py' (properties changed: -x to +x)
2852=== modified file 'account/partner_view.xml' (properties changed: -x to +x)
2853=== modified file 'account/process/customer_invoice_process.xml' (properties changed: -x to +x)
2854=== modified file 'account/process/statement_process.xml' (properties changed: -x to +x)
2855=== modified file 'account/process/supplier_invoice_process.xml' (properties changed: -x to +x)
2856=== modified file 'account/product.py' (properties changed: -x to +x)
2857=== modified file 'account/product_view.xml' (properties changed: -x to +x)
2858=== modified file 'account/project/__init__.py' (properties changed: -x to +x)
2859=== modified file 'account/project/analytic_account_demo.xml' (properties changed: -x to +x)
2860=== modified file 'account/project/project.py' (properties changed: -x to +x)
2861=== modified file 'account/project/project_demo.xml' (properties changed: -x to +x)
2862=== modified file 'account/project/project_report.xml' (properties changed: -x to +x)
2863=== modified file 'account/project/project_view.xml' (properties changed: -x to +x)
2864=== modified file 'account/project/report/__init__.py' (properties changed: -x to +x)
2865=== modified file 'account/project/report/account_journal.py' (properties changed: -x to +x)
2866=== modified file 'account/project/report/analytic_balance.py' (properties changed: -x to +x)
2867=== modified file 'account/project/report/analytic_balance.rml' (properties changed: -x to +x)
2868=== modified file 'account/project/report/analytic_balance.sxw' (properties changed: -x to +x)
2869=== modified file 'account/project/report/analytic_journal.py' (properties changed: -x to +x)
2870=== modified file 'account/project/report/analytic_journal.rml' (properties changed: -x to +x)
2871=== modified file 'account/project/report/analytic_journal.sxw' (properties changed: -x to +x)
2872=== modified file 'account/project/report/cost_ledger.py' (properties changed: -x to +x)
2873=== modified file 'account/project/report/cost_ledger.rml' (properties changed: -x to +x)
2874=== modified file 'account/project/report/cost_ledger.sxw' (properties changed: -x to +x)
2875=== modified file 'account/project/report/inverted_analytic_balance.py' (properties changed: -x to +x)
2876=== modified file 'account/project/report/inverted_analytic_balance.rml' (properties changed: -x to +x)
2877=== modified file 'account/project/report/inverted_analytic_balance.sxw' (properties changed: -x to +x)
2878=== modified file 'account/project/report/quantity_cost_ledger.py' (properties changed: -x to +x)
2879=== modified file 'account/project/report/quantity_cost_ledger.rml' (properties changed: -x to +x)
2880=== modified file 'account/project/report/quantity_cost_ledger.sxw' (properties changed: -x to +x)
2881=== modified file 'account/project/wizard/__init__.py' (properties changed: -x to +x)
2882=== modified file 'account/project/wizard/account_analytic_balance_report.py' (properties changed: -x to +x)
2883=== modified file 'account/project/wizard/account_analytic_balance_report_view.xml' (properties changed: -x to +x)
2884=== modified file 'account/project/wizard/account_analytic_chart.py' (properties changed: -x to +x)
2885=== modified file 'account/project/wizard/account_analytic_chart_view.xml' (properties changed: -x to +x)
2886=== modified file 'account/project/wizard/account_analytic_cost_ledger_for_journal_report.py' (properties changed: -x to +x)
2887=== modified file 'account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml' (properties changed: -x to +x)
2888=== modified file 'account/project/wizard/account_analytic_cost_ledger_report.py' (properties changed: -x to +x)
2889=== modified file 'account/project/wizard/account_analytic_cost_ledger_view.xml' (properties changed: -x to +x)
2890=== modified file 'account/project/wizard/account_analytic_inverted_balance_report.py' (properties changed: -x to +x)
2891=== modified file 'account/project/wizard/account_analytic_inverted_balance_report.xml' (properties changed: -x to +x)
2892=== modified file 'account/project/wizard/account_analytic_journal_report.py' (properties changed: -x to +x)
2893=== modified file 'account/project/wizard/account_analytic_journal_report_view.xml' (properties changed: -x to +x)
2894=== modified file 'account/project/wizard/project_account_analytic_line.py' (properties changed: -x to +x)
2895=== modified file 'account/project/wizard/project_account_analytic_line_view.xml' (properties changed: -x to +x)
2896=== modified file 'account/report/__init__.py' (properties changed: -x to +x)
2897--- account/report/__init__.py 2010-10-05 07:06:57 +0000
2898+++ account/report/__init__.py 2011-01-13 18:00:31 +0000
2899@@ -39,8 +39,6 @@
2900 import account_report
2901 import account_entries_report
2902 import account_analytic_entries_report
2903-#import voucher_print
2904-import account_voucher_print
2905 import account_balance_sheet
2906 import account_profit_loss
2907
2908
2909=== modified file 'account/report/account_aged_partner_balance.py' (properties changed: -x to +x)
2910=== modified file 'account/report/account_aged_partner_balance.rml' (properties changed: -x to +x)
2911=== modified file 'account/report/account_aged_partner_balance.sxw' (properties changed: -x to +x)
2912=== modified file 'account/report/account_analytic_entries_report.py' (properties changed: -x to +x)
2913=== modified file 'account/report/account_analytic_entries_report_view.xml' (properties changed: -x to +x)
2914=== modified file 'account/report/account_balance.py' (properties changed: -x to +x)
2915--- account/report/account_balance.py 2011-01-11 09:52:35 +0000
2916+++ account/report/account_balance.py 2011-01-13 18:00:31 +0000
2917@@ -20,6 +20,7 @@
2918 ##############################################################################
2919
2920 import time
2921+
2922 from report import report_sxw
2923 from common_report_header import common_report_header
2924
2925
2926=== modified file 'account/report/account_balance.rml' (properties changed: -x to +x)
2927=== modified file 'account/report/account_balance.sxw' (properties changed: -x to +x)
2928=== modified file 'account/report/account_balance_landscape.py' (properties changed: -x to +x)
2929=== modified file 'account/report/account_balance_landscape.rml' (properties changed: -x to +x)
2930=== modified file 'account/report/account_balance_landscape.sxw' (properties changed: -x to +x)
2931=== modified file 'account/report/account_balance_landscape_old_backup.rml' (properties changed: -x to +x)
2932=== modified file 'account/report/account_balance_old_backup.rml' (properties changed: -x to +x)
2933=== modified file 'account/report/account_balance_sheet.py' (properties changed: -x to +x)
2934=== modified file 'account/report/account_balance_sheet.rml' (properties changed: -x to +x)
2935=== modified file 'account/report/account_balance_sheet.sxw' (properties changed: -x to +x)
2936=== modified file 'account/report/account_balance_sheet_horizontal.rml' (properties changed: -x to +x)
2937=== modified file 'account/report/account_balance_sheet_horizontal.sxw' (properties changed: -x to +x)
2938=== modified file 'account/report/account_central_journal.py' (properties changed: -x to +x)
2939=== modified file 'account/report/account_central_journal.rml' (properties changed: -x to +x)
2940=== modified file 'account/report/account_central_journal.sxw' (properties changed: -x to +x)
2941=== modified file 'account/report/account_entries_report.py' (properties changed: -x to +x)
2942--- account/report/account_entries_report.py 2010-12-17 04:37:32 +0000
2943+++ account/report/account_entries_report.py 2011-01-13 18:00:31 +0000
2944@@ -94,25 +94,21 @@
2945 return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
2946 context=context, count=count)
2947
2948- def read_group(self, cr, uid, domain, *args, **kwargs):
2949- todel=[]
2950+ def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
2951+ if context is None:
2952+ context = {}
2953 fiscalyear_obj = self.pool.get('account.fiscalyear')
2954 period_obj = self.pool.get('account.period')
2955- for arg in domain:
2956- if arg[0] == 'period_id' and arg[2] == 'current_period':
2957- current_period = period_obj.find(cr, uid)[0]
2958- domain.append(['period_id','in',[current_period]])
2959- todel.append(arg)
2960- break
2961- elif arg[0] == 'period_id' and arg[2] == 'current_year':
2962- current_year = fiscalyear_obj.find(cr, uid)
2963- ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
2964- domain.append(['period_id','in',ids])
2965- todel.append(arg)
2966- for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
2967- if a in domain:
2968- domain.remove(a)
2969- return super(account_entries_report, self).read_group(cr, uid, domain, *args, **kwargs)
2970+ if context.get('period', False) == 'current_period':
2971+ current_period = period_obj.find(cr, uid)[0]
2972+ domain.append(['period_id','in',[current_period]])
2973+ elif context.get('year', False) == 'current_year':
2974+ current_year = fiscalyear_obj.find(cr, uid)
2975+ ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
2976+ domain.append(['period_id','in',ids])
2977+ else:
2978+ domain = domain
2979+ return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby)
2980
2981 def init(self, cr):
2982 tools.drop_view_if_exists(cr, 'account_entries_report')
2983
2984=== modified file 'account/report/account_entries_report_view.xml' (properties changed: -x to +x)
2985--- account/report/account_entries_report_view.xml 2010-12-27 11:31:05 +0000
2986+++ account/report/account_entries_report_view.xml 2011-01-13 18:00:31 +0000
2987@@ -70,17 +70,17 @@
2988 <group colspan="10" col="12">
2989 <filter icon="terp-go-year" string="This F.Year"
2990 name="thisyear"
2991- domain="[('period_id','in','current_year')]"
2992+ context="{'year':'current_year'}"
2993 help="Journal Entries with period in current year"/>
2994 <filter icon="terp-go-month" string="This Period"
2995 name="period"
2996- domain="[('period_id','in','current_period')]"
2997+ context="{'period':'current_period'}"
2998 help="Journal Entries with period in current period"/>
2999 <separator orientation="vertical"/>
3000 <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
3001 <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
3002 <separator orientation="vertical"/>
3003- <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False)]" help = "Unreconciled entries"/>
3004+ <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
3005 <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
3006 <separator orientation="vertical"/>
3007 <field name="account_id"/>
3008
3009=== modified file 'account/report/account_general_journal.py' (properties changed: -x to +x)
3010=== modified file 'account/report/account_general_journal.rml' (properties changed: -x to +x)
3011=== modified file 'account/report/account_general_journal.sxw' (properties changed: -x to +x)
3012=== modified file 'account/report/account_general_ledger.py' (properties changed: -x to +x)
3013--- account/report/account_general_ledger.py 2010-12-30 11:53:09 +0000
3014+++ account/report/account_general_ledger.py 2011-01-13 18:00:31 +0000
3015@@ -103,7 +103,9 @@
3016
3017 def get_children_accounts(self, account):
3018 res = []
3019+ currency_obj = self.pool.get('res.currency')
3020 ids_acc = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account.id)
3021+ currency = account.currency_id and account.currency_id or account.company_id.currency_id
3022 for child_account in self.pool.get('account.account').browse(self.cr, self.uid, ids_acc, context=self.context):
3023 sql = """
3024 SELECT count(id)
3025@@ -119,7 +121,7 @@
3026 res.append(child_account)
3027 elif self.display_account == 'bal_solde':
3028 if child_account.type != 'view' and num_entry <> 0:
3029- if ( sold_account <> 0.0):
3030+ if not currency_obj.is_zero(self.cr, self.uid, currency, sold_account):
3031 res.append(child_account)
3032 else:
3033 res.append(child_account)
3034
3035=== modified file 'account/report/account_general_ledger.rml' (properties changed: -x to +x)
3036=== modified file 'account/report/account_general_ledger.sxw' (properties changed: -x to +x)
3037=== modified file 'account/report/account_general_ledger_landscape.rml' (properties changed: -x to +x)
3038=== modified file 'account/report/account_general_ledger_landscape.sxw' (properties changed: -x to +x)
3039=== modified file 'account/report/account_invoice_report.py' (properties changed: -x to +x)
3040=== modified file 'account/report/account_invoice_report_view.xml' (properties changed: -x to +x)
3041--- account/report/account_invoice_report_view.xml 2010-12-13 11:30:33 +0000
3042+++ account/report/account_invoice_report_view.xml 2011-01-13 18:00:31 +0000
3043@@ -150,6 +150,7 @@
3044 <act_window
3045 id="act_account_invoice_partner_relation"
3046 name="Monthly Turnover"
3047+ groups="group_account_manager"
3048 context="{'search_default_partner_id':[active_id], 'search_default_month':1,'search_default_user':1,'group_by_no_leaf':1,'group_by':[]}"
3049 res_model="account.invoice.report"
3050 src_model="res.partner"/>
3051
3052=== modified file 'account/report/account_journal.py' (properties changed: -x to +x)
3053=== modified file 'account/report/account_journal.rml' (properties changed: -x to +x)
3054=== modified file 'account/report/account_journal.sxw' (properties changed: -x to +x)
3055=== modified file 'account/report/account_partner_balance.py' (properties changed: -x to +x)
3056=== modified file 'account/report/account_partner_balance.rml' (properties changed: -x to +x)
3057=== modified file 'account/report/account_partner_balance.sxw' (properties changed: -x to +x)
3058=== modified file 'account/report/account_partner_ledger.py' (properties changed: -x to +x)
3059=== modified file 'account/report/account_partner_ledger.rml' (properties changed: -x to +x)
3060=== modified file 'account/report/account_partner_ledger.sxw' (properties changed: -x to +x)
3061=== modified file 'account/report/account_partner_ledger_other.rml' (properties changed: -x to +x)
3062=== modified file 'account/report/account_partner_ledger_other.sxw' (properties changed: -x to +x)
3063=== modified file 'account/report/account_print_invoice.py' (properties changed: -x to +x)
3064=== modified file 'account/report/account_print_invoice.rml' (properties changed: -x to +x)
3065=== modified file 'account/report/account_print_invoice.sxw' (properties changed: -x to +x)
3066=== modified file 'account/report/account_print_overdue.py' (properties changed: -x to +x)
3067=== modified file 'account/report/account_print_overdue.rml' (properties changed: -x to +x)
3068=== modified file 'account/report/account_print_overdue.sxw' (properties changed: -x to +x)
3069=== modified file 'account/report/account_profit_horizontal.rml' (properties changed: -x to +x)
3070=== modified file 'account/report/account_profit_horizontal.sxw' (properties changed: -x to +x)
3071=== modified file 'account/report/account_profit_loss.py' (properties changed: -x to +x)
3072=== modified file 'account/report/account_profit_loss.rml' (properties changed: -x to +x)
3073=== modified file 'account/report/account_profit_loss.sxw' (properties changed: -x to +x)
3074=== modified file 'account/report/account_report.py' (properties changed: -x to +x)
3075=== modified file 'account/report/account_report_view.xml' (properties changed: -x to +x)
3076=== modified file 'account/report/account_tax_code.py' (properties changed: -x to +x)
3077=== modified file 'account/report/account_tax_code.rml' (properties changed: -x to +x)
3078=== modified file 'account/report/account_tax_code.sxw' (properties changed: -x to +x)
3079=== modified file 'account/report/account_tax_report.py' (properties changed: -x to +x)
3080=== modified file 'account/report/account_tax_report.rml' (properties changed: -x to +x)
3081=== modified file 'account/report/account_tax_report.sxw' (properties changed: -x to +x)
3082=== removed file 'account/report/account_voucher_print.py'
3083--- account/report/account_voucher_print.py 2010-11-12 16:58:02 +0000
3084+++ account/report/account_voucher_print.py 1970-01-01 00:00:00 +0000
3085@@ -1,69 +0,0 @@
3086-# -*- encoding: utf-8 -*-
3087-##############################################################################
3088-#
3089-# OpenERP, Open Source Management Solution
3090-# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
3091-# $Id$
3092-#
3093-# This program is free software: you can redistribute it and/or modify
3094-# it under the terms of the GNU Affero General Public License as published by
3095-# the Free Software Foundation, either version 3 of the License, or
3096-# (at your option) any later version.
3097-#
3098-# This program is distributed in the hope that it will be useful,
3099-# but WITHOUT ANY WARRANTY; without even the implied warranty of
3100-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3101-# GNU Affero General Public License for more details.
3102-#
3103-# You should have received a copy of the GNU Affero General Public License
3104-# along with this program. If not, see <http://www.gnu.org/licenses/>.
3105-#
3106-##############################################################################
3107-
3108-import time
3109-from report import report_sxw
3110-from tools import amount_to_text_en
3111-
3112-class report_voucher_move(report_sxw.rml_parse):
3113- def __init__(self, cr, uid, name, context=None):
3114- super(report_voucher_move, self).__init__(cr, uid, name, context=context)
3115- self.localcontext.update({
3116- 'time': time,
3117- 'convert':self.convert,
3118- 'get_title': self.get_title,
3119- 'debit':self.debit,
3120- 'credit':self.credit,
3121- })
3122- self.user = uid
3123-
3124- def convert(self, amount):
3125- user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0]
3126- return amount_to_text_en.amount_to_text(amount, 'en', user_id.company_id.currency_id.name)
3127-
3128- def get_title(self, voucher):
3129- title = ''
3130- if voucher.journal_id:
3131- type = voucher.journal_id.type
3132- title = type[0].swapcase() + type[1:] + " Voucher"
3133- return title
3134-
3135- def debit(self, move_ids):
3136- debit = 0.0
3137- for move in move_ids:
3138- debit +=move.debit
3139- return debit
3140-
3141- def credit(self, move_ids):
3142- credit = 0.0
3143- for move in move_ids:
3144- credit +=move.credit
3145- return credit
3146-
3147-report_sxw.report_sxw(
3148- 'report.account.move.voucher',
3149- 'account.move',
3150- 'addons/account/report/account_voucher_print.rml',
3151- parser=report_voucher_move,header="external"
3152-)
3153-
3154-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3155\ No newline at end of file
3156
3157=== removed file 'account/report/account_voucher_print.rml'
3158--- account/report/account_voucher_print.rml 2010-11-19 13:45:17 +0000
3159+++ account/report/account_voucher_print.rml 1970-01-01 00:00:00 +0000
3160@@ -1,470 +0,0 @@
3161-<?xml version="1.0"?>
3162-<document filename="Voucher.pdf">
3163- <template pageSize="(595.0,842.0)" title="Voucher" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
3164- <pageTemplate id="first">
3165- <frame id="first" x1="28.0" y1="42.0" width="525" height="772"/>
3166- </pageTemplate>
3167- </template>
3168- <stylesheet>
3169- <blockTableStyle id="Standard_Outline">
3170- <blockAlignment value="LEFT"/>
3171- <blockValign value="TOP"/>
3172- </blockTableStyle>
3173- <blockTableStyle id="Table6">
3174- <blockAlignment value="LEFT"/>
3175- <blockValign value="TOP"/>
3176- </blockTableStyle>
3177- <blockTableStyle id="Table4">
3178- <blockAlignment value="LEFT"/>
3179- <blockValign value="TOP"/>
3180- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
3181- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
3182- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
3183- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
3184- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
3185- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
3186- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
3187- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
3188- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
3189- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
3190- <lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
3191- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
3192- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
3193- </blockTableStyle>
3194- <blockTableStyle id="Table5">
3195- <blockAlignment value="LEFT"/>
3196- <blockValign value="TOP"/>
3197- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
3198- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
3199- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
3200- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
3201- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
3202- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
3203- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
3204- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
3205- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
3206- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
3207- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
3208- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
3209- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="4,0" stop="4,-1"/>
3210- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
3211- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
3212- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
3213- <lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
3214- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="5,0" stop="5,0"/>
3215- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="5,-1" stop="5,-1"/>
3216- </blockTableStyle>
3217- <blockTableStyle id="Heading1">
3218- <blockAlignment value="LEFT"/>
3219- <blockValign value="TOP"/>
3220- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
3221- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
3222- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
3223- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
3224- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
3225- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
3226- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
3227- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
3228- </blockTableStyle>
3229- <blockTableStyle id="Table2">
3230- <blockAlignment value="LEFT"/>
3231- <blockValign value="TOP"/>
3232- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
3233- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
3234- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
3235- </blockTableStyle>
3236- <blockTableStyle id="last_info">
3237- <blockAlignment value="LEFT"/>
3238- <blockValign value="TOP"/>
3239- </blockTableStyle>
3240- <blockTableStyle id="Table1">
3241- <blockAlignment value="LEFT"/>
3242- <blockValign value="TOP"/>
3243- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
3244- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
3245- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
3246- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
3247- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
3248- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
3249- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
3250- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
3251- </blockTableStyle>
3252- <blockTableStyle id="Table3">
3253- <blockAlignment value="LEFT"/>
3254- <blockValign value="TOP"/>
3255- </blockTableStyle>
3256- <initialize>
3257- <paraStyle name="all" alignment="justify"/>
3258- </initialize>
3259- <paraStyle name="P1" fontName="Helvetica"/>
3260- <paraStyle name="P2" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
3261- <paraStyle name="P3" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
3262- <paraStyle name="P4" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
3263- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
3264- <paraStyle name="P6" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3265- <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
3266- <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3267- <paraStyle name="Standard" fontName="Helvetica"/>
3268- <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
3269- <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3270- <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3271- <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
3272- <paraStyle name="Index" fontName="Helvetica"/>
3273- <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3274- <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
3275- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
3276- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3277- <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3278- <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3279- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3280- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3281- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3282- <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3283- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3284- <paraStyle name="Footer" fontName="Helvetica"/>
3285- <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
3286- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3287- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3288- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3289- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3290- <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3291- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
3292- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3293- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3294- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
3295- <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3296- <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3297- <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
3298- <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3299- <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
3300- <paraStyle name="Header" fontName="Helvetica"/>
3301- <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
3302- <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
3303- <paraStyle name="Signature" fontName="Helvetica"/>
3304- <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3305- <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3306- <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3307- <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3308- <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3309- <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3310- <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
3311- <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
3312- <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3313- <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3314- <paraStyle name="Salutation" fontName="Helvetica"/>
3315- <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3316- <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
3317- <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3318- <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
3319- <paraStyle name="terp_default_9_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3320- <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3321- <paraStyle name="terp_default_9_30_italic" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
3322- <images/>
3323- </stylesheet>
3324- <story>
3325- <pto>
3326- <pto_header>
3327- <blockTable colWidths="313.0,107.0,105.0" style="Heading1">
3328- <tr>
3329- <td>
3330- <para style="terp_tblheader_Details">Particulars</para>
3331- </td>
3332- <td>
3333- <para style="terp_tblheader_Details_Right">Debit</para>
3334- </td>
3335- <td>
3336- <para style="terp_tblheader_Details_Right">Credit</para>
3337- </td>
3338- </tr>
3339- </blockTable>
3340- </pto_header>
3341- <para style="P8">[[ repeatIn(objects,'voucher') ]]</para>
3342- <blockTable colWidths="524.0" style="Table6">
3343- <tr>
3344- <td>
3345- <para style="terp_header_Centre">[[ get_title(voucher) ]]</para>
3346- </td>
3347- </tr>
3348- </blockTable>
3349- <para style="Standard">
3350- <font color="white"> </font>
3351- </para>
3352- <blockTable colWidths="63.0,200.0,52.0,210.0" style="Table4">
3353- <tr>
3354- <td>
3355- <para style="terp_tblheader_General">Journal:</para>
3356- </td>
3357- <td>
3358- <para style="terp_default_9">[[ voucher.journal_id.name ]]</para>
3359- </td>
3360- <td>
3361- <para style="terp_tblheader_General">Number:</para>
3362- </td>
3363- <td>
3364- <para style="terp_default_9">[[ voucher.name ]]</para>
3365- </td>
3366- </tr>
3367- </blockTable>
3368- <blockTable colWidths="63.0,72.0,44.0,84.0,52.0,210.0" style="Table5">
3369- <tr>
3370- <td>
3371- <para style="terp_tblheader_General">State:</para>
3372- </td>
3373- <td>
3374- <para style="terp_default_9">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
3375- <para style="terp_default_9">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
3376- <para style="terp_default_9">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
3377- <para style="terp_default_9">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
3378- </td>
3379- <td>
3380- <para style="terp_tblheader_General">Ref. :</para>
3381- </td>
3382- <td>
3383- <para style="terp_default_9">[[ voucher.ref]]</para>
3384- </td>
3385- <td>
3386- <para style="terp_tblheader_General">Date:</para>
3387- </td>
3388- <td>
3389- <para style="terp_default_9">[[ formatLang(voucher.date , date=True) or '' ]]</para>
3390- </td>
3391- </tr>
3392- </blockTable>
3393- <para style="terp_default_9">
3394- <font color="white"> </font>
3395- </para>
3396- <para style="terp_default_9">
3397- <font color="white"> </font>
3398- </para>
3399- <blockTable colWidths="313.0,107.0,105.0" style="Heading1">
3400- <tr>
3401- <td>
3402- <para style="terp_tblheader_Details">Particulars</para>
3403- </td>
3404- <td>
3405- <para style="terp_tblheader_Details_Right">Debit</para>
3406- </td>
3407- <td>
3408- <para style="terp_tblheader_Details_Right">Credit</para>
3409- </td>
3410- </tr>
3411- </blockTable>
3412- <para style="terp_default_1">
3413- <font color="white"> </font>
3414- </para>
3415- <section>
3416- <para style="terp_default_8">[[ repeatIn(voucher.line_id,'line_id') ]]</para>
3417- <blockTable colWidths="313.0,106.0,105.0" style="Table2">
3418- <tr>
3419- <td>
3420- <para style="terp_default_Bold_9">[[ (line_id.partner_id and line_id.partner_id.name) or 'Account']]</para>
3421- </td>
3422- <td>
3423- <para style="terp_default_Right_9_Bold">[[ formatLang(line_id.debit) ]]</para>
3424- </td>
3425- <td>
3426- <para style="terp_default_Right_9_Bold">[[ formatLang(line_id.credit) ]]</para>
3427- </td>
3428- </tr>
3429- <tr>
3430- <td>
3431- <para style="terp_default_9_30">[[ line_id.account_id.name ]] </para>
3432- </td>
3433- <td>
3434- <para style="terp_default_9">
3435- <font color="white"> </font>
3436- </para>
3437- </td>
3438- <td>
3439- <para style="terp_default_9">
3440- <font color="white"> </font>
3441- </para>
3442- </td>
3443- </tr>
3444- <tr>
3445- <td>
3446- <para style="terp_default_9_30_italic">[[ line_id.name ]]-[[voucher.ref]]</para>
3447- </td>
3448- <td>
3449- <para style="terp_default_9">
3450- <font color="white"> </font>
3451- </para>
3452- </td>
3453- <td>
3454- <para style="terp_default_9">
3455- <font color="white"> </font>
3456- </para>
3457- </td>
3458- </tr>
3459- </blockTable>
3460- <para style="terp_default_1">
3461- <font color="white"> </font>
3462- </para>
3463- </section>
3464- <para style="terp_default_1">
3465- <font color="white"> </font>
3466- </para>
3467- <blockTable colWidths="313.0,106.0,105.0" style="last_info">
3468- <tr>
3469- <td>
3470- <para style="P4">Through : </para>
3471- </td>
3472- <td>
3473- <para style="P2">
3474- <font color="white"> </font>
3475- </para>
3476- </td>
3477- <td>
3478- <para style="P2">
3479- <font color="white"> </font>
3480- </para>
3481- </td>
3482- </tr>
3483- <tr>
3484- <td>
3485- <para style="terp_default_9_italic">[[ voucher.narration or '']]</para>
3486- </td>
3487- <td>
3488- <para style="P2">
3489- <font color="white"> </font>
3490- </para>
3491- </td>
3492- <td>
3493- <para style="P2">
3494- <font color="white"> </font>
3495- </para>
3496- </td>
3497- </tr>
3498- <tr>
3499- <td>
3500- <para style="P4">On Account of : </para>
3501- </td>
3502- <td>
3503- <para style="P2">
3504- <font color="white"> </font>
3505- </para>
3506- </td>
3507- <td>
3508- <para style="P2">
3509- <font color="white"> </font>
3510- </para>
3511- </td>
3512- </tr>
3513- <tr>
3514- <td>
3515- <para style="P7">[[ voucher.line_id and voucher.line_id[0].name or removeParentNode('para') ]]</para>
3516- </td>
3517- <td>
3518- <para style="P2">
3519- <font color="white"> </font>
3520- </para>
3521- </td>
3522- <td>
3523- <para style="P2">
3524- <font color="white"> </font>
3525- </para>
3526- </td>
3527- </tr>
3528- <tr>
3529- <td>
3530- <para style="P4">Amount (in words) : </para>
3531- </td>
3532- <td>
3533- <para style="P4">
3534- <font color="white"> </font>
3535- </para>
3536- </td>
3537- <td>
3538- <para style="P4">
3539- <font color="white"> </font>
3540- </para>
3541- </td>
3542- </tr>
3543- <tr>
3544- <td>
3545- <para style="P7">[[ convert(voucher.amount) ]]</para>
3546- </td>
3547- <td>
3548- <para style="P3">
3549- <font color="white"> </font>
3550- </para>
3551- </td>
3552- <td>
3553- <para style="P3">
3554- <font color="white"> </font>
3555- </para>
3556- </td>
3557- </tr>
3558- </blockTable>
3559- <para style="terp_default_1">
3560- <font color="white"> </font>
3561- </para>
3562- <blockTable colWidths="313.0,106.0,105.0" style="Table1">
3563- <tr>
3564- <td>
3565- <para style="P5">
3566- <font color="white"> </font>
3567- </para>
3568- </td>
3569- <td>
3570- <para style="terp_tblheader_Details_Right">[[ formatLang(debit(voucher.line_id))]]</para>
3571- </td>
3572- <td>
3573- <para style="terp_tblheader_Details_Right">[[ formatLang(credit(voucher.line_id)) ]]</para>
3574- </td>
3575- </tr>
3576- </blockTable>
3577- <para style="terp_default_1">
3578- <font color="white"> </font>
3579- </para>
3580- <blockTable colWidths="154.0,160.0,63.0,148.0" style="Table3">
3581- <tr>
3582- <td>
3583- <para style="terp_default_9">
3584- <font color="white"> </font>
3585- </para>
3586- <para style="terp_default_9">
3587- <font color="white"> </font>
3588- </para>
3589- </td>
3590- <td>
3591- <para style="terp_default_9">
3592- <font color="white"> </font>
3593- </para>
3594- </td>
3595- <td>
3596- <para style="terp_default_9">
3597- <font color="white"> </font>
3598- </para>
3599- </td>
3600- <td>
3601- <para style="terp_default_9">
3602- <font color="white"> </font>
3603- </para>
3604- </td>
3605- </tr>
3606- <tr>
3607- <td>
3608- <para style="P6">Receiver's Signature</para>
3609- </td>
3610- <td>
3611- <para style="P6">
3612- <font color="white"> </font>
3613- </para>
3614- </td>
3615- <td>
3616- <para style="P6">
3617- <font color="white"> </font>
3618- </para>
3619- </td>
3620- <td>
3621- <para style="terp_default_Right_9">Authorised Signatory</para>
3622- </td>
3623- </tr>
3624- </blockTable>
3625- <para style="P1">
3626- <font color="white"> </font>
3627- </para>
3628- </pto>
3629- </story>
3630-</document>
3631
3632=== removed file 'account/report/account_voucher_print.sxw'
3633Binary files account/report/account_voucher_print.sxw 2010-10-05 07:06:57 +0000 and account/report/account_voucher_print.sxw 1970-01-01 00:00:00 +0000 differ
3634=== modified file 'account/report/common_report_header.py' (properties changed: -x to +x)
3635=== modified file 'account/report/transfer.xml' (properties changed: -x to +x)
3636=== modified file 'account/report/transfer.xsl' (properties changed: -x to +x)
3637=== modified file 'account/res_currency.py' (properties changed: -x to +x)
3638--- account/res_currency.py 2010-12-22 16:09:26 +0000
3639+++ account/res_currency.py 2011-01-13 18:00:31 +0000
3640@@ -21,6 +21,7 @@
3641 from osv import osv
3642
3643 """Inherit res.currency to handle accounting date values when converting currencies"""
3644+
3645 class res_currency_account(osv.osv):
3646 _inherit = "res.currency"
3647
3648@@ -41,4 +42,6 @@
3649 rate = float(tot2)/float(tot1)
3650 return rate
3651
3652-res_currency_account()
3653\ No newline at end of file
3654+res_currency_account()
3655+
3656+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3657\ No newline at end of file
3658
3659=== modified file 'account/security/account_security.xml' (properties changed: -x to +x)
3660=== modified file 'account/security/ir.model.access.csv' (properties changed: -x to +x)
3661--- account/security/ir.model.access.csv 2010-12-30 15:03:40 +0000
3662+++ account/security/ir.model.access.csv 2011-01-13 18:00:31 +0000
3663@@ -98,6 +98,7 @@
3664 "access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
3665 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
3666 "access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
3667+"access_account_entries_report_invoice","account.entries.report","model_account_entries_report","account.group_account_invoice",1,0,0,0
3668 "access_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_user",1,0,0,0
3669 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
3670 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
3671
3672=== modified file 'account/sequence.py' (properties changed: -x to +x)
3673=== modified file 'account/sequence_view.xml' (properties changed: -x to +x)
3674=== modified file 'account/test/account_bank_statement.yml' (properties changed: -x to +x)
3675--- account/test/account_bank_statement.yml 2010-10-15 06:21:49 +0000
3676+++ account/test/account_bank_statement.yml 2011-01-13 18:00:31 +0000
3677@@ -6,14 +6,14 @@
3678 !record {model: account.bank.statement, id: account_bank_statement_0}:
3679 balance_end_real: 0.0
3680 balance_start: 0.0
3681- date: '2010-10-14'
3682+ date: !eval time.strftime('%Y-%m-%d')
3683 journal_id: account.bank_journal
3684 name: /
3685 period_id: account.period_10
3686 line_ids:
3687 - account_id: account.a_recv
3688 amount: 1000.0
3689- date: '2010-10-14'
3690+ date: !eval time.strftime('%Y-%m-%d')
3691 name: a
3692 partner_id: base.res_partner_4
3693 sequence: 0.0
3694
3695=== modified file 'account/test/account_cash_statement.yml' (properties changed: -x to +x)
3696--- account/test/account_cash_statement.yml 2010-10-28 07:18:27 +0000
3697+++ account/test/account_cash_statement.yml 2011-01-13 18:00:31 +0000
3698@@ -2,7 +2,7 @@
3699 In order to test Cash statement I create a Cash statement and confirm it and check it's move created
3700 -
3701 !record {model: account.bank.statement, id: account_bank_statement_1}:
3702- date: '2010-10-16'
3703+ date: !eval time.strftime('%Y-%m-%d')
3704 journal_id: account.cash_journal
3705 name: /
3706 period_id: account.period_10
3707@@ -41,7 +41,7 @@
3708 line_ids:
3709 - account_id: account.a_recv
3710 amount: 1000.0
3711- date: '2010-10-16'
3712+ date: !eval time.strftime('%Y-%m-%d')
3713 name: test
3714 partner_id: base.res_partner_4
3715 sequence: 0.0
3716
3717=== modified file 'account/test/account_change_currency.yml' (properties changed: -x to +x)
3718=== modified file 'account/test/account_customer_invoice.yml' (properties changed: -x to +x)
3719--- account/test/account_customer_invoice.yml 2010-09-11 09:16:46 +0000
3720+++ account/test/account_customer_invoice.yml 2011-01-13 18:00:31 +0000
3721@@ -7,7 +7,7 @@
3722 address_invoice_id: base.res_partner_address_zen
3723 company_id: base.main_company
3724 currency_id: base.EUR
3725- date_invoice: '2010-05-26'
3726+ date_invoice: !eval time.strftime('%Y-%m-%d')
3727 invoice_line:
3728 - account_id: account.a_sale
3729 name: '[PC3] Medium PC'
3730
3731=== modified file 'account/test/account_fiscalyear_close.yml' (properties changed: -x to +x)
3732=== modified file 'account/test/account_fiscalyear_close_state.yml' (properties changed: -x to +x)
3733=== modified file 'account/test/account_invoice_state.yml' (properties changed: -x to +x)
3734=== modified file 'account/test/account_period_close.yml' (properties changed: -x to +x)
3735--- account/test/account_period_close.yml 2010-06-08 12:47:44 +0000
3736+++ account/test/account_period_close.yml 2011-01-13 18:00:31 +0000
3737@@ -4,10 +4,10 @@
3738 -
3739 !record {model: account.period, id: account_period_jan0}:
3740 company_id: base.main_company
3741- date_start: '2010-01-01'
3742- date_stop: '2010-01-31'
3743+ date_start: !eval "'%s-01-01' %(datetime.now().year)"
3744+ date_stop: !eval "'%s-01-31' %(datetime.now().year)"
3745 fiscalyear_id: account.data_fiscalyear
3746- name: Jan-2010
3747+ name: !eval "'Jan-%s' %(datetime.now().year)"
3748 special: 1
3749
3750 -
3751@@ -16,7 +16,7 @@
3752 !assert {model: account.period, id: account_period_jan0, string: Period is in Draft state}:
3753 - state == 'draft'
3754 -
3755- I use "Close a Period" wizard to close period Jan-2010
3756+ I use "Close a Period" wizard to close period
3757 -
3758 !record {model: account.period.close, id: account_period_close_0}:
3759 sure: 1
3760
3761=== modified file 'account/test/account_report.yml' (properties changed: -x to +x)
3762--- account/test/account_report.yml 2010-12-23 08:44:31 +0000
3763+++ account/test/account_report.yml 2011-01-13 18:00:31 +0000
3764@@ -29,14 +29,6 @@
3765 if tools.config['test_report_directory']:
3766 file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
3767 -
3768- In order to test the PDF reports defined on Account Move, we will print the Voucher Report
3769--
3770- !python {model: account.move}: |
3771- import netsvc, tools, os
3772- (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {})
3773- if tools.config['test_report_directory']:
3774- file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data)
3775--
3776 Print the Aged Partner Balance Report
3777 -
3778 !python {model: account.account}: |
3779@@ -44,7 +36,7 @@
3780 ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
3781 data_dict = {'chart_account_id':ref('account.chart0')}
3782 from tools import test_reports
3783- test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
3784+ test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
3785 -
3786 Print the Account Balance Sheet in Horizontal mode
3787 -
3788@@ -53,7 +45,7 @@
3789 ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
3790 data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
3791 from tools import test_reports
3792- test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
3793+ test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
3794 -
3795 Print the Account Balance Sheet in Normal mode
3796 -
3797@@ -62,7 +54,7 @@
3798 ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
3799 data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
3800 from tools import test_reports
3801- test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
3802+ test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
3803 -
3804 Print the Account Balance Report in Normal mode through the wizard - From Account Chart
3805 -
3806@@ -157,7 +149,7 @@
3807 ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
3808 data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
3809 from tools import test_reports
3810- test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
3811+ test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
3812 -
3813 Print the Profit-Loss Report in Horizontal Mode
3814 -
3815@@ -166,7 +158,7 @@
3816 ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
3817 data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
3818 from tools import test_reports
3819- test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
3820+ test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
3821 -
3822 Print the Analytic Balance Report through the wizard
3823 -
3824@@ -215,4 +207,4 @@
3825 ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
3826 data_dict = {}
3827 from tools import test_reports
3828- test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')
3829+ test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')
3830
3831=== modified file 'account/test/account_sequence_test.yml' (properties changed: -x to +x)
3832=== modified file 'account/test/account_supplier_invoice.yml' (properties changed: -x to +x)
3833=== modified file 'account/test/account_use_model.yml' (properties changed: -x to +x)
3834=== modified file 'account/test/account_validate_account_move.yml' (properties changed: -x to +x)
3835--- account/test/account_validate_account_move.yml 2010-10-26 16:06:04 +0000
3836+++ account/test/account_validate_account_move.yml 2011-01-13 18:00:31 +0000
3837@@ -8,36 +8,36 @@
3838 In order to test the 'Post Journal Entries' wizard in OpenERP, I created an account move
3839 -
3840 !record {model: account.move, id: account_move_0}:
3841- date: '2010-06-07'
3842+ date: !eval time.strftime('%Y-%m-%d')
3843 journal_id: account.bank_journal
3844 line_id:
3845 - account_id: account.cash
3846 amount_currency: 0.0
3847 credit: 2000.0
3848- date: '2010-06-07'
3849+ date: !eval time.strftime('%Y-%m-%d')
3850 debit: 0.0
3851 journal_id: account.bank_journal
3852 name: Basic Computer
3853 partner_id: base.res_partner_desertic_hispafuentes
3854 period_id: account.period_6
3855- ref: '2010010'
3856+ ref: '2011010'
3857 tax_amount: 0.0
3858 - journal_id: account.bank_journal
3859 period_id: account.period_6
3860- ref: '2010010'
3861+ ref: '2011010'
3862 tax_code_id: account_tax_code_0
3863 tax_amount: 0.0
3864 account_id: account.a_recv
3865 amount_currency: 0.0
3866 credit: 0.0
3867- date: '2010-06-07'
3868+ date: !eval time.strftime('%Y-%m-%d')
3869 debit: 2000.0
3870 name: Basic Computer
3871 partner_id: base.res_partner_desertic_hispafuentes
3872 quantity: 0.0
3873 name: /
3874 period_id: account.period_6
3875- ref: '2010010'
3876+ ref: '2011010'
3877 state: draft
3878
3879 -
3880
3881=== modified file 'account/test/chart_of_account.yml' (properties changed: -x to +x)
3882--- account/test/chart_of_account.yml 2010-07-28 18:35:57 +0000
3883+++ account/test/chart_of_account.yml 2011-01-13 18:00:31 +0000
3884@@ -43,8 +43,8 @@
3885
3886 -
3887 !record {model: account.analytic.chart, id: account_analytic_chart_0}:
3888- from_date: '2010-01-01'
3889- to_date: '2010-06-30'
3890+ from_date: !eval "'%s-01-01' %(datetime.now().year)"
3891+ to_date: !eval "'%s-06-30' %(datetime.now().year)"
3892 -
3893 I clicked on Open chart Button to open the charts
3894
3895
3896=== modified file 'account/test/price_accuracy00.yml' (properties changed: -x to +x)
3897=== modified file 'account/test/test_parent_structure.py' (properties changed: -x to +x)
3898=== modified file 'account/test/test_parent_structure.yml' (properties changed: -x to +x)
3899=== modified file 'account/wizard/__init__.py' (properties changed: -x to +x)
3900=== modified file 'account/wizard/account_automatic_reconcile.py' (properties changed: -x to +x)
3901=== modified file 'account/wizard/account_automatic_reconcile_view.xml' (properties changed: -x to +x)
3902=== modified file 'account/wizard/account_change_currency.py' (properties changed: -x to +x)
3903=== modified file 'account/wizard/account_change_currency_view.xml' (properties changed: -x to +x)
3904=== modified file 'account/wizard/account_chart.py' (properties changed: -x to +x)
3905=== modified file 'account/wizard/account_chart_view.xml' (properties changed: -x to +x)
3906=== modified file 'account/wizard/account_fiscalyear_close.py' (properties changed: -x to +x)
3907=== modified file 'account/wizard/account_fiscalyear_close_state.py' (properties changed: -x to +x)
3908=== modified file 'account/wizard/account_fiscalyear_close_state.xml' (properties changed: -x to +x)
3909=== modified file 'account/wizard/account_fiscalyear_close_view.xml' (properties changed: -x to +x)
3910=== modified file 'account/wizard/account_invoice_refund.py' (properties changed: -x to +x)
3911=== modified file 'account/wizard/account_invoice_refund_view.xml' (properties changed: -x to +x)
3912=== modified file 'account/wizard/account_invoice_state.py' (properties changed: -x to +x)
3913=== modified file 'account/wizard/account_invoice_state_view.xml' (properties changed: -x to +x)
3914=== modified file 'account/wizard/account_journal_select.py' (properties changed: -x to +x)
3915=== modified file 'account/wizard/account_journal_select_view.xml' (properties changed: -x to +x)
3916=== modified file 'account/wizard/account_move_bank_reconcile.py' (properties changed: -x to +x)
3917=== modified file 'account/wizard/account_move_bank_reconcile_view.xml' (properties changed: -x to +x)
3918=== modified file 'account/wizard/account_move_journal.py' (properties changed: -x to +x)
3919=== modified file 'account/wizard/account_move_journal_view.xml' (properties changed: -x to +x)
3920=== modified file 'account/wizard/account_move_line_reconcile_select.py' (properties changed: -x to +x)
3921=== modified file 'account/wizard/account_move_line_reconcile_select_view.xml' (properties changed: -x to +x)
3922=== modified file 'account/wizard/account_move_line_select.py' (properties changed: -x to +x)
3923=== modified file 'account/wizard/account_move_line_select_view.xml' (properties changed: -x to +x)
3924=== modified file 'account/wizard/account_move_line_unreconcile_select.py' (properties changed: -x to +x)
3925=== modified file 'account/wizard/account_move_line_unreconcile_select_view.xml' (properties changed: -x to +x)
3926=== modified file 'account/wizard/account_open_closed_fiscalyear.py' (properties changed: -x to +x)
3927--- account/wizard/account_open_closed_fiscalyear.py 2010-12-28 10:44:45 +0000
3928+++ account/wizard/account_open_closed_fiscalyear.py 2011-01-13 18:00:31 +0000
3929@@ -37,7 +37,7 @@
3930 data = self.read(cr, uid, ids, [], context=context)[0]
3931 data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)
3932 if not data_fyear.end_journal_period_id:
3933- raise osv.except_osv(_('Error'), _('No journal for ending writing has been defined for the fiscal year'))
3934+ raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))
3935 period_journal = data_fyear.end_journal_period_id
3936 ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
3937 if ids_move:
3938
3939=== modified file 'account/wizard/account_open_closed_fiscalyear_view.xml' (properties changed: -x to +x)
3940=== modified file 'account/wizard/account_period_close.py' (properties changed: -x to +x)
3941=== modified file 'account/wizard/account_period_close_view.xml' (properties changed: -x to +x)
3942=== modified file 'account/wizard/account_reconcile.py' (properties changed: -x to +x)
3943=== modified file 'account/wizard/account_reconcile_partner_process.py' (properties changed: -x to +x)
3944=== modified file 'account/wizard/account_reconcile_partner_process_view.xml' (properties changed: -x to +x)
3945=== modified file 'account/wizard/account_reconcile_view.xml' (properties changed: -x to +x)
3946=== modified file 'account/wizard/account_report_account_balance.py' (properties changed: -x to +x)
3947=== modified file 'account/wizard/account_report_account_balance_view.xml' (properties changed: -x to +x)
3948=== modified file 'account/wizard/account_report_aged_partner_balance.py' (properties changed: -x to +x)
3949=== modified file 'account/wizard/account_report_aged_partner_balance_view.xml' (properties changed: -x to +x)
3950=== modified file 'account/wizard/account_report_balance_sheet.py' (properties changed: -x to +x)
3951=== modified file 'account/wizard/account_report_balance_sheet_view.xml' (properties changed: -x to +x)
3952=== modified file 'account/wizard/account_report_central_journal.py' (properties changed: -x to +x)
3953=== modified file 'account/wizard/account_report_central_journal_view.xml' (properties changed: -x to +x)
3954=== modified file 'account/wizard/account_report_common.py' (properties changed: -x to +x)
3955=== modified file 'account/wizard/account_report_common_account.py' (properties changed: -x to +x)
3956=== modified file 'account/wizard/account_report_common_journal.py' (properties changed: -x to +x)
3957=== modified file 'account/wizard/account_report_common_partner.py' (properties changed: -x to +x)
3958=== modified file 'account/wizard/account_report_common_view.xml' (properties changed: -x to +x)
3959=== modified file 'account/wizard/account_report_general_journal.py' (properties changed: -x to +x)
3960=== modified file 'account/wizard/account_report_general_journal_view.xml' (properties changed: -x to +x)
3961=== modified file 'account/wizard/account_report_general_ledger.py' (properties changed: -x to +x)
3962=== modified file 'account/wizard/account_report_general_ledger_view.xml' (properties changed: -x to +x)
3963=== modified file 'account/wizard/account_report_partner_balance.py' (properties changed: -x to +x)
3964=== modified file 'account/wizard/account_report_partner_balance_view.xml' (properties changed: -x to +x)
3965=== modified file 'account/wizard/account_report_partner_ledger.py' (properties changed: -x to +x)
3966=== modified file 'account/wizard/account_report_partner_ledger_view.xml' (properties changed: -x to +x)
3967=== modified file 'account/wizard/account_report_print_journal.py' (properties changed: -x to +x)
3968=== modified file 'account/wizard/account_report_print_journal_view.xml' (properties changed: -x to +x)
3969=== modified file 'account/wizard/account_report_profit_loss.py' (properties changed: -x to +x)
3970=== modified file 'account/wizard/account_report_profit_loss_view.xml' (properties changed: -x to +x)
3971=== modified file 'account/wizard/account_state_open.py' (properties changed: -x to +x)
3972=== modified file 'account/wizard/account_state_open_view.xml' (properties changed: -x to +x)
3973=== modified file 'account/wizard/account_subscription_generate.py' (properties changed: -x to +x)
3974=== modified file 'account/wizard/account_subscription_generate_view.xml' (properties changed: -x to +x)
3975=== modified file 'account/wizard/account_tax_chart.py' (properties changed: -x to +x)
3976=== modified file 'account/wizard/account_tax_chart_view.xml' (properties changed: -x to +x)
3977--- account/wizard/account_tax_chart_view.xml 2010-10-15 08:05:33 +0000
3978+++ account/wizard/account_tax_chart_view.xml 2011-01-13 18:00:31 +0000
3979@@ -28,7 +28,7 @@
3980 <field name="res_model">account.tax.chart</field>
3981 <field name="view_type">form</field>
3982 <field name="view_mode">tree,form</field>
3983- <field name="domain">[('parent_id','=',False)]</field>
3984+ <field name="domain">[]</field>
3985 <field name="view_id" ref="view_account_tax_chart"/>
3986 <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
3987 <field name="target">new</field>
3988
3989=== modified file 'account/wizard/account_unreconcile.py' (properties changed: -x to +x)
3990=== modified file 'account/wizard/account_unreconcile_view.xml' (properties changed: -x to +x)
3991=== modified file 'account/wizard/account_use_model.py' (properties changed: -x to +x)
3992=== modified file 'account/wizard/account_use_model_view.xml' (properties changed: -x to +x)
3993=== modified file 'account/wizard/account_validate_account_move.py' (properties changed: -x to +x)
3994=== modified file 'account/wizard/account_validate_move_view.xml' (properties changed: -x to +x)
3995=== modified file 'account/wizard/account_vat.py' (properties changed: -x to +x)
3996=== modified file 'account/wizard/account_vat_view.xml' (properties changed: -x to +x)
3997=== modified file 'account_accountant/__init__.py' (properties changed: -x to +x)
3998=== modified file 'account_accountant/__openerp__.py' (properties changed: -x to +x)
3999=== modified file 'account_accountant/account_accountant_demo.xml' (properties changed: -x to +x)
4000=== modified file 'account_accountant/i18n/account_accountant.pot' (properties changed: -x to +x)
4001=== modified file 'account_accountant/i18n/da.po' (properties changed: -x to +x)
4002=== modified file 'account_accountant/i18n/de.po' (properties changed: -x to +x)
4003=== modified file 'account_accountant/i18n/el.po' (properties changed: -x to +x)
4004=== modified file 'account_accountant/i18n/es.po' (properties changed: -x to +x)
4005=== modified file 'account_accountant/i18n/es_EC.po' (properties changed: -x to +x)
4006=== modified file 'account_accountant/i18n/fr.po' (properties changed: -x to +x)
4007=== modified file 'account_accountant/i18n/hi.po' (properties changed: -x to +x)
4008=== modified file 'account_accountant/i18n/it.po' (properties changed: -x to +x)
4009=== modified file 'account_accountant/i18n/lv.po' (properties changed: -x to +x)
4010=== modified file 'account_accountant/i18n/mn.po' (properties changed: -x to +x)
4011=== modified file 'account_accountant/i18n/nl.po' (properties changed: -x to +x)
4012=== modified file 'account_accountant/i18n/nl_BE.po' (properties changed: -x to +x)
4013=== modified file 'account_accountant/i18n/pl.po' (properties changed: -x to +x)
4014=== modified file 'account_accountant/i18n/pt.po' (properties changed: -x to +x)
4015=== modified file 'account_accountant/i18n/pt_BR.po' (properties changed: -x to +x)
4016=== modified file 'account_accountant/i18n/ro.po' (properties changed: -x to +x)
4017=== modified file 'account_accountant/i18n/ru.po' (properties changed: -x to +x)
4018=== modified file 'account_accountant/i18n/sk.po' (properties changed: -x to +x)
4019=== modified file 'account_accountant/i18n/sl.po' (properties changed: -x to +x)
4020=== modified file 'account_accountant/i18n/sr.po' (properties changed: -x to +x)
4021=== modified file 'account_accountant/i18n/sr@latin.po' (properties changed: -x to +x)
4022=== modified file 'account_accountant/i18n/sv.po' (properties changed: -x to +x)
4023=== modified file 'account_accountant/i18n/tr.po' (properties changed: -x to +x)
4024=== modified file 'account_accountant/i18n/uk.po' (properties changed: -x to +x)
4025=== modified file 'account_accountant/i18n/vi.po' (properties changed: -x to +x)
4026=== modified file 'account_accountant/i18n/zh_CN.po' (properties changed: -x to +x)
4027=== modified file 'account_accountant/security/account_security.xml' (properties changed: -x to +x)
4028=== modified file 'account_analytic_analysis/__init__.py' (properties changed: -x to +x)
4029=== modified file 'account_analytic_analysis/__openerp__.py' (properties changed: -x to +x)
4030=== modified file 'account_analytic_analysis/account_analytic_analysis.py' (properties changed: -x to +x)
4031=== modified file 'account_analytic_analysis/account_analytic_analysis_menu.xml' (properties changed: -x to +x)
4032=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml' (properties changed: -x to +x)
4033=== modified file 'account_analytic_analysis/i18n/account_analytic_analysis.pot' (properties changed: -x to +x)
4034=== modified file 'account_analytic_analysis/i18n/ar.po' (properties changed: -x to +x)
4035=== modified file 'account_analytic_analysis/i18n/bg.po' (properties changed: -x to +x)
4036=== modified file 'account_analytic_analysis/i18n/bs.po' (properties changed: -x to +x)
4037=== modified file 'account_analytic_analysis/i18n/ca.po' (properties changed: -x to +x)
4038=== modified file 'account_analytic_analysis/i18n/cs.po' (properties changed: -x to +x)
4039=== modified file 'account_analytic_analysis/i18n/da.po' (properties changed: -x to +x)
4040=== modified file 'account_analytic_analysis/i18n/de.po' (properties changed: -x to +x)
4041=== modified file 'account_analytic_analysis/i18n/el.po' (properties changed: -x to +x)
4042=== modified file 'account_analytic_analysis/i18n/es.po' (properties changed: -x to +x)
4043=== modified file 'account_analytic_analysis/i18n/es_AR.po' (properties changed: -x to +x)
4044=== modified file 'account_analytic_analysis/i18n/es_EC.po' (properties changed: -x to +x)
4045=== modified file 'account_analytic_analysis/i18n/et.po' (properties changed: -x to +x)
4046=== modified file 'account_analytic_analysis/i18n/fi.po' (properties changed: -x to +x)
4047=== modified file 'account_analytic_analysis/i18n/fr.po' (properties changed: -x to +x)
4048=== modified file 'account_analytic_analysis/i18n/gl.po' (properties changed: -x to +x)
4049=== modified file 'account_analytic_analysis/i18n/hr.po' (properties changed: -x to +x)
4050=== modified file 'account_analytic_analysis/i18n/hu.po' (properties changed: -x to +x)
4051=== modified file 'account_analytic_analysis/i18n/id.po' (properties changed: -x to +x)
4052=== modified file 'account_analytic_analysis/i18n/it.po' (properties changed: -x to +x)
4053=== modified file 'account_analytic_analysis/i18n/ko.po' (properties changed: -x to +x)
4054=== modified file 'account_analytic_analysis/i18n/lt.po' (properties changed: -x to +x)
4055=== modified file 'account_analytic_analysis/i18n/lv.po' (properties changed: -x to +x)
4056=== modified file 'account_analytic_analysis/i18n/mn.po' (properties changed: -x to +x)
4057=== modified file 'account_analytic_analysis/i18n/nb.po' (properties changed: -x to +x)
4058=== modified file 'account_analytic_analysis/i18n/nl.po' (properties changed: -x to +x)
4059=== modified file 'account_analytic_analysis/i18n/nl_BE.po' (properties changed: -x to +x)
4060=== modified file 'account_analytic_analysis/i18n/oc.po' (properties changed: -x to +x)
4061=== modified file 'account_analytic_analysis/i18n/pl.po' (properties changed: -x to +x)
4062=== modified file 'account_analytic_analysis/i18n/pt.po' (properties changed: -x to +x)
4063=== modified file 'account_analytic_analysis/i18n/pt_BR.po' (properties changed: -x to +x)
4064=== modified file 'account_analytic_analysis/i18n/ro.po' (properties changed: -x to +x)
4065=== modified file 'account_analytic_analysis/i18n/ru.po' (properties changed: -x to +x)
4066=== modified file 'account_analytic_analysis/i18n/sl.po' (properties changed: -x to +x)
4067=== modified file 'account_analytic_analysis/i18n/sq.po' (properties changed: -x to +x)
4068=== modified file 'account_analytic_analysis/i18n/sr.po' (properties changed: -x to +x)
4069=== modified file 'account_analytic_analysis/i18n/sr@latin.po' (properties changed: -x to +x)
4070=== modified file 'account_analytic_analysis/i18n/sv.po' (properties changed: -x to +x)
4071=== modified file 'account_analytic_analysis/i18n/tlh.po' (properties changed: -x to +x)
4072=== modified file 'account_analytic_analysis/i18n/tr.po' (properties changed: -x to +x)
4073=== modified file 'account_analytic_analysis/i18n/uk.po' (properties changed: -x to +x)
4074=== modified file 'account_analytic_analysis/i18n/vi.po' (properties changed: -x to +x)
4075=== modified file 'account_analytic_analysis/i18n/zh_CN.po' (properties changed: -x to +x)
4076=== modified file 'account_analytic_analysis/i18n/zh_TW.po' (properties changed: -x to +x)
4077=== modified file 'account_analytic_analysis/security/ir.model.access.csv' (properties changed: -x to +x)
4078=== modified file 'account_analytic_default/__init__.py' (properties changed: -x to +x)
4079=== modified file 'account_analytic_default/__openerp__.py' (properties changed: -x to +x)
4080=== modified file 'account_analytic_default/account_analytic_default.py' (properties changed: -x to +x)
4081=== modified file 'account_analytic_default/account_analytic_default_view.xml' (properties changed: -x to +x)
4082=== modified file 'account_analytic_default/i18n/account_analytic_default.pot' (properties changed: -x to +x)
4083=== modified file 'account_analytic_default/i18n/ar.po' (properties changed: -x to +x)
4084=== modified file 'account_analytic_default/i18n/bg.po' (properties changed: -x to +x)
4085=== modified file 'account_analytic_default/i18n/bs.po' (properties changed: -x to +x)
4086=== modified file 'account_analytic_default/i18n/ca.po' (properties changed: -x to +x)
4087=== modified file 'account_analytic_default/i18n/cs.po' (properties changed: -x to +x)
4088=== modified file 'account_analytic_default/i18n/de.po' (properties changed: -x to +x)
4089=== modified file 'account_analytic_default/i18n/el.po' (properties changed: -x to +x)
4090=== modified file 'account_analytic_default/i18n/es.po' (properties changed: -x to +x)
4091=== modified file 'account_analytic_default/i18n/es_AR.po' (properties changed: -x to +x)
4092=== modified file 'account_analytic_default/i18n/es_EC.po' (properties changed: -x to +x)
4093=== modified file 'account_analytic_default/i18n/et.po' (properties changed: -x to +x)
4094=== modified file 'account_analytic_default/i18n/fi.po' (properties changed: -x to +x)
4095=== modified file 'account_analytic_default/i18n/fr.po' (properties changed: -x to +x)
4096=== modified file 'account_analytic_default/i18n/gl.po' (properties changed: -x to +x)
4097=== modified file 'account_analytic_default/i18n/hr.po' (properties changed: -x to +x)
4098=== modified file 'account_analytic_default/i18n/hu.po' (properties changed: -x to +x)
4099=== modified file 'account_analytic_default/i18n/id.po' (properties changed: -x to +x)
4100=== modified file 'account_analytic_default/i18n/it.po' (properties changed: -x to +x)
4101=== modified file 'account_analytic_default/i18n/ko.po' (properties changed: -x to +x)
4102=== modified file 'account_analytic_default/i18n/lt.po' (properties changed: -x to +x)
4103=== modified file 'account_analytic_default/i18n/lv.po' (properties changed: -x to +x)
4104=== modified file 'account_analytic_default/i18n/mn.po' (properties changed: -x to +x)
4105=== modified file 'account_analytic_default/i18n/nb.po' (properties changed: -x to +x)
4106=== modified file 'account_analytic_default/i18n/nl.po' (properties changed: -x to +x)
4107=== modified file 'account_analytic_default/i18n/nl_BE.po' (properties changed: -x to +x)
4108=== modified file 'account_analytic_default/i18n/oc.po' (properties changed: -x to +x)
4109=== modified file 'account_analytic_default/i18n/pl.po' (properties changed: -x to +x)
4110=== modified file 'account_analytic_default/i18n/pt.po' (properties changed: -x to +x)
4111=== modified file 'account_analytic_default/i18n/pt_BR.po' (properties changed: -x to +x)
4112=== modified file 'account_analytic_default/i18n/ro.po' (properties changed: -x to +x)
4113=== modified file 'account_analytic_default/i18n/ru.po' (properties changed: -x to +x)
4114=== modified file 'account_analytic_default/i18n/sk.po' (properties changed: -x to +x)
4115=== modified file 'account_analytic_default/i18n/sl.po' (properties changed: -x to +x)
4116=== modified file 'account_analytic_default/i18n/sq.po' (properties changed: -x to +x)
4117=== modified file 'account_analytic_default/i18n/sr.po' (properties changed: -x to +x)
4118=== modified file 'account_analytic_default/i18n/sr@latin.po' (properties changed: -x to +x)
4119=== modified file 'account_analytic_default/i18n/sv.po' (properties changed: -x to +x)
4120=== modified file 'account_analytic_default/i18n/tlh.po' (properties changed: -x to +x)
4121=== modified file 'account_analytic_default/i18n/tr.po' (properties changed: -x to +x)
4122=== modified file 'account_analytic_default/i18n/uk.po' (properties changed: -x to +x)
4123=== modified file 'account_analytic_default/i18n/vi.po' (properties changed: -x to +x)
4124=== modified file 'account_analytic_default/i18n/zh_CN.po' (properties changed: -x to +x)
4125=== modified file 'account_analytic_default/i18n/zh_TW.po' (properties changed: -x to +x)
4126=== modified file 'account_analytic_default/security/ir.model.access.csv' (properties changed: -x to +x)
4127=== modified file 'account_analytic_plans/__init__.py' (properties changed: -x to +x)
4128=== modified file 'account_analytic_plans/__openerp__.py' (properties changed: -x to +x)
4129=== modified file 'account_analytic_plans/account_analytic_plans.py' (properties changed: -x to +x)
4130=== modified file 'account_analytic_plans/account_analytic_plans_report.xml' (properties changed: -x to +x)
4131=== modified file 'account_analytic_plans/account_analytic_plans_view.xml' (properties changed: -x to +x)
4132=== modified file 'account_analytic_plans/i18n/account_analytic_plans.pot' (properties changed: -x to +x)
4133=== modified file 'account_analytic_plans/i18n/ar.po' (properties changed: -x to +x)
4134=== modified file 'account_analytic_plans/i18n/bg.po' (properties changed: -x to +x)
4135=== modified file 'account_analytic_plans/i18n/bs.po' (properties changed: -x to +x)
4136=== modified file 'account_analytic_plans/i18n/ca.po' (properties changed: -x to +x)
4137=== modified file 'account_analytic_plans/i18n/cs.po' (properties changed: -x to +x)
4138=== modified file 'account_analytic_plans/i18n/de.po' (properties changed: -x to +x)
4139=== modified file 'account_analytic_plans/i18n/el.po' (properties changed: -x to +x)
4140=== modified file 'account_analytic_plans/i18n/es.po' (properties changed: -x to +x)
4141=== modified file 'account_analytic_plans/i18n/es_AR.po' (properties changed: -x to +x)
4142=== modified file 'account_analytic_plans/i18n/es_EC.po' (properties changed: -x to +x)
4143=== modified file 'account_analytic_plans/i18n/et.po' (properties changed: -x to +x)
4144=== modified file 'account_analytic_plans/i18n/fi.po' (properties changed: -x to +x)
4145=== modified file 'account_analytic_plans/i18n/fr.po' (properties changed: -x to +x)
4146=== modified file 'account_analytic_plans/i18n/gl.po' (properties changed: -x to +x)
4147=== modified file 'account_analytic_plans/i18n/hr.po' (properties changed: -x to +x)
4148=== modified file 'account_analytic_plans/i18n/hu.po' (properties changed: -x to +x)
4149=== modified file 'account_analytic_plans/i18n/id.po' (properties changed: -x to +x)
4150=== modified file 'account_analytic_plans/i18n/it.po' (properties changed: -x to +x)
4151=== modified file 'account_analytic_plans/i18n/ko.po' (properties changed: -x to +x)
4152=== modified file 'account_analytic_plans/i18n/lt.po' (properties changed: -x to +x)
4153=== modified file 'account_analytic_plans/i18n/mn.po' (properties changed: -x to +x)
4154=== modified file 'account_analytic_plans/i18n/nl.po' (properties changed: -x to +x)
4155=== modified file 'account_analytic_plans/i18n/nl_BE.po' (properties changed: -x to +x)
4156=== modified file 'account_analytic_plans/i18n/oc.po' (properties changed: -x to +x)
4157=== modified file 'account_analytic_plans/i18n/pl.po' (properties changed: -x to +x)
4158=== modified file 'account_analytic_plans/i18n/pt.po' (properties changed: -x to +x)
4159=== modified file 'account_analytic_plans/i18n/pt_BR.po' (properties changed: -x to +x)
4160=== modified file 'account_analytic_plans/i18n/ro.po' (properties changed: -x to +x)
4161=== modified file 'account_analytic_plans/i18n/ru.po' (properties changed: -x to +x)
4162=== modified file 'account_analytic_plans/i18n/sl.po' (properties changed: -x to +x)
4163=== modified file 'account_analytic_plans/i18n/sq.po' (properties changed: -x to +x)
4164=== modified file 'account_analytic_plans/i18n/sr.po' (properties changed: -x to +x)
4165=== modified file 'account_analytic_plans/i18n/sr@latin.po' (properties changed: -x to +x)
4166=== modified file 'account_analytic_plans/i18n/sv.po' (properties changed: -x to +x)
4167=== modified file 'account_analytic_plans/i18n/tlh.po' (properties changed: -x to +x)
4168=== modified file 'account_analytic_plans/i18n/tr.po' (properties changed: -x to +x)
4169=== modified file 'account_analytic_plans/i18n/uk.po' (properties changed: -x to +x)
4170=== modified file 'account_analytic_plans/i18n/vi.po' (properties changed: -x to +x)
4171=== modified file 'account_analytic_plans/i18n/zh_CN.po' (properties changed: -x to +x)
4172=== modified file 'account_analytic_plans/i18n/zh_TW.po' (properties changed: -x to +x)
4173=== modified file 'account_analytic_plans/report/__init__.py' (properties changed: -x to +x)
4174=== modified file 'account_analytic_plans/report/crossovered_analytic.py' (properties changed: -x to +x)
4175=== modified file 'account_analytic_plans/report/crossovered_analytic.rml' (properties changed: -x to +x)
4176=== modified file 'account_analytic_plans/report/crossovered_analytic.sxw' (properties changed: -x to +x)
4177=== modified file 'account_analytic_plans/security/account_analytic_plan_security.xml' (properties changed: -x to +x)
4178=== modified file 'account_analytic_plans/security/ir.model.access.csv' (properties changed: -x to +x)
4179=== modified file 'account_analytic_plans/test/acount_analytic_plans_report.yml' (properties changed: -x to +x)
4180=== modified file 'account_analytic_plans/wizard/__init__.py' (properties changed: -x to +x)
4181=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic.py' (properties changed: -x to +x)
4182=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic_view.xml' (properties changed: -x to +x)
4183=== modified file 'account_analytic_plans/wizard/analytic_plan_create_model.py' (properties changed: -x to +x)
4184=== modified file 'account_analytic_plans/wizard/analytic_plan_create_model_view.xml' (properties changed: -x to +x)
4185=== modified file 'account_anglo_saxon/__init__.py' (properties changed: -x to +x)
4186=== modified file 'account_anglo_saxon/__openerp__.py' (properties changed: -x to +x)
4187=== modified file 'account_anglo_saxon/i18n/account_anglo_saxon.pot' (properties changed: -x to +x)
4188=== modified file 'account_anglo_saxon/i18n/ar.po' (properties changed: -x to +x)
4189=== modified file 'account_anglo_saxon/i18n/bg.po' (properties changed: -x to +x)
4190=== modified file 'account_anglo_saxon/i18n/de.po' (properties changed: -x to +x)
4191=== modified file 'account_anglo_saxon/i18n/el.po' (properties changed: -x to +x)
4192=== modified file 'account_anglo_saxon/i18n/es.po' (properties changed: -x to +x)
4193=== modified file 'account_anglo_saxon/i18n/es_EC.po' (properties changed: -x to +x)
4194=== modified file 'account_anglo_saxon/i18n/et.po' (properties changed: -x to +x)
4195=== modified file 'account_anglo_saxon/i18n/fr.po' (properties changed: -x to +x)
4196=== modified file 'account_anglo_saxon/i18n/hi.po' (properties changed: -x to +x)
4197=== modified file 'account_anglo_saxon/i18n/id.po' (properties changed: -x to +x)
4198=== modified file 'account_anglo_saxon/i18n/it.po' (properties changed: -x to +x)
4199=== modified file 'account_anglo_saxon/i18n/mn.po' (properties changed: -x to +x)
4200=== modified file 'account_anglo_saxon/i18n/nl.po' (properties changed: -x to +x)
4201=== modified file 'account_anglo_saxon/i18n/oc.po' (properties changed: -x to +x)
4202=== modified file 'account_anglo_saxon/i18n/pl.po' (properties changed: -x to +x)
4203=== modified file 'account_anglo_saxon/i18n/pt.po' (properties changed: -x to +x)
4204=== modified file 'account_anglo_saxon/i18n/pt_BR.po' (properties changed: -x to +x)
4205=== modified file 'account_anglo_saxon/i18n/ru.po' (properties changed: -x to +x)
4206=== modified file 'account_anglo_saxon/i18n/sl.po' (properties changed: -x to +x)
4207=== modified file 'account_anglo_saxon/i18n/sr@latin.po' (properties changed: -x to +x)
4208=== modified file 'account_anglo_saxon/i18n/sv.po' (properties changed: -x to +x)
4209=== modified file 'account_anglo_saxon/i18n/ta.po' (properties changed: -x to +x)
4210=== modified file 'account_anglo_saxon/i18n/zh_CN.po' (properties changed: -x to +x)
4211=== modified file 'account_anglo_saxon/invoice.py' (properties changed: -x to +x)
4212=== modified file 'account_anglo_saxon/product.py' (properties changed: -x to +x)
4213=== modified file 'account_anglo_saxon/product_view.xml' (properties changed: -x to +x)
4214=== modified file 'account_anglo_saxon/purchase.py' (properties changed: -x to +x)
4215=== modified file 'account_anglo_saxon/sale.py' (properties changed: -x to +x)
4216=== modified file 'account_anglo_saxon/stock.py' (properties changed: -x to +x)
4217=== modified file 'account_budget/__init__.py' (properties changed: -x to +x)
4218=== modified file 'account_budget/__openerp__.py' (properties changed: -x to +x)
4219=== modified file 'account_budget/account_budget.py' (properties changed: -x to +x)
4220--- account_budget/account_budget.py 2010-12-17 04:37:32 +0000
4221+++ account_budget/account_budget.py 2011-01-13 18:00:31 +0000
4222@@ -197,7 +197,7 @@
4223 'paid_date': fields.date('Paid Date'),
4224 'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')),
4225 'practical_amount':fields.function(_prac, method=True, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
4226- 'theoritical_amount':fields.function(_theo, method=True, string='Theoritical Amount', type='float', digits_compute=dp.get_precision('Account')),
4227+ 'theoritical_amount':fields.function(_theo, method=True, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
4228 'percentage':fields.function(_perc, method=True, string='Percentage', type='float'),
4229 'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
4230 }
4231
4232=== modified file 'account_budget/account_budget_demo.xml' (properties changed: -x to +x)
4233=== modified file 'account_budget/account_budget_report.xml' (properties changed: -x to +x)
4234=== modified file 'account_budget/account_budget_view.xml' (properties changed: -x to +x)
4235--- account_budget/account_budget_view.xml 2010-12-28 14:57:27 +0000
4236+++ account_budget/account_budget_view.xml 2011-01-13 18:00:31 +0000
4237@@ -78,7 +78,7 @@
4238 <field name="paid_date"/>
4239 <field name="planned_amount" sum="Planned Amount"/>
4240 <field name="practical_amount" select="1" sum="Practical Amount" />
4241- <field name="theoritical_amount" sum="Theoritical Amount"/>
4242+ <field name="theoritical_amount" sum="Theoretical Amount"/>
4243 <field name="percentage"/>
4244 </tree>
4245 <form string="Budget Lines">
4246@@ -121,7 +121,7 @@
4247 <field name="paid_date"/>
4248 <field name="planned_amount" sum="Planned Amount"/>
4249 <field name="practical_amount" sum="Practical Amount"/>
4250- <field name="theoritical_amount" sum="Theoritical Amount"/>
4251+ <field name="theoritical_amount" sum="Theoretical Amount"/>
4252 <field name="percentage"/>
4253 </tree>
4254 <form string="Budget Lines">
4255
4256=== modified file 'account_budget/account_budget_workflow.xml' (properties changed: -x to +x)
4257=== modified file 'account_budget/i18n/account_budget.pot' (properties changed: -x to +x)
4258=== modified file 'account_budget/i18n/ar.po' (properties changed: -x to +x)
4259=== modified file 'account_budget/i18n/bg.po' (properties changed: -x to +x)
4260=== modified file 'account_budget/i18n/bs.po' (properties changed: -x to +x)
4261=== modified file 'account_budget/i18n/ca.po' (properties changed: -x to +x)
4262=== modified file 'account_budget/i18n/cs.po' (properties changed: -x to +x)
4263=== modified file 'account_budget/i18n/de.po' (properties changed: -x to +x)
4264=== modified file 'account_budget/i18n/el.po' (properties changed: -x to +x)
4265=== modified file 'account_budget/i18n/es.po' (properties changed: -x to +x)
4266=== modified file 'account_budget/i18n/es_AR.po' (properties changed: -x to +x)
4267=== modified file 'account_budget/i18n/es_EC.po' (properties changed: -x to +x)
4268=== modified file 'account_budget/i18n/et.po' (properties changed: -x to +x)
4269=== modified file 'account_budget/i18n/fi.po' (properties changed: -x to +x)
4270=== modified file 'account_budget/i18n/fr.po' (properties changed: -x to +x)
4271=== modified file 'account_budget/i18n/gl.po' (properties changed: -x to +x)
4272=== modified file 'account_budget/i18n/hi.po' (properties changed: -x to +x)
4273=== modified file 'account_budget/i18n/hr.po' (properties changed: -x to +x)
4274=== modified file 'account_budget/i18n/hu.po' (properties changed: -x to +x)
4275=== modified file 'account_budget/i18n/id.po' (properties changed: -x to +x)
4276=== modified file 'account_budget/i18n/it.po' (properties changed: -x to +x)
4277=== modified file 'account_budget/i18n/ko.po' (properties changed: -x to +x)
4278=== modified file 'account_budget/i18n/lt.po' (properties changed: -x to +x)
4279=== modified file 'account_budget/i18n/mn.po' (properties changed: -x to +x)
4280=== modified file 'account_budget/i18n/nl.po' (properties changed: -x to +x)
4281=== modified file 'account_budget/i18n/nl_BE.po' (properties changed: -x to +x)
4282=== modified file 'account_budget/i18n/oc.po' (properties changed: -x to +x)
4283=== modified file 'account_budget/i18n/pl.po' (properties changed: -x to +x)
4284=== modified file 'account_budget/i18n/pt.po' (properties changed: -x to +x)
4285=== modified file 'account_budget/i18n/pt_BR.po' (properties changed: -x to +x)
4286=== modified file 'account_budget/i18n/ro.po' (properties changed: -x to +x)
4287=== modified file 'account_budget/i18n/ru.po' (properties changed: -x to +x)
4288=== modified file 'account_budget/i18n/sl.po' (properties changed: -x to +x)
4289=== modified file 'account_budget/i18n/sq.po' (properties changed: -x to +x)
4290=== modified file 'account_budget/i18n/sr.po' (properties changed: -x to +x)
4291=== modified file 'account_budget/i18n/sr@latin.po' (properties changed: -x to +x)
4292=== modified file 'account_budget/i18n/sv.po' (properties changed: -x to +x)
4293=== modified file 'account_budget/i18n/tlh.po' (properties changed: -x to +x)
4294=== modified file 'account_budget/i18n/tr.po' (properties changed: -x to +x)
4295=== modified file 'account_budget/i18n/uk.po' (properties changed: -x to +x)
4296=== modified file 'account_budget/i18n/vi.po' (properties changed: -x to +x)
4297=== modified file 'account_budget/i18n/zh_CN.po' (properties changed: -x to +x)
4298=== modified file 'account_budget/i18n/zh_TW.po' (properties changed: -x to +x)
4299=== modified file 'account_budget/report/__init__.py' (properties changed: -x to +x)
4300=== modified file 'account_budget/report/analytic_account_budget_report.py' (properties changed: -x to +x)
4301=== modified file 'account_budget/report/analytic_account_budget_report.rml' (properties changed: -x to +x)
4302=== modified file 'account_budget/report/analytic_account_budget_report.sxw' (properties changed: -x to +x)
4303=== modified file 'account_budget/report/budget_report.py' (properties changed: -x to +x)
4304=== modified file 'account_budget/report/budget_report.rml' (properties changed: -x to +x)
4305=== modified file 'account_budget/report/budget_report.sxw' (properties changed: -x to +x)
4306=== modified file 'account_budget/report/crossovered_budget_report.py' (properties changed: -x to +x)
4307=== modified file 'account_budget/report/crossovered_budget_report.rml' (properties changed: -x to +x)
4308=== modified file 'account_budget/report/crossovered_budget_report.sxw' (properties changed: -x to +x)
4309=== modified file 'account_budget/security/account_budget_security.xml' (properties changed: -x to +x)
4310=== modified file 'account_budget/security/ir.model.access.csv' (properties changed: -x to +x)
4311=== modified file 'account_budget/test/account_budget.yml' (properties changed: -x to +x)
4312--- account_budget/test/account_budget.yml 2010-09-27 17:53:35 +0000
4313+++ account_budget/test/account_budget.yml 2011-01-13 18:00:31 +0000
4314@@ -5,9 +5,9 @@
4315 -
4316 !record {model: crossovered.budget, id: crossovered_budget_budget0}:
4317 code: B2011
4318- date_from: '2011-01-01'
4319- date_to: '2011-12-31'
4320- name: Budget 2011
4321+ date_from: !eval "'%s-01-01' %(datetime.now().year+1)"
4322+ date_to: !eval "'%s-12-31' %(datetime.now().year+1)"
4323+ name: !eval "'Budget %s' %(datetime.now().year+1)"
4324 state: draft
4325 -
4326 I created two different budget lines
4327@@ -17,13 +17,13 @@
4328 !record {model: crossovered.budget, id: crossovered_budget_budget0}:
4329 crossovered_budget_line:
4330 - analytic_account_id: account.analytic_consultancy
4331- date_from: '2011-01-01'
4332- date_to: '2011-12-31'
4333+ date_from: !eval "'%s-01-01' %(datetime.now().year+1)"
4334+ date_to: !eval "'%s-12-31' %(datetime.now().year+1)"
4335 general_budget_id: account_budget.account_budget_post_purchase0
4336 planned_amount: 10000.0
4337 - analytic_account_id: account.analytic_super_product_trainings
4338- date_from: '2011-09-01'
4339- date_to: '2011-09-30'
4340+ date_from: !eval "'%s-09-01' %(datetime.now().year+1)"
4341+ date_to: !eval "'%s-09-30' %(datetime.now().year+1)"
4342 general_budget_id: account_budget.account_budget_post_sales0
4343 planned_amount: 400000.0
4344
4345
4346=== modified file 'account_budget/test/account_budget_report.yml' (properties changed: -x to +x)
4347=== modified file 'account_budget/test/account_budget_spread.yml' (properties changed: -x to +x)
4348=== modified file 'account_budget/wizard/__init__.py' (properties changed: -x to +x)
4349=== modified file 'account_budget/wizard/account_budget_analytic.py' (properties changed: -x to +x)
4350=== modified file 'account_budget/wizard/account_budget_analytic_view.xml' (properties changed: -x to +x)
4351=== modified file 'account_budget/wizard/account_budget_crossovered_report.py' (properties changed: -x to +x)
4352=== modified file 'account_budget/wizard/account_budget_crossovered_report_view.xml' (properties changed: -x to +x)
4353=== modified file 'account_budget/wizard/account_budget_crossovered_summary_report.py' (properties changed: -x to +x)
4354=== modified file 'account_budget/wizard/account_budget_crossovered_summary_report_view.xml' (properties changed: -x to +x)
4355=== modified file 'account_budget/wizard/account_budget_report.py' (properties changed: -x to +x)
4356=== modified file 'account_budget/wizard/account_budget_report_view.xml' (properties changed: -x to +x)
4357=== modified file 'account_cancel/__init__.py' (properties changed: -x to +x)
4358=== modified file 'account_cancel/__openerp__.py' (properties changed: -x to +x)
4359=== modified file 'account_cancel/account_cancel_view.xml' (properties changed: -x to +x)
4360=== modified file 'account_cancel/i18n/account_cancel.pot' (properties changed: -x to +x)
4361=== modified file 'account_cancel/i18n/br.po' (properties changed: -x to +x)
4362=== modified file 'account_cancel/i18n/bs.po' (properties changed: -x to +x)
4363=== modified file 'account_cancel/i18n/da.po' (properties changed: -x to +x)
4364=== modified file 'account_cancel/i18n/de.po' (properties changed: -x to +x)
4365=== modified file 'account_cancel/i18n/el.po' (properties changed: -x to +x)
4366=== modified file 'account_cancel/i18n/es.po' (properties changed: -x to +x)
4367=== modified file 'account_cancel/i18n/es_EC.po' (properties changed: -x to +x)
4368=== modified file 'account_cancel/i18n/fr.po' (properties changed: -x to +x)
4369=== modified file 'account_cancel/i18n/hi.po' (properties changed: -x to +x)
4370=== modified file 'account_cancel/i18n/hr.po' (properties changed: -x to +x)
4371=== modified file 'account_cancel/i18n/it.po' (properties changed: -x to +x)
4372=== modified file 'account_cancel/i18n/mn.po' (properties changed: -x to +x)
4373=== modified file 'account_cancel/i18n/nl.po' (properties changed: -x to +x)
4374=== modified file 'account_cancel/i18n/pl.po' (properties changed: -x to +x)
4375=== modified file 'account_cancel/i18n/pt.po' (properties changed: -x to +x)
4376=== modified file 'account_cancel/i18n/pt_BR.po' (properties changed: -x to +x)
4377=== modified file 'account_cancel/i18n/ro.po' (properties changed: -x to +x)
4378=== modified file 'account_cancel/i18n/ru.po' (properties changed: -x to +x)
4379=== modified file 'account_cancel/i18n/sl.po' (properties changed: -x to +x)
4380=== modified file 'account_cancel/i18n/sr.po' (properties changed: -x to +x)
4381=== modified file 'account_cancel/i18n/sr@latin.po' (properties changed: -x to +x)
4382=== modified file 'account_cancel/i18n/sv.po' (properties changed: -x to +x)
4383=== modified file 'account_cancel/i18n/ta.po' (properties changed: -x to +x)
4384=== modified file 'account_cancel/i18n/tr.po' (properties changed: -x to +x)
4385=== modified file 'account_cancel/i18n/vi.po' (properties changed: -x to +x)
4386=== modified file 'account_chart/__init__.py' (properties changed: -x to +x)
4387=== modified file 'account_chart/__openerp__.py' (properties changed: -x to +x)
4388=== modified file 'account_chart/account_chart.xml' (properties changed: -x to +x)
4389=== modified file 'account_chart/i18n/account_chart.pot' (properties changed: -x to +x)
4390=== modified file 'account_chart/i18n/ar.po' (properties changed: -x to +x)
4391=== modified file 'account_chart/i18n/bg.po' (properties changed: -x to +x)
4392=== modified file 'account_chart/i18n/bs.po' (properties changed: -x to +x)
4393=== modified file 'account_chart/i18n/ca.po' (properties changed: -x to +x)
4394=== modified file 'account_chart/i18n/cs.po' (properties changed: -x to +x)
4395=== modified file 'account_chart/i18n/da.po' (properties changed: -x to +x)
4396=== modified file 'account_chart/i18n/de.po' (properties changed: -x to +x)
4397=== modified file 'account_chart/i18n/el.po' (properties changed: -x to +x)
4398=== modified file 'account_chart/i18n/es.po' (properties changed: -x to +x)
4399=== modified file 'account_chart/i18n/es_AR.po' (properties changed: -x to +x)
4400=== modified file 'account_chart/i18n/es_EC.po' (properties changed: -x to +x)
4401=== modified file 'account_chart/i18n/et.po' (properties changed: -x to +x)
4402=== modified file 'account_chart/i18n/eu.po' (properties changed: -x to +x)
4403=== modified file 'account_chart/i18n/fi.po' (properties changed: -x to +x)
4404=== modified file 'account_chart/i18n/fr.po' (properties changed: -x to +x)
4405=== modified file 'account_chart/i18n/gl.po' (properties changed: -x to +x)
4406=== modified file 'account_chart/i18n/hi.po' (properties changed: -x to +x)
4407=== modified file 'account_chart/i18n/hr.po' (properties changed: -x to +x)
4408=== modified file 'account_chart/i18n/hu.po' (properties changed: -x to +x)
4409=== modified file 'account_chart/i18n/id.po' (properties changed: -x to +x)
4410=== modified file 'account_chart/i18n/it.po' (properties changed: -x to +x)
4411=== modified file 'account_chart/i18n/ko.po' (properties changed: -x to +x)
4412=== modified file 'account_chart/i18n/lt.po' (properties changed: -x to +x)
4413=== modified file 'account_chart/i18n/lv.po' (properties changed: -x to +x)
4414=== modified file 'account_chart/i18n/mn.po' (properties changed: -x to +x)
4415=== modified file 'account_chart/i18n/nb.po' (properties changed: -x to +x)
4416=== modified file 'account_chart/i18n/nl.po' (properties changed: -x to +x)
4417=== modified file 'account_chart/i18n/nl_BE.po' (properties changed: -x to +x)
4418=== modified file 'account_chart/i18n/oc.po' (properties changed: -x to +x)
4419=== modified file 'account_chart/i18n/pl.po' (properties changed: -x to +x)
4420=== modified file 'account_chart/i18n/pt.po' (properties changed: -x to +x)
4421=== modified file 'account_chart/i18n/pt_BR.po' (properties changed: -x to +x)
4422=== modified file 'account_chart/i18n/ro.po' (properties changed: -x to +x)
4423=== modified file 'account_chart/i18n/ru.po' (properties changed: -x to +x)
4424=== modified file 'account_chart/i18n/sk.po' (properties changed: -x to +x)
4425=== modified file 'account_chart/i18n/sl.po' (properties changed: -x to +x)
4426=== modified file 'account_chart/i18n/sq.po' (properties changed: -x to +x)
4427=== modified file 'account_chart/i18n/sr.po' (properties changed: -x to +x)
4428=== modified file 'account_chart/i18n/sr@latin.po' (properties changed: -x to +x)
4429=== modified file 'account_chart/i18n/sv.po' (properties changed: -x to +x)
4430=== modified file 'account_chart/i18n/ta.po' (properties changed: -x to +x)
4431=== modified file 'account_chart/i18n/th.po' (properties changed: -x to +x)
4432=== modified file 'account_chart/i18n/tr.po' (properties changed: -x to +x)
4433=== modified file 'account_chart/i18n/uk.po' (properties changed: -x to +x)
4434=== modified file 'account_chart/i18n/vi.po' (properties changed: -x to +x)
4435=== modified file 'account_chart/i18n/zh_CN.po' (properties changed: -x to +x)
4436=== modified file 'account_chart/i18n/zh_TW.po' (properties changed: -x to +x)
4437=== modified file 'account_coda/__init__.py' (properties changed: -x to +x)
4438=== modified file 'account_coda/__openerp__.py' (properties changed: -x to +x)
4439=== modified file 'account_coda/account_coda.py' (properties changed: -x to +x)
4440=== modified file 'account_coda/account_coda_demo.xml' (properties changed: -x to +x)
4441=== modified file 'account_coda/account_coda_view.xml' (properties changed: -x to +x)
4442=== modified file 'account_coda/i18n/account_coda.pot' (properties changed: -x to +x)
4443=== modified file 'account_coda/i18n/ar.po' (properties changed: -x to +x)
4444=== modified file 'account_coda/i18n/de.po' (properties changed: -x to +x)
4445=== modified file 'account_coda/i18n/el.po' (properties changed: -x to +x)
4446=== modified file 'account_coda/i18n/es.po' (properties changed: -x to +x)
4447=== modified file 'account_coda/i18n/es_EC.po' (properties changed: -x to +x)
4448=== modified file 'account_coda/i18n/et.po' (properties changed: -x to +x)
4449=== modified file 'account_coda/i18n/fr.po' (properties changed: -x to +x)
4450=== modified file 'account_coda/i18n/hr.po' (properties changed: -x to +x)
4451=== modified file 'account_coda/i18n/it.po' (properties changed: -x to +x)
4452=== modified file 'account_coda/i18n/nl.po' (properties changed: -x to +x)
4453=== modified file 'account_coda/i18n/pt.po' (properties changed: -x to +x)
4454=== modified file 'account_coda/i18n/pt_BR.po' (properties changed: -x to +x)
4455=== modified file 'account_coda/i18n/ru.po' (properties changed: -x to +x)
4456=== modified file 'account_coda/i18n/sr.po' (properties changed: -x to +x)
4457=== modified file 'account_coda/i18n/sr@latin.po' (properties changed: -x to +x)
4458=== modified file 'account_coda/i18n/sv.po' (properties changed: -x to +x)
4459=== modified file 'account_coda/i18n/zh_CN.po' (properties changed: -x to +x)
4460=== modified file 'account_coda/security/account_security.xml' (properties changed: -x to +x)
4461=== modified file 'account_coda/security/ir.model.access.csv' (properties changed: -x to +x)
4462=== modified file 'account_coda/test_coda_file/statement_coda.txt' (properties changed: -x to +x)
4463=== modified file 'account_coda/wizard/__init__.py' (properties changed: -x to +x)
4464=== modified file 'account_coda/wizard/account_coda_import.py' (properties changed: -x to +x)
4465=== modified file 'account_coda/wizard/account_coda_import.xml' (properties changed: -x to +x)
4466=== modified file 'account_followup/__init__.py' (properties changed: -x to +x)
4467=== modified file 'account_followup/__openerp__.py' (properties changed: -x to +x)
4468=== modified file 'account_followup/account_followup.py' (properties changed: -x to +x)
4469=== modified file 'account_followup/account_followup_data.xml' (properties changed: -x to +x)
4470=== modified file 'account_followup/account_followup_demo.xml' (properties changed: -x to +x)
4471=== modified file 'account_followup/account_followup_view.xml' (properties changed: -x to +x)
4472=== modified file 'account_followup/i18n/account_followup.pot' (properties changed: -x to +x)
4473=== modified file 'account_followup/i18n/ar.po' (properties changed: -x to +x)
4474=== modified file 'account_followup/i18n/bg.po' (properties changed: -x to +x)
4475=== modified file 'account_followup/i18n/bs.po' (properties changed: -x to +x)
4476=== modified file 'account_followup/i18n/ca.po' (properties changed: -x to +x)
4477=== modified file 'account_followup/i18n/cs.po' (properties changed: -x to +x)
4478=== modified file 'account_followup/i18n/de.po' (properties changed: -x to +x)
4479=== modified file 'account_followup/i18n/el.po' (properties changed: -x to +x)
4480=== modified file 'account_followup/i18n/es.po' (properties changed: -x to +x)
4481=== modified file 'account_followup/i18n/es_AR.po' (properties changed: -x to +x)
4482=== modified file 'account_followup/i18n/es_EC.po' (properties changed: -x to +x)
4483=== modified file 'account_followup/i18n/et.po' (properties changed: -x to +x)
4484=== modified file 'account_followup/i18n/fi.po' (properties changed: -x to +x)
4485=== modified file 'account_followup/i18n/fr.po' (properties changed: -x to +x)
4486=== modified file 'account_followup/i18n/hr.po' (properties changed: -x to +x)
4487=== modified file 'account_followup/i18n/hu.po' (properties changed: -x to +x)
4488=== modified file 'account_followup/i18n/id.po' (properties changed: -x to +x)
4489=== modified file 'account_followup/i18n/it.po' (properties changed: -x to +x)
4490=== modified file 'account_followup/i18n/ko.po' (properties changed: -x to +x)
4491=== modified file 'account_followup/i18n/lt.po' (properties changed: -x to +x)
4492=== modified file 'account_followup/i18n/mn.po' (properties changed: -x to +x)
4493=== modified file 'account_followup/i18n/nl.po' (properties changed: -x to +x)
4494=== modified file 'account_followup/i18n/nl_BE.po' (properties changed: -x to +x)
4495=== modified file 'account_followup/i18n/oc.po' (properties changed: -x to +x)
4496=== modified file 'account_followup/i18n/pl.po' (properties changed: -x to +x)
4497=== modified file 'account_followup/i18n/pt.po' (properties changed: -x to +x)
4498=== modified file 'account_followup/i18n/pt_BR.po' (properties changed: -x to +x)
4499=== modified file 'account_followup/i18n/ro.po' (properties changed: -x to +x)
4500=== modified file 'account_followup/i18n/ru.po' (properties changed: -x to +x)
4501=== modified file 'account_followup/i18n/sl.po' (properties changed: -x to +x)
4502=== modified file 'account_followup/i18n/sq.po' (properties changed: -x to +x)
4503=== modified file 'account_followup/i18n/sr.po' (properties changed: -x to +x)
4504=== modified file 'account_followup/i18n/sr@latin.po' (properties changed: -x to +x)
4505=== modified file 'account_followup/i18n/sv.po' (properties changed: -x to +x)
4506=== modified file 'account_followup/i18n/tlh.po' (properties changed: -x to +x)
4507=== modified file 'account_followup/i18n/tr.po' (properties changed: -x to +x)
4508=== modified file 'account_followup/i18n/uk.po' (properties changed: -x to +x)
4509=== modified file 'account_followup/i18n/vi.po' (properties changed: -x to +x)
4510=== modified file 'account_followup/i18n/zh_CN.po' (properties changed: -x to +x)
4511=== modified file 'account_followup/i18n/zh_TW.po' (properties changed: -x to +x)
4512=== modified file 'account_followup/report/__init__.py' (properties changed: -x to +x)
4513=== modified file 'account_followup/report/account_followup_print.py' (properties changed: -x to +x)
4514=== modified file 'account_followup/report/account_followup_print.rml' (properties changed: -x to +x)
4515=== modified file 'account_followup/report/account_followup_print.sxw' (properties changed: -x to +x)
4516=== modified file 'account_followup/report/account_followup_report.py' (properties changed: -x to +x)
4517--- account_followup/report/account_followup_report.py 2010-12-14 15:36:08 +0000
4518+++ account_followup/report/account_followup_report.py 2011-01-13 18:00:31 +0000
4519@@ -40,7 +40,6 @@
4520 'company_id': fields.many2one('res.company', 'Company', readonly=True),
4521 'blocked': fields.boolean('Blocked', readonly=True),
4522 'period_id': fields.many2one('account.period', 'Period', readonly=True),
4523-
4524 }
4525 _order = 'date_move'
4526
4527@@ -69,7 +68,7 @@
4528 cr.execute("""
4529 create or replace view account_followup_stat as (
4530 SELECT
4531- l.id AS id,
4532+ l.partner_id as id,
4533 l.partner_id AS partner_id,
4534 min(l.date) AS date_move,
4535 max(l.date) AS date_move_last,
4536
4537=== modified file 'account_followup/report/account_followup_report.xml' (properties changed: -x to +x)
4538=== modified file 'account_followup/security/ir.model.access.csv' (properties changed: -x to +x)
4539=== modified file 'account_followup/test/account_followup.yml' (properties changed: -x to +x)
4540--- account_followup/test/account_followup.yml 2010-09-27 17:40:40 +0000
4541+++ account_followup/test/account_followup.yml 2011-01-13 18:00:31 +0000
4542@@ -66,7 +66,7 @@
4543 I create a send followup record
4544 -
4545 !record {model: account.followup.print, id: account_followup_print_0}:
4546- date: '2010-06-08'
4547+ date: !eval time.strftime('%Y-%m-%d')
4548 followup_id: account_followup_followup_testfollowups0
4549
4550
4551@@ -97,7 +97,8 @@
4552 I clicked on Print Follow Ups to print Followups reports
4553 -
4554 !python {model: account.followup.print.all}: |
4555+ import time
4556 self.do_print(cr, uid, [ref("account_followup_print_all_0")], {"lang": 'en_US',
4557 "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")],
4558- "tz": False, "date": "2010-06-08", "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"),
4559+ "tz": False, "date": time.strftime('%Y-%m-%d'), "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"),
4560 })
4561
4562=== modified file 'account_followup/wizard/__init__.py' (properties changed: -x to +x)
4563=== modified file 'account_followup/wizard/account_followup_print.py' (properties changed: -x to +x)
4564--- account_followup/wizard/account_followup_print.py 2010-12-13 06:43:09 +0000
4565+++ account_followup/wizard/account_followup_print.py 2011-01-13 18:00:31 +0000
4566@@ -219,8 +219,8 @@
4567 partners = []
4568 dict_lines = {}
4569 for line in move_lines:
4570- partners.append(line.name)
4571- dict_lines[line.name.id] =line
4572+ partners.append(line.partner_id)
4573+ dict_lines[line.partner_id.id] =line
4574 for partner in partners:
4575 ids_lines = move_obj.search(cr,uid,[('partner_id','=',partner.id),('reconcile_id','=',False),('account_id.type','in',['receivable'])])
4576 data_lines = move_obj.browse(cr, uid, ids_lines, context=context)
4577@@ -275,8 +275,11 @@
4578 sub = tools.ustr(data['email_subject'])
4579 msg = ''
4580 if dest:
4581- tools.email_send(src,dest,sub,body)
4582- msg_sent += partner.name + '\n'
4583+ try:
4584+ tools.email_send(src, dest, sub, body)
4585+ msg_sent += partner.name + '\n'
4586+ except Exception, e:
4587+ raise osv.except_osv('Error !', e )
4588 else:
4589 msg += partner.name + '\n'
4590 msg_unsent += msg
4591@@ -301,7 +304,7 @@
4592 'type': 'ir.actions.act_window',
4593 'target': 'new',
4594 'nodestroy': True
4595- }
4596+ }
4597
4598 def do_print(self, cr, uid, ids, context=None):
4599 if context is None:
4600
4601=== modified file 'account_followup/wizard/account_followup_print_view.xml' (properties changed: -x to +x)
4602=== modified file 'account_invoice_layout/__init__.py' (properties changed: -x to +x)
4603=== modified file 'account_invoice_layout/__openerp__.py' (properties changed: -x to +x)
4604=== modified file 'account_invoice_layout/account_invoice_layout.py' (properties changed: -x to +x)
4605=== modified file 'account_invoice_layout/account_invoice_layout_demo.xml' (properties changed: -x to +x)
4606=== modified file 'account_invoice_layout/account_invoice_layout_report.xml' (properties changed: -x to +x)
4607=== modified file 'account_invoice_layout/account_invoice_layout_view.xml' (properties changed: -x to +x)
4608=== modified file 'account_invoice_layout/i18n/account_invoice_layout.pot' (properties changed: -x to +x)
4609=== modified file 'account_invoice_layout/i18n/ar.po' (properties changed: -x to +x)
4610=== modified file 'account_invoice_layout/i18n/bg.po' (properties changed: -x to +x)
4611=== modified file 'account_invoice_layout/i18n/bs.po' (properties changed: -x to +x)
4612=== modified file 'account_invoice_layout/i18n/ca.po' (properties changed: -x to +x)
4613=== modified file 'account_invoice_layout/i18n/cs.po' (properties changed: -x to +x)
4614=== modified file 'account_invoice_layout/i18n/de.po' (properties changed: -x to +x)
4615=== modified file 'account_invoice_layout/i18n/el.po' (properties changed: -x to +x)
4616=== modified file 'account_invoice_layout/i18n/es.po' (properties changed: -x to +x)
4617=== modified file 'account_invoice_layout/i18n/es_AR.po' (properties changed: -x to +x)
4618=== modified file 'account_invoice_layout/i18n/es_EC.po' (properties changed: -x to +x)
4619=== modified file 'account_invoice_layout/i18n/et.po' (properties changed: -x to +x)
4620=== modified file 'account_invoice_layout/i18n/eu.po' (properties changed: -x to +x)
4621=== modified file 'account_invoice_layout/i18n/fi.po' (properties changed: -x to +x)
4622=== modified file 'account_invoice_layout/i18n/fr.po' (properties changed: -x to +x)
4623=== modified file 'account_invoice_layout/i18n/hi.po' (properties changed: -x to +x)
4624=== modified file 'account_invoice_layout/i18n/hr.po' (properties changed: -x to +x)
4625=== modified file 'account_invoice_layout/i18n/hu.po' (properties changed: -x to +x)
4626=== modified file 'account_invoice_layout/i18n/id.po' (properties changed: -x to +x)
4627=== modified file 'account_invoice_layout/i18n/it.po' (properties changed: -x to +x)
4628=== modified file 'account_invoice_layout/i18n/iu.po' (properties changed: -x to +x)
4629=== modified file 'account_invoice_layout/i18n/iu_IU.po' (properties changed: -x to +x)
4630=== modified file 'account_invoice_layout/i18n/ko.po' (properties changed: -x to +x)
4631=== modified file 'account_invoice_layout/i18n/lt.po' (properties changed: -x to +x)
4632=== modified file 'account_invoice_layout/i18n/nb.po' (properties changed: -x to +x)
4633=== modified file 'account_invoice_layout/i18n/nb_NB.po' (properties changed: -x to +x)
4634=== modified file 'account_invoice_layout/i18n/nl.po' (properties changed: -x to +x)
4635=== modified file 'account_invoice_layout/i18n/nl_BE.po' (properties changed: -x to +x)
4636=== modified file 'account_invoice_layout/i18n/oc.po' (properties changed: -x to +x)
4637=== modified file 'account_invoice_layout/i18n/pl.po' (properties changed: -x to +x)
4638=== modified file 'account_invoice_layout/i18n/pt.po' (properties changed: -x to +x)
4639=== modified file 'account_invoice_layout/i18n/pt_BR.po' (properties changed: -x to +x)
4640=== modified file 'account_invoice_layout/i18n/ro.po' (properties changed: -x to +x)
4641=== modified file 'account_invoice_layout/i18n/ru.po' (properties changed: -x to +x)
4642=== modified file 'account_invoice_layout/i18n/sl.po' (properties changed: -x to +x)
4643=== modified file 'account_invoice_layout/i18n/sq.po' (properties changed: -x to +x)
4644=== modified file 'account_invoice_layout/i18n/sr.po' (properties changed: -x to +x)
4645=== modified file 'account_invoice_layout/i18n/sr@latin.po' (properties changed: -x to +x)
4646=== modified file 'account_invoice_layout/i18n/sv.po' (properties changed: -x to +x)
4647=== modified file 'account_invoice_layout/i18n/tlh.po' (properties changed: -x to +x)
4648=== modified file 'account_invoice_layout/i18n/tr.po' (properties changed: -x to +x)
4649=== modified file 'account_invoice_layout/i18n/uk.po' (properties changed: -x to +x)
4650=== modified file 'account_invoice_layout/i18n/vi.po' (properties changed: -x to +x)
4651=== modified file 'account_invoice_layout/i18n/zh_CN.po' (properties changed: -x to +x)
4652=== modified file 'account_invoice_layout/i18n/zh_TW.po' (properties changed: -x to +x)
4653=== modified file 'account_invoice_layout/report/__init__.py' (properties changed: -x to +x)
4654=== modified file 'account_invoice_layout/report/report_account_invoice_layout.py' (properties changed: -x to +x)
4655=== modified file 'account_invoice_layout/report/report_account_invoice_layout.rml' (properties changed: -x to +x)
4656=== modified file 'account_invoice_layout/report/report_account_invoice_layout.sxw' (properties changed: -x to +x)
4657=== modified file 'account_invoice_layout/report/special_message_invoice.py' (properties changed: -x to +x)
4658=== modified file 'account_invoice_layout/report/special_message_invoice.rml' (properties changed: -x to +x)
4659=== modified file 'account_invoice_layout/report/special_message_invoice.sxw' (properties changed: -x to +x)
4660=== modified file 'account_invoice_layout/security/ir.model.access.csv' (properties changed: -x to +x)
4661=== modified file 'account_invoice_layout/test/account_invoice_layout_report.yml' (properties changed: -x to +x)
4662=== modified file 'account_invoice_layout/wizard/__init__.py' (properties changed: -x to +x)
4663=== modified file 'account_invoice_layout/wizard/account_invoice_special_message.py' (properties changed: -x to +x)
4664=== modified file 'account_invoice_layout/wizard/account_invoice_special_message.xml' (properties changed: -x to +x)
4665=== modified file 'account_payment/__init__.py' (properties changed: -x to +x)
4666=== modified file 'account_payment/__openerp__.py' (properties changed: -x to +x)
4667=== modified file 'account_payment/account_invoice.py' (properties changed: -x to +x)
4668=== modified file 'account_payment/account_invoice_view.xml' (properties changed: -x to +x)
4669=== modified file 'account_payment/account_move_line.py' (properties changed: -x to +x)
4670=== modified file 'account_payment/account_payment.py' (properties changed: -x to +x)
4671=== modified file 'account_payment/account_payment_demo.xml' (properties changed: -x to +x)
4672=== modified file 'account_payment/account_payment_report.xml' (properties changed: -x to +x)
4673=== modified file 'account_payment/account_payment_sequence.xml' (properties changed: -x to +x)
4674=== modified file 'account_payment/account_payment_view.xml' (properties changed: -x to +x)
4675=== modified file 'account_payment/account_payment_workflow.xml' (properties changed: -x to +x)
4676=== modified file 'account_payment/i18n/account_payment.pot' (properties changed: -x to +x)
4677=== modified file 'account_payment/i18n/ar.po' (properties changed: -x to +x)
4678=== modified file 'account_payment/i18n/bg.po' (properties changed: -x to +x)
4679=== modified file 'account_payment/i18n/bs.po' (properties changed: -x to +x)
4680=== modified file 'account_payment/i18n/ca.po' (properties changed: -x to +x)
4681=== modified file 'account_payment/i18n/cs.po' (properties changed: -x to +x)
4682=== modified file 'account_payment/i18n/de.po' (properties changed: -x to +x)
4683=== modified file 'account_payment/i18n/el.po' (properties changed: -x to +x)
4684=== modified file 'account_payment/i18n/es.po' (properties changed: -x to +x)
4685=== modified file 'account_payment/i18n/es_AR.po' (properties changed: -x to +x)
4686=== modified file 'account_payment/i18n/es_EC.po' (properties changed: -x to +x)
4687=== modified file 'account_payment/i18n/et.po' (properties changed: -x to +x)
4688=== modified file 'account_payment/i18n/fi.po' (properties changed: -x to +x)
4689=== modified file 'account_payment/i18n/fr.po' (properties changed: -x to +x)
4690=== modified file 'account_payment/i18n/hi.po' (properties changed: -x to +x)
4691=== modified file 'account_payment/i18n/hr.po' (properties changed: -x to +x)
4692=== modified file 'account_payment/i18n/hu.po' (properties changed: -x to +x)
4693=== modified file 'account_payment/i18n/id.po' (properties changed: -x to +x)
4694=== modified file 'account_payment/i18n/it.po' (properties changed: -x to +x)
4695=== modified file 'account_payment/i18n/ko.po' (properties changed: -x to +x)
4696=== modified file 'account_payment/i18n/lt.po' (properties changed: -x to +x)
4697=== modified file 'account_payment/i18n/mn.po' (properties changed: -x to +x)
4698=== modified file 'account_payment/i18n/nl.po' (properties changed: -x to +x)
4699=== modified file 'account_payment/i18n/nl_BE.po' (properties changed: -x to +x)
4700=== modified file 'account_payment/i18n/oc.po' (properties changed: -x to +x)
4701=== modified file 'account_payment/i18n/pl.po' (properties changed: -x to +x)
4702=== modified file 'account_payment/i18n/pt.po' (properties changed: -x to +x)
4703=== modified file 'account_payment/i18n/pt_BR.po' (properties changed: -x to +x)
4704=== modified file 'account_payment/i18n/ro.po' (properties changed: -x to +x)
4705=== modified file 'account_payment/i18n/ru.po' (properties changed: -x to +x)
4706=== modified file 'account_payment/i18n/sl.po' (properties changed: -x to +x)
4707=== modified file 'account_payment/i18n/sq.po' (properties changed: -x to +x)
4708=== modified file 'account_payment/i18n/sr.po' (properties changed: -x to +x)
4709=== modified file 'account_payment/i18n/sr@latin.po' (properties changed: -x to +x)
4710=== modified file 'account_payment/i18n/sv.po' (properties changed: -x to +x)
4711=== modified file 'account_payment/i18n/tlh.po' (properties changed: -x to +x)
4712=== modified file 'account_payment/i18n/tr.po' (properties changed: -x to +x)
4713=== modified file 'account_payment/i18n/uk.po' (properties changed: -x to +x)
4714=== modified file 'account_payment/i18n/vi.po' (properties changed: -x to +x)
4715=== modified file 'account_payment/i18n/zh_CN.po' (properties changed: -x to +x)
4716=== modified file 'account_payment/i18n/zh_TW.po' (properties changed: -x to +x)
4717=== modified file 'account_payment/report/__init__.py' (properties changed: -x to +x)
4718=== modified file 'account_payment/report/order.rml' (properties changed: -x to +x)
4719=== modified file 'account_payment/report/order.sxw' (properties changed: -x to +x)
4720=== modified file 'account_payment/report/payment_order.py' (properties changed: -x to +x)
4721=== modified file 'account_payment/security/account_payment_security.xml' (properties changed: -x to +x)
4722=== modified file 'account_payment/security/ir.model.access.csv' (properties changed: -x to +x)
4723=== modified file 'account_payment/test/account_payment.yml' (properties changed: -x to +x)
4724--- account_payment/test/account_payment.yml 2010-10-04 08:36:19 +0000
4725+++ account_payment/test/account_payment.yml 2011-01-13 18:00:31 +0000
4726@@ -60,7 +60,7 @@
4727 !record {model: payment.order, id: payment_order_0}:
4728 date_prefered: due
4729 mode: payment_mode_m0
4730- reference: 2010/006
4731+ reference: !eval "'%s/006' %(datetime.now().year)"
4732 user_id: base.user_root
4733
4734
4735@@ -68,7 +68,7 @@
4736 Creating a payment.order.create record
4737 -
4738 !record {model: payment.order.create, id: payment_order_create_0}:
4739- duedate: '2010-06-04'
4740+ duedate: !eval time.strftime('%Y-%m-%d')
4741
4742 -
4743 I searched the entries using "Payment Create Order" wizard
4744
4745=== modified file 'account_payment/test/account_payment_report.yml' (properties changed: -x to +x)
4746=== modified file 'account_payment/wizard/__init__.py' (properties changed: -x to +x)
4747=== modified file 'account_payment/wizard/account_payment_create_order_view.xml' (properties changed: -x to +x)
4748=== modified file 'account_payment/wizard/account_payment_order.py' (properties changed: -x to +x)
4749=== modified file 'account_payment/wizard/account_payment_pay.py' (properties changed: -x to +x)
4750=== modified file 'account_payment/wizard/account_payment_pay_view.xml' (properties changed: -x to +x)
4751=== modified file 'account_payment/wizard/account_payment_populate_statement.py' (properties changed: -x to +x)
4752=== modified file 'account_payment/wizard/account_payment_populate_statement_view.xml' (properties changed: -x to +x)
4753=== modified file 'account_sequence/__init__.py' (properties changed: -x to +x)
4754=== modified file 'account_sequence/__openerp__.py' (properties changed: -x to +x)
4755=== modified file 'account_sequence/account_sequence.py' (properties changed: -x to +x)
4756=== modified file 'account_sequence/account_sequence.xml' (properties changed: -x to +x)
4757=== modified file 'account_sequence/account_sequence_data.xml' (properties changed: -x to +x)
4758=== modified file 'account_sequence/account_sequence_installer.py' (properties changed: -x to +x)
4759=== modified file 'account_sequence/account_sequence_installer_view.xml' (properties changed: -x to +x)
4760=== modified file 'account_sequence/i18n/account_sequence.pot' (properties changed: -x to +x)
4761=== modified file 'account_sequence/i18n/fr.po' (properties changed: -x to +x)
4762=== modified file 'account_voucher/__init__.py' (properties changed: -x to +x)
4763=== modified file 'account_voucher/__openerp__.py' (properties changed: -x to +x)
4764=== modified file 'account_voucher/account_voucher.py' (properties changed: -x to +x)
4765--- account_voucher/account_voucher.py 2011-01-05 15:16:59 +0000
4766+++ account_voucher/account_voucher.py 2011-01-13 18:00:31 +0000
4767@@ -45,6 +45,11 @@
4768 def _get_journal(self, cr, uid, context=None):
4769 if context is None: context = {}
4770 journal_pool = self.pool.get('account.journal')
4771+ invoice_pool = self.pool.get('account.invoice')
4772+ if context.get('invoice_id', False):
4773+ currency_id = invoice_pool.browse(cr, uid, context['invoice_id'], context=context).currency_id.id
4774+ journal_id = journal_pool.search(cr, uid, [('currency', '=', currency_id)], limit=1)
4775+ return journal_id and journal_id[0] or False
4776 if context.get('journal_id', False):
4777 return context.get('journal_id')
4778 if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
4779@@ -700,7 +705,7 @@
4780 continue
4781 #we check if the voucher line is fully paid or not and create a move line to balance the payment and initial invoice if needed
4782 if line.amount == line.amount_unreconciled:
4783- amount = line.move_line_id.amount_residual #residual amount in company currency
4784+ amount = line.move_line_id.amount_residual #residual amount in company currency
4785 else:
4786 amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount, context=context_multi_currency)
4787 move_line = {
4788@@ -766,7 +771,6 @@
4789 #'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0,
4790 #'currency_id': company_currency <> current_currency and current_currency or False,
4791 }
4792-
4793 move_line_pool.create(cr, uid, move_line)
4794 self.write(cr, uid, [inv.id], {
4795 'move_id': move_id,
4796@@ -840,7 +844,7 @@
4797 'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
4798 'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True),
4799 'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
4800- 'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True),
4801+ 'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
4802 }
4803 _defaults = {
4804 'name': ''
4805
4806=== modified file 'account_voucher/account_voucher_pay_invoice.xml' (properties changed: -x to +x)
4807=== modified file 'account_voucher/account_voucher_report.xml' (properties changed: -x to +x)
4808=== modified file 'account_voucher/account_voucher_sequence.xml' (properties changed: -x to +x)
4809=== modified file 'account_voucher/account_voucher_view.xml' (properties changed: -x to +x)
4810=== modified file 'account_voucher/account_voucher_wizard.xml' (properties changed: -x to +x)
4811=== modified file 'account_voucher/account_voucher_workflow.xml' (properties changed: -x to +x)
4812=== modified file 'account_voucher/i18n/account_voucher.pot' (properties changed: -x to +x)
4813=== modified file 'account_voucher/i18n/ar.po' (properties changed: -x to +x)
4814=== modified file 'account_voucher/i18n/bg.po' (properties changed: -x to +x)
4815=== modified file 'account_voucher/i18n/bs.po' (properties changed: -x to +x)
4816=== modified file 'account_voucher/i18n/ca.po' (properties changed: -x to +x)
4817=== modified file 'account_voucher/i18n/cs.po' (properties changed: -x to +x)
4818=== modified file 'account_voucher/i18n/de.po' (properties changed: -x to +x)
4819=== modified file 'account_voucher/i18n/el.po' (properties changed: -x to +x)
4820=== modified file 'account_voucher/i18n/es.po' (properties changed: -x to +x)
4821=== modified file 'account_voucher/i18n/es_AR.po' (properties changed: -x to +x)
4822=== modified file 'account_voucher/i18n/es_EC.po' (properties changed: -x to +x)
4823=== modified file 'account_voucher/i18n/et.po' (properties changed: -x to +x)
4824=== modified file 'account_voucher/i18n/fr.po' (properties changed: -x to +x)
4825=== modified file 'account_voucher/i18n/hi.po' (properties changed: -x to +x)
4826=== modified file 'account_voucher/i18n/hr.po' (properties changed: -x to +x)
4827=== modified file 'account_voucher/i18n/hu.po' (properties changed: -x to +x)
4828=== modified file 'account_voucher/i18n/id.po' (properties changed: -x to +x)
4829=== modified file 'account_voucher/i18n/it.po' (properties changed: -x to +x)
4830=== modified file 'account_voucher/i18n/ko.po' (properties changed: -x to +x)
4831=== modified file 'account_voucher/i18n/lt.po' (properties changed: -x to +x)
4832=== modified file 'account_voucher/i18n/mn.po' (properties changed: -x to +x)
4833=== modified file 'account_voucher/i18n/nl.po' (properties changed: -x to +x)
4834=== modified file 'account_voucher/i18n/nl_BE.po' (properties changed: -x to +x)
4835=== modified file 'account_voucher/i18n/oc.po' (properties changed: -x to +x)
4836=== modified file 'account_voucher/i18n/pl.po' (properties changed: -x to +x)
4837=== modified file 'account_voucher/i18n/pt.po' (properties changed: -x to +x)
4838=== modified file 'account_voucher/i18n/pt_BR.po' (properties changed: -x to +x)
4839=== modified file 'account_voucher/i18n/ro.po' (properties changed: -x to +x)
4840=== modified file 'account_voucher/i18n/ru.po' (properties changed: -x to +x)
4841=== modified file 'account_voucher/i18n/sl.po' (properties changed: -x to +x)
4842=== modified file 'account_voucher/i18n/sq.po' (properties changed: -x to +x)
4843=== modified file 'account_voucher/i18n/sr.po' (properties changed: -x to +x)
4844=== modified file 'account_voucher/i18n/sr@latin.po' (properties changed: -x to +x)
4845=== modified file 'account_voucher/i18n/sv.po' (properties changed: -x to +x)
4846=== modified file 'account_voucher/i18n/tlh.po' (properties changed: -x to +x)
4847=== modified file 'account_voucher/i18n/tr.po' (properties changed: -x to +x)
4848=== modified file 'account_voucher/i18n/uk.po' (properties changed: -x to +x)
4849=== modified file 'account_voucher/i18n/vi.po' (properties changed: -x to +x)
4850=== modified file 'account_voucher/i18n/zh_CN.po' (properties changed: -x to +x)
4851=== modified file 'account_voucher/i18n/zh_TW.po' (properties changed: -x to +x)
4852=== modified file 'account_voucher/invoice.py' (properties changed: -x to +x)
4853=== modified file 'account_voucher/report/__init__.py' (properties changed: -x to +x)
4854=== modified file 'account_voucher/report/account_voucher.py' (properties changed: -x to +x)
4855=== modified file 'account_voucher/report/account_voucher.rml' (properties changed: -x to +x)
4856=== modified file 'account_voucher/report/account_voucher.sxw' (properties changed: -x to +x)
4857=== modified file 'account_voucher/report/account_voucher_print.py' (properties changed: -x to +x)
4858=== modified file 'account_voucher/report/account_voucher_print.rml' (properties changed: -x to +x)
4859=== modified file 'account_voucher/report/account_voucher_print.sxw' (properties changed: -x to +x)
4860=== modified file 'account_voucher/report/account_voucher_sales_receipt.py' (properties changed: -x to +x)
4861=== modified file 'account_voucher/report/account_voucher_sales_receipt_view.xml' (properties changed: -x to +x)
4862=== modified file 'account_voucher/security/account_voucher_security.xml' (properties changed: -x to +x)
4863=== modified file 'account_voucher/security/ir.model.access.csv' (properties changed: -x to +x)
4864--- account_voucher/security/ir.model.access.csv 2010-10-16 16:47:09 +0000
4865+++ account_voucher/security/ir.model.access.csv 2011-01-13 18:00:31 +0000
4866@@ -5,3 +5,5 @@
4867 "access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,0,0,0
4868 "access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
4869 "access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1
4870+"access_sale_receipt_report_manager","account.sale.receipt.report","model_sale_receipt_report","account.group_account_manager",1,1,1,1
4871+"access_sale_receipt_report_user","account.sale.receipt.report","model_sale_receipt_report","account.group_account_user",1,0,0,0
4872
4873=== modified file 'account_voucher/test/account_voucher.yml' (properties changed: -x to +x)
4874=== modified file 'account_voucher/test/account_voucher_report.yml' (properties changed: -x to +x)
4875=== modified file 'account_voucher/test/sales_payment.yml' (properties changed: -x to +x)
4876=== modified file 'account_voucher/test/sales_receipt.yml' (properties changed: -x to +x)
4877=== modified file 'account_voucher/voucher_payment_receipt_view.xml' (properties changed: -x to +x)
4878=== modified file 'account_voucher/voucher_sales_purchase_view.xml' (properties changed: -x to +x)
4879--- account_voucher/voucher_sales_purchase_view.xml 2010-12-30 11:28:21 +0000
4880+++ account_voucher/voucher_sales_purchase_view.xml 2011-01-13 18:00:31 +0000
4881@@ -158,7 +158,7 @@
4882 <field name="state"/>
4883 <field name="reconcile_id"/>
4884 </tree>
4885- </field>
4886+ </field>
4887 </page>
4888 </notebook>
4889 <group col="8" colspan="4">
4890@@ -278,7 +278,7 @@
4891 <field name="state"/>
4892 <field name="reconcile_id"/>
4893 </tree>
4894- </field>
4895+ </field>
4896 </page>
4897 </notebook>
4898 <group col="10" colspan="4">
4899
4900=== modified file 'account_voucher/wizard/__init__.py' (properties changed: -x to +x)
4901=== modified file 'account_voucher/wizard/account_statement_from_invoice.py' (properties changed: -x to +x)
4902=== modified file 'account_voucher/wizard/account_statement_from_invoice_view.xml' (properties changed: -x to +x)
4903=== modified file 'account_voucher/wizard/account_voucher_unreconcile.py' (properties changed: -x to +x)
4904=== modified file 'account_voucher/wizard/account_voucher_unreconcile_view.xml' (properties changed: -x to +x)
4905=== modified file 'analytic/__init__.py' (properties changed: -x to +x)
4906=== modified file 'analytic/__openerp__.py' (properties changed: -x to +x)
4907=== modified file 'analytic/analytic.py' (properties changed: -x to +x)
4908=== modified file 'analytic/i18n/analytic.pot' (properties changed: -x to +x)
4909=== modified file 'analytic/i18n/bs.po' (properties changed: -x to +x)
4910=== modified file 'analytic/i18n/de.po' (properties changed: -x to +x)
4911=== modified file 'analytic/i18n/el.po' (properties changed: -x to +x)
4912=== modified file 'analytic/i18n/es.po' (properties changed: -x to +x)
4913=== modified file 'analytic/i18n/es_EC.po' (properties changed: -x to +x)
4914=== modified file 'analytic/i18n/et.po' (properties changed: -x to +x)
4915=== modified file 'analytic/i18n/fr.po' (properties changed: -x to +x)
4916=== modified file 'analytic/i18n/it.po' (properties changed: -x to +x)
4917=== modified file 'analytic/i18n/mn.po' (properties changed: -x to +x)
4918=== modified file 'analytic/i18n/nl.po' (properties changed: -x to +x)
4919=== modified file 'analytic/i18n/pl.po' (properties changed: -x to +x)
4920=== modified file 'analytic/i18n/pt.po' (properties changed: -x to +x)
4921=== modified file 'analytic/i18n/pt_BR.po' (properties changed: -x to +x)
4922=== modified file 'analytic/i18n/sl.po' (properties changed: -x to +x)
4923=== modified file 'analytic/i18n/sr.po' (properties changed: -x to +x)
4924=== modified file 'analytic/i18n/sr@latin.po' (properties changed: -x to +x)
4925=== modified file 'analytic/i18n/sv.po' (properties changed: -x to +x)
4926=== modified file 'analytic/i18n/vi.po' (properties changed: -x to +x)
4927=== modified file 'analytic/i18n/zh_CN.po' (properties changed: -x to +x)
4928=== modified file 'analytic/security/analytic_security.xml' (properties changed: -x to +x)
4929=== modified file 'analytic/security/ir.model.access.csv' (properties changed: -x to +x)
4930=== modified file 'analytic_journal_billing_rate/__init__.py' (properties changed: -x to +x)
4931=== modified file 'analytic_journal_billing_rate/__openerp__.py' (properties changed: -x to +x)
4932=== modified file 'analytic_journal_billing_rate/analytic_journal_billing_rate.py' (properties changed: -x to +x)
4933=== modified file 'analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml' (properties changed: -x to +x)
4934=== modified file 'analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot' (properties changed: -x to +x)
4935=== modified file 'analytic_journal_billing_rate/i18n/ar.po' (properties changed: -x to +x)
4936=== modified file 'analytic_journal_billing_rate/i18n/bg.po' (properties changed: -x to +x)
4937=== modified file 'analytic_journal_billing_rate/i18n/bs.po' (properties changed: -x to +x)
4938=== modified file 'analytic_journal_billing_rate/i18n/ca.po' (properties changed: -x to +x)
4939=== modified file 'analytic_journal_billing_rate/i18n/cs.po' (properties changed: -x to +x)
4940=== modified file 'analytic_journal_billing_rate/i18n/de.po' (properties changed: -x to +x)
4941=== modified file 'analytic_journal_billing_rate/i18n/el.po' (properties changed: -x to +x)
4942=== modified file 'analytic_journal_billing_rate/i18n/es.po' (properties changed: -x to +x)
4943=== modified file 'analytic_journal_billing_rate/i18n/es_AR.po' (properties changed: -x to +x)
4944=== modified file 'analytic_journal_billing_rate/i18n/es_EC.po' (properties changed: -x to +x)
4945=== modified file 'analytic_journal_billing_rate/i18n/et.po' (properties changed: -x to +x)
4946=== modified file 'analytic_journal_billing_rate/i18n/fr.po' (properties changed: -x to +x)
4947=== modified file 'analytic_journal_billing_rate/i18n/gl.po' (properties changed: -x to +x)
4948=== modified file 'analytic_journal_billing_rate/i18n/hr.po' (properties changed: -x to +x)
4949=== modified file 'analytic_journal_billing_rate/i18n/hu.po' (properties changed: -x to +x)
4950=== modified file 'analytic_journal_billing_rate/i18n/id.po' (properties changed: -x to +x)
4951=== modified file 'analytic_journal_billing_rate/i18n/it.po' (properties changed: -x to +x)
4952=== modified file 'analytic_journal_billing_rate/i18n/ko.po' (properties changed: -x to +x)
4953=== modified file 'analytic_journal_billing_rate/i18n/lt.po' (properties changed: -x to +x)
4954=== modified file 'analytic_journal_billing_rate/i18n/mn.po' (properties changed: -x to +x)
4955=== modified file 'analytic_journal_billing_rate/i18n/nl.po' (properties changed: -x to +x)
4956=== modified file 'analytic_journal_billing_rate/i18n/nl_BE.po' (properties changed: -x to +x)
4957=== modified file 'analytic_journal_billing_rate/i18n/oc.po' (properties changed: -x to +x)
4958=== modified file 'analytic_journal_billing_rate/i18n/pl.po' (properties changed: -x to +x)
4959=== modified file 'analytic_journal_billing_rate/i18n/pt.po' (properties changed: -x to +x)
4960=== modified file 'analytic_journal_billing_rate/i18n/pt_BR.po' (properties changed: -x to +x)
4961=== modified file 'analytic_journal_billing_rate/i18n/ro.po' (properties changed: -x to +x)
4962=== modified file 'analytic_journal_billing_rate/i18n/ru.po' (properties changed: -x to +x)
4963=== modified file 'analytic_journal_billing_rate/i18n/sl.po' (properties changed: -x to +x)
4964=== modified file 'analytic_journal_billing_rate/i18n/sq.po' (properties changed: -x to +x)
4965=== modified file 'analytic_journal_billing_rate/i18n/sr.po' (properties changed: -x to +x)
4966=== modified file 'analytic_journal_billing_rate/i18n/sr@latin.po' (properties changed: -x to +x)
4967=== modified file 'analytic_journal_billing_rate/i18n/sv.po' (properties changed: -x to +x)
4968=== modified file 'analytic_journal_billing_rate/i18n/tlh.po' (properties changed: -x to +x)
4969=== modified file 'analytic_journal_billing_rate/i18n/tr.po' (properties changed: -x to +x)
4970=== modified file 'analytic_journal_billing_rate/i18n/uk.po' (properties changed: -x to +x)
4971=== modified file 'analytic_journal_billing_rate/i18n/vi.po' (properties changed: -x to +x)
4972=== modified file 'analytic_journal_billing_rate/i18n/zh_CN.po' (properties changed: -x to +x)
4973=== modified file 'analytic_journal_billing_rate/i18n/zh_TW.po' (properties changed: -x to +x)
4974=== modified file 'analytic_journal_billing_rate/security/ir.model.access.csv' (properties changed: -x to +x)
4975=== modified file 'analytic_user_function/__init__.py' (properties changed: -x to +x)
4976=== modified file 'analytic_user_function/__openerp__.py' (properties changed: -x to +x)
4977=== modified file 'analytic_user_function/analytic_user_function.py' (properties changed: -x to +x)
4978=== modified file 'analytic_user_function/analytic_user_function_view.xml' (properties changed: -x to +x)
4979=== modified file 'analytic_user_function/i18n/analytic_user_function.pot' (properties changed: -x to +x)
4980=== modified file 'analytic_user_function/i18n/ar.po' (properties changed: -x to +x)
4981=== modified file 'analytic_user_function/i18n/bg.po' (properties changed: -x to +x)
4982=== modified file 'analytic_user_function/i18n/bs.po' (properties changed: -x to +x)
4983=== modified file 'analytic_user_function/i18n/ca.po' (properties changed: -x to +x)
4984=== modified file 'analytic_user_function/i18n/cs.po' (properties changed: -x to +x)
4985=== modified file 'analytic_user_function/i18n/de.po' (properties changed: -x to +x)
4986=== modified file 'analytic_user_function/i18n/el.po' (properties changed: -x to +x)
4987=== modified file 'analytic_user_function/i18n/es.po' (properties changed: -x to +x)
4988=== modified file 'analytic_user_function/i18n/es_AR.po' (properties changed: -x to +x)
4989=== modified file 'analytic_user_function/i18n/es_EC.po' (properties changed: -x to +x)
4990=== modified file 'analytic_user_function/i18n/et.po' (properties changed: -x to +x)
4991=== modified file 'analytic_user_function/i18n/fr.po' (properties changed: -x to +x)
4992=== modified file 'analytic_user_function/i18n/gl.po' (properties changed: -x to +x)
4993=== modified file 'analytic_user_function/i18n/hr.po' (properties changed: -x to +x)
4994=== modified file 'analytic_user_function/i18n/hu.po' (properties changed: -x to +x)
4995=== modified file 'analytic_user_function/i18n/id.po' (properties changed: -x to +x)
4996=== modified file 'analytic_user_function/i18n/it.po' (properties changed: -x to +x)
4997=== modified file 'analytic_user_function/i18n/ko.po' (properties changed: -x to +x)
4998=== modified file 'analytic_user_function/i18n/lt.po' (properties changed: -x to +x)
4999=== modified file 'analytic_user_function/i18n/mn.po' (properties changed: -x to +x)
5000=== modified file 'analytic_user_function/i18n/nl.po' (properties changed: -x to +x)
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: