odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20080924134128-fe6buyd6zdxef1bn
This commit is contained in:
Fabien Pinckaers 2008-09-24 15:41:28 +02:00
parent 257418221c e1b9e4656f
commit 9961e94cfa
2 changed files with 6 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

310
addons/account_budget/i18n/account_budget_crossover.pot
View File

@ -1,310 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * account_budget_crossover
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-10 12:47:16+0000"
"PO-Revision-Date: 2008-09-10 12:47:16+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: account_budget_crossover
#: field:crossovered.budget,creating_user_id:0
msgid "Responsible User"
msgstr ""
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Confirmed"
msgstr ""
#. module: account_budget_crossover
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Printed at:"
msgstr ""
#. module: account_budget_crossover
#: view:crossovered.budget:0
msgid "Confirm"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget,validating_user_id:0
msgid "Validate User"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget.lines,analytic_account_id:0
msgid "Analytic Account Ref"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Currency:"
msgstr ""
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Draft"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "at"
msgstr ""
#. module: account_budget_crossover
#: model:ir.actions.report.xml,name:account_budget_crossover.account_analytic_account_budget
#: model:ir.actions.report.xml,name:account_budget_crossover.report_crossovered_budget
#: model:ir.actions.wizard,name:account_budget_crossover.account_analytic_account_budget_report
#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu
msgid "Print Budgets"
msgstr ""
#. module: account_budget_crossover
#: wizard_button:wizard.analytic.account.budget.report,init,report:0
#: wizard_button:wizard.crossovered.budget,init,report:0
#: wizard_button:wizard.crossovered.budget.summary,init,report:0
msgid "Print"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget.lines,percentage:0
msgid "Percentage"
msgstr ""
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Validated"
msgstr ""
#. module: account_budget_crossover
#: model:ir.model,name:account_budget_crossover.model_crossovered_budget_lines
msgid "Crossovered Budget Lines"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget,name:0
msgid "Name"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget,state:0
msgid "Status"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "%"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Description"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
msgid "Analytic Account :"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget.lines,crossovered_budget_id:0
msgid "Budget Ref"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "to"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
#: field:crossovered.budget.lines,planned_amount:0
msgid "Planned Amount"
msgstr ""
#. module: account_budget_crossover
#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget_entries
msgid "Entries"
msgstr ""
#. module: account_budget_crossover
#: view:crossovered.budget:0
msgid "Validate"
msgstr ""
#. module: account_budget_crossover
#: wizard_view:wizard.crossovered.budget,init:0
#: wizard_view:wizard.crossovered.budget.summary,init:0
msgid "Select Options"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
#: field:crossovered.budget.lines,practical_amount:0
msgid "Practical Amount"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget,date_to:0
#: field:crossovered.budget.lines,date_to:0
msgid "End Date"
msgstr ""
#. module: account_budget_crossover
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget.lines,theoritical_amount:0
msgid "Theoritical Amount"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Total:"
msgstr ""
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
msgid "Cancelled"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget.lines,general_budget_id:0
msgid "Master Budget Ref"
msgstr ""
#. module: account_budget_crossover
#: view:account.analytic.account:0
msgid "Lines"
msgstr ""
#. module: account_budget_crossover
#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_view
#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_view
#: view:crossovered.budget:0
msgid "Budget"
msgstr ""
#. module: account_budget_crossover
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
msgstr ""
#. module: account_budget_crossover
#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget
msgid "Budgets"
msgstr ""
#. module: account_budget_crossover
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
#: wizard_field:wizard.crossovered.budget,init,date_to:0
#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
msgid "End of period"
msgstr ""
#. module: account_budget_crossover
#: model:ir.model,name:account_budget_crossover.model_crossovered_budget
msgid "Crossovered Budget"
msgstr ""
#. module: account_budget_crossover
#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
#: wizard_field:wizard.crossovered.budget,init,date_from:0
#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
msgid "Start of period"
msgstr ""
#. module: account_budget_crossover
#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu_1
msgid "Print Summary of Budgets"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget,code:0
msgid "Code"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Theoretical Amount"
msgstr ""
#. module: account_budget_crossover
#: rml:crossovered.budget.report:0
msgid "Budget :"
msgstr ""
#. module: account_budget_crossover
#: selection:crossovered.budget,state:0
#: view:crossovered.budget:0
msgid "Done"
msgstr ""
#. module: account_budget_crossover
#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_lines_view
#: field:account.analytic.account,crossovered_budget_line:0
#: field:account.budget.post,crossovered_budget_line:0
#: field:crossovered.budget,crossovered_budget_line:0
#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_lines_view
#: view:crossovered.budget:0
#: view:account.analytic.account:0
#: view:crossovered.budget.lines:0
msgid "Budget Lines"
msgstr ""
#. module: account_budget_crossover
#: wizard_button:wizard.analytic.account.budget.report,init,end:0
#: wizard_button:wizard.crossovered.budget,init,end:0
#: wizard_button:wizard.crossovered.budget.summary,init,end:0
#: view:crossovered.budget:0
msgid "Cancel"
msgstr ""
#. module: account_budget_crossover
#: field:account.budget.post.dotation,tot_planned:0
msgid "Total Planned Amount"
msgstr ""
#. module: account_budget_crossover
#: field:crossovered.budget,date_from:0
#: field:crossovered.budget.lines,date_from:0
msgid "Start Date"
msgstr ""
#. module: account_budget_crossover
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Analysis from"
msgstr ""

9
addons/account_followup/wizard/wizard_followup_print.py
View File

@ -212,7 +212,7 @@ class followup_all_print(wizard.interface):
def _get_partners(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
cr.execute(
"SELECT l.partner_id, l.followup_line_id, l.date, l.id "\
"SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\
"FROM account_move_line AS l "\
"LEFT JOIN account_account AS a "\
"ON (l.account_id=a.id) "\
@ -251,14 +251,17 @@ class followup_all_print(wizard.interface):
partner_list = []
to_update = {}
for partner_id, followup_line_id, date, id in move_lines:
for partner_id, followup_line_id, date_maturity,date, id in move_lines:
if not partner_id:
continue
if partner_id in partner_list:
to_update[str(id)] = fups[followup_line_id][1]
if followup_line_id not in fups:
continue
if date <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
if date_maturity and date_maturity <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
partner_list.append(partner_id)
to_update[str(id)] = fups[followup_line_id][1]
elif date and date <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
partner_list.append(partner_id)
to_update[str(id)] = fups[followup_line_id][1]
return {'partner_ids': partner_list, 'to_update': to_update}