From d62cd51810b9ba0567ca13eb8fc98dc804d1444a Mon Sep 17 00:00:00 2001 From: "pap (openerp)" Date: Fri, 18 Jun 2010 16:33:55 +0530 Subject: [PATCH] [FIX]:payment_term on account.invoice generated error bzr revid: pap@tinyerp.co.in-20100618110355-gj9qlqd0na0dxnfy --- addons/account/account.py | 2 +- addons/analytic/i18n/analytic.pot | 251 ++++++++++++++++++++++++++++++ addons/analytic/i18n/en_US.po | 251 ++++++++++++++++++++++++++++++ 3 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 addons/analytic/i18n/analytic.pot create mode 100644 addons/analytic/i18n/en_US.po diff --git a/addons/account/account.py b/addons/account/account.py index f946723e350..f6a5680e6f3 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -81,7 +81,7 @@ class account_payment_term(osv.osv): if amt: next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days) if line.days2 < 0: - next_date += relativedelta(day=line.days2) + next_date += relativedelta(day=31) if line.days2 > 0: next_date += relativedelta(day=line.days2, months=1) result.append( (next_date.strftime('%Y-%m-%d'), amt) ) diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot new file mode 100644 index 00000000000..170243cf16e --- /dev/null +++ b/addons/analytic/i18n/analytic.pot @@ -0,0 +1,251 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * analytic +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.0dev\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2010-06-18 10:59:19+0000\n" +"PO-Revision-Date: 2010-06-18 10:59:19+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,amount_currency:0 +msgid "The amount expressed in the related account currency if not equal to the company one." +msgstr "" + +#. module: analytic +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "" + +#. module: analytic +#: help:account.analytic.line,currency_id:0 +msgid "The related account currency if not equal to the company one." +msgstr "" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "Module for defining analytic accounting object.\n" +" " +msgstr "" + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "" + +#. module: analytic +#: help:account.analytic.account,state:0 +msgid "* When an account is created its in 'Draft' state. \n" +"* If any associated partner is there, it can be in 'Open' state. \n" +"* If any pending balance is there it can be in 'Pending'. \n" +"* And finally when all the transactions are over, it can be in 'Close' state. \n" +"* The project can be in either if the states 'Template' and 'Running'.\n" +" If it is template then we can make projects based on the template projects. If its in 'Running' state it is a normal project. \n" +" If it is to be reviewed then the state is 'Pending'.\n" +" When the project is completed the state is set to 'Done'." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "Calculated by multiplying the quantity and the price given in the Product's cost price." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +#: field:account.analytic.line,currency_id:0 +msgid "Account currency" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "" + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,company_currency_id:0 +msgid "Currency" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,amount_currency:0 +msgid "Amount currency" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Associated Partner" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "" + diff --git a/addons/analytic/i18n/en_US.po b/addons/analytic/i18n/en_US.po new file mode 100644 index 00000000000..65db82b92be --- /dev/null +++ b/addons/analytic/i18n/en_US.po @@ -0,0 +1,251 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * analytic +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.0dev\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2010-06-18 11:01:12+0000\n" +"PO-Revision-Date: 2010-06-18 11:01:12+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,amount_currency:0 +msgid "The amount expressed in the related account currency if not equal to the company one." +msgstr "" + +#. module: analytic +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "" + +#. module: analytic +#: help:account.analytic.line,currency_id:0 +msgid "The related account currency if not equal to the company one." +msgstr "" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "Module for defining analytic accounting object.\n" +" " +msgstr "" + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "" + +#. module: analytic +#: help:account.analytic.account,state:0 +msgid "* When an account is created its in 'Draft' state. \n" +"* If any associated partner is there, it can be in 'Open' state. \n" +"* If any pending balance is there it can be in 'Pending'. \n" +"* And finally when all the transactions are over, it can be in 'Close' state. \n" +"* The project can be in either if the states 'Template' and 'Running'.\n" +" If it is template then we can make projects based on the template projects. If its in 'Running' state it is a normal project. \n" +" If it is to be reviewed then the state is 'Pending'.\n" +" When the project is completed the state is set to 'Done'." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "Calculated by multiplying the quantity and the price given in the Product's cost price." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +#: field:account.analytic.line,currency_id:0 +msgid "Account currency" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "" + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,company_currency_id:0 +msgid "Currency" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,amount_currency:0 +msgid "Amount currency" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Associated Partner" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "" +