diff --git a/addons/account/account.py b/addons/account/account.py index 12868487c49..21931dd5361 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1056,7 +1056,13 @@ class account_move(osv.osv): if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id): raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""" % (line.account_id.code, line.account_id.name))) - if abs(amount) < 0.0001: + # Check that the move balances, the tolerance for debit/credit must + # be smaller than the smallest value according to price accuracy + # (hence the +1 below) + # Example: + # difference == 0.01 is OK iff price_accuracy <= 1! + # difference == 0.0001 is OK iff price_accuracy <= 3! + if abs(amount) < 10 ** -(int(config['price_accuracy'])1): if not len(line_draft_ids): continue self.pool.get('account.move.line').write(cr, uid, line_draft_ids, { diff --git a/addons/account_anglo_saxon/i18n/et.po b/addons/account_anglo_saxon/i18n/et.po new file mode 100644 index 00000000000..9c23ce3caf4 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/et.po @@ -0,0 +1,64 @@ +# Estonian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-04-23 09:43+0000\n" +"Last-Translator: lyyser \n" +"Language-Team: Estonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-04-24 03:53+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "Laoarvestuse" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Vigane XML vaate arhitektuurile!" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index f4129998bcc..df2d43d3a53 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -310,6 +310,7 @@ class base_action_rule_line(osv.osv): ('create','Creation Date'), ('action_last','Last Action Date'), ('date','Date'), + ('deadline', 'Deadline'), ], 'Trigger Date', size=16), 'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date,\ specifies you can put a negative number " \ diff --git a/addons/base_module_quality/i18n/et.po b/addons/base_module_quality/i18n/et.po index bdaff69d207..d770836ddcd 100644 --- a/addons/base_module_quality/i18n/et.po +++ b/addons/base_module_quality/i18n/et.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 16:43+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-04-23 09:48+0000\n" +"Last-Translator: lyyser \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n" +"X-Launchpad-Export-Date: 2010-04-24 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality @@ -42,22 +42,22 @@ msgstr "" #. module: base_module_quality #: view:module.quality.detail:0 msgid "Detail" -msgstr "" +msgstr "Detail" #. module: base_module_quality #: field:module.quality.detail,note:0 msgid "Note" -msgstr "" +msgstr "Märkus" #. module: base_module_quality #: field:module.quality.detail,state:0 msgid "State" -msgstr "" +msgstr "Olek" #. module: base_module_quality #: field:module.quality.detail,detail:0 msgid "Details" -msgstr "" +msgstr "Detailid" #. module: base_module_quality #: field:module.quality.detail,ponderation:0 @@ -75,12 +75,12 @@ msgstr "" #: view:module.quality.check:0 #: field:module.quality.check,check_detail_ids:0 msgid "Tests" -msgstr "" +msgstr "Testid" #. module: base_module_quality #: selection:module.quality.detail,state:0 msgid "Skipped" -msgstr "" +msgstr "Vahele jäetud" #. module: base_module_quality #: help:module.quality.detail,state:0 @@ -102,17 +102,17 @@ msgstr "" #. module: base_module_quality #: field:module.quality.detail,name:0 msgid "Name" -msgstr "" +msgstr "Nimi" #. module: base_module_quality #: wizard_field:quality_detail_save,init,module_file:0 msgid "Save report" -msgstr "" +msgstr "Salvesta aruanne" #. module: base_module_quality #: wizard_field:quality_detail_save,init,name:0 msgid "File name" -msgstr "" +msgstr "Failinimi" #. module: base_module_quality #: field:module.quality.detail,score:0 @@ -122,13 +122,13 @@ msgstr "" #. module: base_module_quality #: help:quality_detail_save,init,name:0 msgid "Save report as .html format" -msgstr "" +msgstr "Salvesta aruanne .html vormingus" #. module: base_module_quality #: view:module.quality.detail:0 #: field:module.quality.detail,summary:0 msgid "Summary" -msgstr "" +msgstr "Kokkuvõte" #. module: base_module_quality #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save @@ -143,7 +143,7 @@ msgstr "" #. module: base_module_quality #: view:module.quality.detail:0 msgid "Save Report" -msgstr "" +msgstr "Aruande salvestamine" #. module: base_module_quality #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id @@ -158,25 +158,25 @@ msgstr "" #. module: base_module_quality #: selection:module.quality.detail,state:0 msgid "Done" -msgstr "" +msgstr "Valmis" #. module: base_module_quality #: view:module.quality.check:0 #: view:module.quality.detail:0 msgid "Result" -msgstr "" +msgstr "Tulemus" #. module: base_module_quality #: wizard_button:quality_detail_save,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Katkesta" #. module: base_module_quality #: field:module.quality.detail,message:0 msgid "Message" -msgstr "" +msgstr "Sõnum" #. module: base_module_quality #: field:module.quality.detail,quality_check_id:0 msgid "Quality" -msgstr "" +msgstr "Kvaliteet" diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po index 7eeef699005..f61c7019e69 100644 --- a/addons/base_report_creator/i18n/ru.po +++ b/addons/base_report_creator/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-11 18:58+0000\n" -"Last-Translator: Auduf <5097@mail.ru>\n" +"PO-Revision-Date: 2010-04-23 16:38+0000\n" +"Last-Translator: Nikita Shehov \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-04-24 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator @@ -23,6 +23,8 @@ msgid "" "records.\n" " e.g. res_partner.id=3" msgstr "" +"Введите параметр для поиска нужных записей.\n" +"Например: res_partner.id=3" #. module: base_report_creator #: field:base_report_creator.report,view_graph_type:0 @@ -408,6 +410,11 @@ msgid "" "After installing the module, it adds a menu to define custom report in\n" "the \"Dashboard\" menu.\n" msgstr "" +"С помощью этих модулей вы сможете создать статистический отчет\n" +"выбранных объектов. Это создатель и браузер SQL-запросов для пользователей.\n" +"\n" +"После установки модуля, в главном меню появится ссылка для выбора отчета по " +"умолчанию.\n" #. module: base_report_creator #: selection:base_report_creator.report.fields,calendar_mode:0 diff --git a/addons/crm/crm.py b/addons/crm/crm.py index adfbf0ca772..30e1db744cc 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -620,7 +620,9 @@ class crm_case(osv.osv): cases = self.browse(cr, uid, ids) cases[0].state # to fill the browse record cache self.__history(cr, uid, cases, _('Close')) - self.write(cr, uid, ids, {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}) + self.write(cr, uid, ids, {'state': 'done', + 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), + 'probability' : 100.0}) # # We use the cache of cases to keep the old case state # @@ -681,7 +683,9 @@ class crm_case(osv.osv): cases = self.browse(cr, uid, ids) cases[0].state # to fill the browse record cache self.__history(cr, uid, cases, _('Cancel')) - self.write(cr, uid, ids, {'state': 'cancel', 'active': True}) + self.write(cr, uid, ids, {'state': 'cancel', + 'active': True, + 'probability' : 0.0}) self._action(cr, uid, cases, 'cancel') return True @@ -764,7 +768,7 @@ class crm_case_history(osv.osv): _columns = { 'description': fields.text('Description'), 'note': fields.function(_note_get, method=True, string="Description", type="text"), - 'email_to': fields.char('Email TO', size=84), + 'email_to': fields.char('Email To', size=84), 'email_from' : fields.char('Email From', size=84), 'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'), 'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True), diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py index 7ffc6c26ec5..fdb3c397f7b 100644 --- a/addons/crm/crm_mailgate.py +++ b/addons/crm/crm_mailgate.py @@ -144,7 +144,7 @@ class crm_cases(osv.osv): select = ids for case in self.browse(cr, uid, select): user_email = (case.user_id and case.user_id.address_id and case.user_id.address_id.email) or False - res += [(user_email, case.email_from, case.email_cc, getattr(case,'priority') and case.priority or False)] + res += [(user_email, case.email_from, case.email_cc or False, getattr(case,'priority') and case.priority or False)] if isinstance(ids, (str, int, long)): return len(res) and res[0] or False return res diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py index 3e1fc24a803..e147d4ed20d 100644 --- a/addons/crm/crm_opportunity.py +++ b/addons/crm/crm_opportunity.py @@ -27,7 +27,7 @@ import time import mx.DateTime AVAILABLE_STATES = [ - ('draft','New'), + ('draft','Draft'), ('open','Open'), ('cancel', 'Lost'), ('done', 'Converted'), @@ -190,6 +190,7 @@ class crm_opportunity(osv.osv): _defaults = { 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.opportunity', context=c), 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], + 'state' : 'draft', } def action_makeMeeting(self, cr, uid, ids, context=None): diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py index bb0adb0444a..de8fac00fce 100755 --- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py +++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py @@ -183,6 +183,7 @@ class email_parser(object): 'email_cc': msg_cc, 'user_id': False, 'description': message['body'], + 'state' : 'draft', } data.update(self.partner_get(msg_from)) diff --git a/addons/crm/wizard/crm_email_add_cc_view.xml b/addons/crm/wizard/crm_email_add_cc_view.xml index 45ae389ba72..7c6ea96df23 100644 --- a/addons/crm/wizard/crm_email_add_cc_view.xml +++ b/addons/crm/wizard/crm_email_add_cc_view.xml @@ -1,43 +1,39 @@ - + - + - + Add CC crm.email.add.cc form -
- - - - - - - - - - - - - - - -