diff --git a/addons/account/account.py b/addons/account/account.py index 87eb6dfd2a8..3e91214ee75 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -584,6 +584,9 @@ class account_journal_column(osv.osv): result = [] cols = self.pool.get('account.move.line')._columns for col in cols: + if col in ('period_id', 'journal_id'): + continue + result.append( (col, cols[col].string) ) result.sort() return result @@ -657,11 +660,9 @@ class account_journal(osv.osv): # }) return journal_id - def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): + def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=100): if not args: args = [] - if context is None: - context = {} ids = [] if name: ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit, context=context) @@ -832,7 +833,7 @@ class account_period(osv.osv): cr.execute('update account_period set state=%s where id=%s', (mode, id)) return True - def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): + def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=80): if args is None: args = [] if context is None: @@ -844,7 +845,7 @@ class account_period(osv.osv): ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit) return self.name_get(cr, user, ids, context=context) - def write(self, cr, uid, ids, vals, context=None): + def write(self, cr, uid, ids, vals, context={}): obj=[] if 'company_id' in vals: move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)]) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 51c26706446..74e895d9a04 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -3,9 +3,9 @@ - - - + + + @@ -13,7 +13,7 @@ - + @@ -36,7 +36,7 @@ - diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index b8719f26242..cf8318f1ef2 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -529,6 +529,7 @@ class account_move_line(osv.osv): return result def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False): + print 'XXXXXXXXXXXXXXXXXXXXXXXXXXX : ', move_id, partner_id, account_id, debit, credit, date, journal val = {} val['date_maturity'] = False @@ -788,57 +789,81 @@ class account_move_line(osv.osv): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False): result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu) - if view_type=='tree' and 'journal_id' in context: - title = self.view_header_get(cr, uid, view_id, view_type, context) - journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id']) - - # if the journal view has a state field, color lines depending on - # its value - state = '' + if view_type != 'tree': + return result + + fld = [] + fields = {} + flds = [] + title = self.view_header_get(cr, uid, view_id, view_type, context) + xml = '''\n\n\t''' % (title) + journal_pool = self.pool.get('account.journal') + + ids = journal_pool.search(cr, uid, []) + journals = journal_pool.browse(cr, uid, ids) + all_journal = [] + for journal in journals: + all_journal.append(journal.id) for field in journal.view_id.columns_id: - if field.field=='state': - state = ' colors="red:state==\'draft\'"' - - #xml = '''\n\n\t''' % (title, state) - xml = '''\n\n\t''' % (title, state) - fields = [] - - widths = { - 'ref': 50, - 'statement_id': 50, - 'state': 60, - 'tax_code_id': 50, - 'move_id': 40, - } - for field in journal.view_id.columns_id: - fields.append(field.field) - attrs = [] - if field.field=='debit': - attrs.append('sum="Total debit"') - elif field.field=='credit': - attrs.append('sum="Total credit"') - elif field.field=='account_tax_id': - attrs.append('domain="[(\'parent_id\',\'=\',False)]"') - elif field.field=='account_id' and journal.id: - attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'<>\',\'view\'), (\'type\',\'<>\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"') - elif field.field == 'partner_id': - attrs.append('on_change="onchange_partner_id(move_id,partner_id,account_id,debit,credit,date,((\'journal_id\' in context) and context[\'journal_id\']) or {})"') - if field.readonly: - attrs.append('readonly="1"') - if field.required: - attrs.append('required="1"') + if not field.field in fields: + fields[field.field] = [journal.id] + fld.append((field.field, field.sequence)) + flds.append(field.field) else: - attrs.append('required="0"') - if field.field in ('amount_currency','currency_id'): - attrs.append('on_change="onchange_currency(account_id,amount_currency,currency_id,date,((\'journal_id\' in context) and context[\'journal_id\']) or {})"') + fields.get(field.field).append(journal.id) + + fld.append(('period_id', 3)) + fld.append(('journal_id', 10)) + flds.append('period_id') + flds.append('journal_id') + fields['period_id'] = all_journal + fields['journal_id'] = all_journal + + from operator import itemgetter + fld = sorted(fld, key=itemgetter(1)) - if field.field in widths: - attrs.append('width="'+str(widths[field.field])+'"') - xml += '''\n''' % (field.field,' '.join(attrs)) + widths = { + 'ref': 50, + 'statement_id': 50, + 'state': 60, + 'tax_code_id': 50, + 'move_id': 40, + } - xml += '''''' - result['arch'] = xml - result['fields'] = self.fields_get(cr, uid, fields, context) + for field_it in fld: + field = field_it[0] + if field=='state': + state = 'colors="red:state==\'draft\'"' + + attrs = [] + if field == 'debit': + attrs.append('sum="Total debit"') + elif field == 'credit': + attrs.append('sum="Total credit"') + elif field == 'account_tax_id': + attrs.append('domain="[(\'parent_id\',\'=\',False)]"') + elif field == 'account_id' and journal.id: + attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'<>\',\'view\'), (\'type\',\'<>\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"') + elif field == 'partner_id': + attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"') +# if field.readonly: +# attrs.append('readonly="1"') +# if field.required: +# attrs.append('required="1"') +# else: +# attrs.append('required="0"') + if field in ('amount_currency','currency_id'): + attrs.append('on_change="onchange_currency(account_id, amount_currency,currency_id, date, journal_id)"') + + if field in widths: + attrs.append('width="'+str(widths[field])+'"') + + attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field))) + xml += '''\n''' % (field,' '.join(attrs)) + + xml += '''''' + result['arch'] = xml + result['fields'] = self.fields_get(cr, uid, flds, context) return result def _check_moves(self, cr, uid, context): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 9e1cb3bb7e2..5e0907a57de 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -797,9 +797,23 @@ - + + + + Journal Entries + account.move + form + tree,form + + + + + @@ -817,7 +831,7 @@ - + @@ -947,16 +961,14 @@ - + - - - - - + + + @@ -1146,24 +1158,24 @@ - Receivable Entries - account.move + Journal Items + account.move.line form tree,form - - + + [('journal_id.type', 'in', ['sale', 'sale_refund'])] - Payable Entries - account.move + Transaction Journal + account.move.line form tree,form - - + + [('journal_id.type', 'in', ['purchase', 'purchase_refund'])] diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 8907089d26b..3ddd263d146 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-06-09 16:41+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2010-06-22 22:56+0000\n" +"Last-Translator: sagas \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-06-22 04:07+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -277,8 +277,8 @@ msgid "" "date empty, it means direct payment. The payment term may compute several " "due dates, for example 50% now, 50% in one month." msgstr "" -"如果你使用付款条件，这到期日期将在生产会计分录时自动计算。如果付款条件和到期日\r\n" -"期为空，则意味着直接付款。这种付款条件可能计算出几个到期日，例如现在先付50%然\r\n" +"如果你使用付款条件，到期日期将在生成会计分录时自动计算。如果付款条件和到期日\r\n" +"期为空，则意味着直接付款。使用付款条件可能计算出几个到期日，例如现在先付50%，然\r\n" "后在一个月内支付余下的50%。" #. module: account @@ -302,7 +302,7 @@ msgstr "逾期付款" #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 #: wizard_view:account.vat.declaration,init:0 msgid "Select period" -msgstr "选择期间段" +msgstr "选择会计期间" #. module: account #: field:account.invoice,origin:0 @@ -488,7 +488,7 @@ msgstr "税用在" msgid "" "Set if the amount of tax must be included in the base amount before " "computing the next taxes." -msgstr "在下一个税额计算前，如果本税额必须包含在下一税基里，请设置" +msgstr "在下一个税额计算前，如果本税额必须包含在税基里，请设置" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po index 700107ad6d8..2dd5a1c5d9b 100644 --- a/addons/account_analytic_analysis/i18n/el.po +++ b/addons/account_analytic_analysis/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po index 4766a18470c..a97625cd306 100644 --- a/addons/account_analytic_default/i18n/ar.po +++ b/addons/account_analytic_default/i18n/ar.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-06 17:39+0000\n" -"Last-Translator: omar \n" +"PO-Revision-Date: 2010-06-22 12:31+0000\n" +"Last-Translator: Majd Aldin Almontaser \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-06-22 04:12+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default @@ -21,58 +21,58 @@ msgstr "" #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form msgid "Analytic Defaults" -msgstr "" +msgstr "تحليل الإفتراضيات" #. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information msgid "Account Analytic Default" -msgstr "" +msgstr "حساب التحليل الإفتراضي" #. module: account_analytic_default #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "هناك خطأ في XML لم يتم العرض" #. module: account_analytic_default #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "" +msgstr "اسم الكائن يجب أن يبدأ ب _x ولا يحتوي على رموز خاصة" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Seq" -msgstr "" +msgstr "مايلي" #. module: account_analytic_default #: field:account.analytic.default,date_stop:0 msgid "End Date" -msgstr "" +msgstr "تاريخ الإنتهاء" #. module: account_analytic_default #: field:account.analytic.default,company_id:0 msgid "Company" -msgstr "" +msgstr "الشركة" #. module: account_analytic_default #: field:account.analytic.default,sequence:0 msgid "Sequence" -msgstr "" +msgstr "تسلسل" #. module: account_analytic_default #: field:account.analytic.default,product_id:0 msgid "Product" -msgstr "" +msgstr "المنتج" #. module: account_analytic_default #: field:account.analytic.default,analytic_id:0 msgid "Analytic Account" -msgstr "" +msgstr "تحليل الحساب" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_account_analytic_default msgid "Analytic Distributions" -msgstr "" +msgstr "تحليل التوزيعات" #. module: account_analytic_default #: field:account.analytic.default,user_id:0 @@ -82,31 +82,31 @@ msgstr "المستخدم" #. module: account_analytic_default #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "إسم الموديل غير صالح." #. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open msgid "Entries" -msgstr "" +msgstr "المدخلات" #. module: account_analytic_default #: field:account.analytic.default,partner_id:0 msgid "Partner" -msgstr "" +msgstr "المشارك" #. module: account_analytic_default #: field:account.analytic.default,date_start:0 msgid "Start Date" -msgstr "" +msgstr "تاريخ البدء" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Conditions" -msgstr "" +msgstr "الشروط" #. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user msgid "Analytic Rules" -msgstr "" +msgstr "تحليل القواعد" diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po index a3122ef62d8..fd90ad6c3f6 100644 --- a/addons/account_analytic_plans/i18n/el.po +++ b/addons/account_analytic_plans/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans diff --git a/addons/account_anglo_saxon/i18n/ar.po b/addons/account_anglo_saxon/i18n/ar.po new file mode 100644 index 00000000000..9e7fcb21bd0 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/ar.po @@ -0,0 +1,64 @@ +# Arabic 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-06-22 12:37+0000\n" +"Last-Translator: Majd Aldin Almontaser \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-06-23 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 "حساب الأسهم" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "هناك خطأ في XML للعرض!" + +#. 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/account_anglo_saxon/i18n/el.po b/addons/account_anglo_saxon/i18n/el.po index 6ef35426797..c66f47cceb6 100644 --- a/addons/account_anglo_saxon/i18n/el.po +++ b/addons/account_anglo_saxon/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:20+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_anglo_saxon diff --git a/addons/account_anglo_saxon/i18n/ru.po b/addons/account_anglo_saxon/i18n/ru.po new file mode 100644 index 00000000000..711d3f7b24d --- /dev/null +++ b/addons/account_anglo_saxon/i18n/ru.po @@ -0,0 +1,64 @@ +# Russian 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-06-22 13:59+0000\n" +"Last-Translator: Чистый \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-06-23 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 "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра структуры!" + +#. 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/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po index 7870cc8ddd3..45428213054 100644 --- a/addons/account_budget/i18n/el.po +++ b/addons/account_budget/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_chart/i18n/es.po b/addons/account_chart/i18n/es.po index 29a93f25249..92597355be4 100644 --- a/addons/account_chart/i18n/es.po +++ b/addons/account_chart/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-24 17:34+0000\n" -"Last-Translator: Alejandro Beltrán \n" +"PO-Revision-Date: 2010-06-22 16:52+0000\n" +"Last-Translator: Roberto Lizana \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-06-22 04:19+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart diff --git a/addons/account_coda/i18n/el.po b/addons/account_coda/i18n/el.po index 36e7b31482f..b94e9fb0846 100644 --- a/addons/account_coda/i18n/el.po +++ b/addons/account_coda/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:20+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po index 3df054e2da8..b34f9d8530f 100644 --- a/addons/account_followup/i18n/el.po +++ b/addons/account_followup/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po index 74d81ad44b0..113c651fa15 100644 --- a/addons/account_voucher/i18n/el.po +++ b/addons/account_voucher/i18n/el.po @@ -8,24 +8,24 @@ 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-09-08 14:40+0000\n" -"Last-Translator: Makis Nicolaou \n" +"PO-Revision-Date: 2010-06-22 04:54+0000\n" +"Last-Translator: Panayiotis Konstantinidis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1 msgid "Opening Balance Entry" -msgstr "" +msgstr "Άνοιγμα Λογαριασμού Υπολοίπου" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list msgid "Bank Receipts" -msgstr "Αποδείξης Τράπεζας" +msgstr "Αποδείξεις Τράπεζας" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -42,7 +42,7 @@ msgstr "Κατάσταση :" #. module: account_voucher #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -70,22 +70,22 @@ msgstr "Εταιρία" #: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form msgid "Journal Voucher" -msgstr "" +msgstr "Δελτίο Ημερολογίου" #. module: account_voucher #: rml:voucher.cash_receipt.drcr:0 msgid "," -msgstr "" +msgstr "," #. module: account_voucher #: view:account.voucher:0 msgid "Set to Draft" -msgstr "Ρύθμιση σε Πρόχειρο" +msgstr "Ορισμός σε Πρόχειρη" #. module: account_voucher #: wizard_button:account.voucher.open,init,open:0 msgid "Open Voucher Entries" -msgstr "" +msgstr "Άνοιγμα Εγγραφών Παραστατικού" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_voucher_line @@ -95,7 +95,7 @@ msgstr "Γραμμή Παραστατικού" #. module: account_voucher #: view:account.move:0 msgid "Total Credit" -msgstr "" +msgstr "Σύνολο Πίστωσης" #. module: account_voucher #: field:account.voucher,account_id:0 @@ -106,22 +106,22 @@ msgstr "Λογαριασμός" #. module: account_voucher #: rml:voucher.cash_amount:0 msgid "D" -msgstr "" +msgstr "Δ" #. module: account_voucher #: field:account.account,level:0 msgid "Level" -msgstr "" +msgstr "Επίπεδο" #. module: account_voucher #: view:account.move:0 msgid "Account Entry Line" -msgstr "" +msgstr "Γραμμή Εγγραφής Λογαριασμού" #. module: account_voucher #: view:account.move:0 msgid "Total Debit" -msgstr "" +msgstr "Χρεωστικό Σύνολο" #. module: account_voucher #: field:account.voucher,amount:0 @@ -171,7 +171,7 @@ msgstr "Απόδειξη Παραστατικών" #. module: account_voucher #: rml:voucher.cash_amount:0 msgid "Account :" -msgstr "" +msgstr "Λογαριασμός :" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -252,7 +252,7 @@ msgstr "Παραστατικό" #: wizard_view:account.voucher.open,init:0 #: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open msgid "Open Vouchers" -msgstr "" +msgstr "Άνοιγμα Παραστατικών" #. module: account_voucher #: constraint:ir.ui.view:0 @@ -347,12 +347,12 @@ msgstr "Νέα Πληρωμή Μετρητών" #. module: account_voucher #: view:account.move:0 msgid "Optional Information" -msgstr "" +msgstr "Προαιρετική πληροφορία" #. module: account_voucher #: view:account.voucher:0 msgid "General Entries" -msgstr "" +msgstr "Γενικές Εγγραφές" #. module: account_voucher #: field:account.voucher,date:0 @@ -374,13 +374,13 @@ msgstr "Χ/Π" #. module: account_voucher #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher msgid "Voucher Report (Cr/Dr)" -msgstr "" +msgstr "Αναφορά Παραστατικών (Cr/Dr)" #. module: account_voucher #: field:account.move,voucher_type:0 #: wizard_field:account.voucher.open,init,type:0 msgid "Voucher Type" -msgstr "" +msgstr "Τύπος Παραστατικού" #. module: account_voucher #: selection:account.account,type1:0 @@ -419,12 +419,12 @@ msgstr "Πληρωμές Τράπεζας" #. module: account_voucher #: view:account.move:0 msgid "General Information" -msgstr "" +msgstr "Γενικές Πληροφορίες" #. module: account_voucher #: wizard_field:account.voucher.open,init,period_ids:0 msgid "Periods" -msgstr "" +msgstr "Περίοδοι" #. module: account_voucher #: view:account.voucher:0 @@ -457,12 +457,12 @@ msgstr "Άλλες Πληροφορίες" #. module: account_voucher #: model:ir.module.module,shortdesc:account_voucher.module_meta_information msgid "Accounting Voucher Entries" -msgstr "" +msgstr "Λογιστικές Εγγραφές Παραστατικών" #. module: account_voucher #: field:res.currency,sub_name:0 msgid "Sub Currency" -msgstr "" +msgstr "Υποδιαίρεση νομίσματος" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list @@ -542,7 +542,7 @@ msgstr "Αληθή Εγγραφή" #. module: account_voucher #: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open msgid "Open a Voucher Entry" -msgstr "" +msgstr "Άνοιγμα μίας Εγγραφής Παραστατικού" #. module: account_voucher #: field:account.voucher,move_id:0 @@ -552,7 +552,7 @@ msgstr "Εγγραφή Λογαριασμού" #. module: account_voucher #: view:account.voucher:0 msgid "Entry Lines" -msgstr "" +msgstr "Γραμμές Εγγραφής" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 9d506b1de0d..551f419d91c 100644 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -122,7 +122,7 @@ [('journal_id.type','=','sale')] + action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/> @@ -134,7 +134,7 @@ [('journal_id.type','=','purchase')] + action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/> diff --git a/addons/account_voucher_payment/i18n/el.po b/addons/account_voucher_payment/i18n/el.po new file mode 100644 index 00000000000..42012f968db --- /dev/null +++ b/addons/account_voucher_payment/i18n/el.po @@ -0,0 +1,93 @@ +# Greek 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-05-13 20:11+0000\n" +"PO-Revision-Date: 2010-06-22 05:05+0000\n" +"Last-Translator: Panayiotis Konstantinidis \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_voucher_payment +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!" + +#. module: account_voucher_payment +#: wizard_view:account.voucher.unreconcile,init:0 +msgid "Unreconciliation transactions" +msgstr "Ασυμβίβαστες συναλλαγές" + +#. module: account_voucher_payment +#: model:ir.module.module,description:account_voucher_payment.module_name_translation +msgid "" +"This module includes :\n" +" * It reconcile the invoice (supplier, customer) while paying through \n" +" Accounting Vouchers\n" +" " +msgstr "" +"Αυτή η μονάδα περιλαμβάνει :\n" +" * Εναρμονίζει το τιμολόγιο ( προμηθευτή, πελάτη ) καθώς πληρώνει απο τον " +"\n" +" Λογαριασμό Παραστατικών\n" +" " + +#. module: account_voucher_payment +#: wizard_view:account.voucher.unreconcile,init:0 +msgid "" +"If you unreconciliate transactions, you must also verify all the actions " +"that are linked to those transactions because they will not be disable" +msgstr "" +"Αν ακυρώσετε συμφωνημένες συναλλαγές θα πρέπει να ελέγξετε όλες τις " +"ενέργειες που συνδέονται με αυτές διότι δεν θα διαγραφούν." + +#. module: account_voucher_payment +#: view:account.voucher:0 +#: field:account.voucher,voucher_line_ids:0 +msgid "Voucher Lines" +msgstr "Γραμμές Παραστατικού" + +#. module: account_voucher_payment +#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation +msgid "Invoice Payment/Receipt by Vouchers." +msgstr "Πληρωμή Τιμολογίου/ Απόδειξη απο Παραστατικό" + +#. module: account_voucher_payment +#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher +msgid "Unreconcile entries" +msgstr "Ασυμβίβαστες εγγραφές" + +#. module: account_voucher_payment +#: field:account.move.line,voucher_invoice:0 +#: field:account.voucher.line,invoice_id:0 +msgid "Invoice" +msgstr "Τιμολόγιο" + +#. module: account_voucher_payment +#: wizard_button:account.voucher.unreconcile,init,end:0 +msgid "Cancel" +msgstr "Ακύρωση" + +#. module: account_voucher_payment +#: field:account.voucher,partner_id:0 +msgid "Partner" +msgstr "Συνεργάτης" + +#. module: account_voucher_payment +#: wizard_button:account.voucher.unreconcile,init,unrec:0 +msgid "Unreconcile" +msgstr "Ακυρώνω" + +#. module: account_voucher_payment +#: wizard_view:account.voucher.unreconcile,init:0 +msgid "Unreconciliation" +msgstr "Ακύρωση" diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po index 416950965fd..448da21d660 100644 --- a/addons/analytic_user_function/i18n/el.po +++ b/addons/analytic_user_function/i18n/el.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-09-08 12:21+0000\n" -"Last-Translator: Makis Nicolaou \n" +"PO-Revision-Date: 2010-06-22 05:06+0000\n" +"Last-Translator: Panayiotis Konstantinidis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function @@ -36,7 +36,7 @@ msgstr "Προϊόν" #. module: analytic_user_function #: field:analytic_user_funct_grid,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Αναλυτική Λογαριασμού" #. module: analytic_user_function #: view:account.analytic.account:0 @@ -60,7 +60,7 @@ msgstr "" #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information msgid "Analytic User Function" -msgstr "" +msgstr "Αναλυτική Λειτουργία Χρήστη" #. module: analytic_user_function #: view:analytic_user_funct_grid:0 diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po index b07bbb5fdbd..25c33659d94 100644 --- a/addons/base_contact/i18n/el.po +++ b/addons/base_contact/i18n/el.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-06-15 07:18+0000\n" -"Last-Translator: Panagiotis Kranidiotis \n" +"PO-Revision-Date: 2010-06-22 05:09+0000\n" +"Last-Translator: Panayiotis Konstantinidis \n" "Language-Team: nls@hellug.gr \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:01+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" @@ -74,7 +74,7 @@ msgstr "Θέση Επαφής στο Συνεργάτη" #. module: base_contact #: field:res.partner.job,other:0 msgid "Other" -msgstr "" +msgstr "Άλλο" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_contacttofunction0 @@ -84,7 +84,7 @@ msgstr "Επαφή θέσης" #. module: base_contact #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_partnertoaddress0 @@ -99,7 +99,7 @@ msgstr "# Επαφών" #. module: base_contact #: help:res.partner.job,other:0 msgid "Additional phone field" -msgstr "" +msgstr "Επιπρόσθετο πεδίο τηλεφώνου" #. module: base_contact #: model:process.node,name:base_contact.process_node_function0 @@ -109,7 +109,7 @@ msgstr "Λειτουργία" #. module: base_contact #: field:res.partner.job,fax:0 msgid "Fax" -msgstr "" +msgstr "Φαξ" #. module: base_contact #: field:res.partner.contact,lang_id:0 @@ -197,7 +197,7 @@ msgstr "Κατηγορίες" #. module: base_contact #: field:res.partner.contact,function_id:0 msgid "Main Function" -msgstr "" +msgstr "Κύρια Λειτουργία" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_partnertoaddress0 @@ -222,7 +222,7 @@ msgstr "Ιεράρχ." #. module: base_contact #: field:res.partner.job,extension:0 msgid "Extension" -msgstr "" +msgstr "Επέκταση" #. module: base_contact #: field:res.partner.contact,mobile:0 @@ -232,7 +232,7 @@ msgstr "Κινητό" #. module: base_contact #: help:res.partner.job,extension:0 msgid "Internal/External extension phone number" -msgstr "" +msgstr "Εσωτερικό/Εξωτερικό νούμερο τηλεφώνου" #. module: base_contact #: model:process.node,note:base_contact.process_node_contacts0 diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po index 6c3b3d205a0..00c8a0bd146 100644 --- a/addons/crm/i18n/es.po +++ b/addons/crm/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-05-31 22:24+0000\n" -"Last-Translator: victor tejada yau \n" +"PO-Revision-Date: 2010-06-22 17:47+0000\n" +"Last-Translator: Roberto Lizana \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-06-22 04:00+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -1597,7 +1597,7 @@ msgstr "Fecha" #. module: crm #: view:crm.job:0 msgid "Candidate Name" -msgstr "" +msgstr "Nombre candidato" #. module: crm #: model:crm.case.categ,name:crm.categ_lead2 @@ -1743,7 +1743,7 @@ msgstr "Descripción general" #. module: crm #: view:crm.meeting:0 msgid "Other Info" -msgstr "" +msgstr "Otra información" #. module: crm #: view:crm.claim:0 @@ -1870,7 +1870,7 @@ msgstr "Permite eliminar los casos en estado no borrador." #. module: crm #: model:crm.case.stage,name:crm.stage_oppor7 msgid "Closed Lost" -msgstr "" +msgstr "Cerrado perdido" #. module: crm #: field:crm.menu.config_wizard,bugs:0 @@ -1899,12 +1899,12 @@ msgstr "Alto" #. module: crm #: model:process.node,note:crm.process_node_partner0 msgid "Convert to prospect to business partner" -msgstr "" +msgstr "Convertir prospección a empresa" #. module: crm #: view:crm.claim:0 msgid "In Progress Claims" -msgstr "" +msgstr "Reclamaciones en progreso" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule @@ -1914,7 +1914,7 @@ msgstr "Establecer RRULE" #. module: crm #: model:crm.case.stage,name:crm.stage_oppor4 msgid "Proposal/Price Quote" -msgstr "" +msgstr "Propuesta/Precio cuota" #. module: crm #: view:crm.case.rule:0 @@ -1976,12 +1976,12 @@ msgstr "Árbol de iniciativas" #. module: crm #: field:crm.meeting,caldav_url:0 msgid "Caldav URL" -msgstr "" +msgstr "URL de caldav" #. module: crm #: view:crm.meeting:0 msgid "Attendee" -msgstr "" +msgstr "Asistente" #. module: crm #: code:addons/crm/crm.py:0 @@ -2051,6 +2051,8 @@ msgstr "Días" #: help:crm.menu.config_wizard,bugs:0 msgid "Used by companies to track bugs and support requests on software" msgstr "" +"Utilizado por las empresas para realizar seguimiento de errores y " +"solicitudes de soporte de Software" #. module: crm #: field:crm.menu.config_wizard,document_ics:0 @@ -2091,7 +2093,7 @@ msgstr "Prioridad máxima" #. module: crm #: selection:crm.meeting,transparent:0 msgid "OPAQUE" -msgstr "" +msgstr "opaco" #. module: crm #: view:crm.claim:0 @@ -2101,7 +2103,7 @@ msgstr "Info reclamaciones" #. module: crm #: field:crm.case.category2,name:0 msgid "Case Category2 Name" -msgstr "" +msgstr "Nombre categoría2 de casos" #. module: crm #: wizard_view:crm.lead.opportunity_set,opportunity:0 @@ -2115,7 +2117,7 @@ msgstr "Convertir en oportunidad" #: model:crm.case.stage,name:crm.stage_phone2 #: view:crm.phonecall:0 msgid "Held" -msgstr "" +msgstr "Ocupado" #. module: crm #: view:crm.case:0 @@ -2166,17 +2168,17 @@ msgstr "Prioridad" #. module: crm #: view:crm.opportunity:0 msgid "Source" -msgstr "" +msgstr "Origen" #. module: crm #: field:crm.meeting,location:0 msgid "Location" -msgstr "" +msgstr "Ubicación" #. module: crm #: view:crm.fundraising:0 msgid "Payment Mode" -msgstr "" +msgstr "Forma de pago" #. module: crm #: help:crm.case.rule,trg_date_range:0 diff --git a/addons/crm_vertical/i18n/ar.po b/addons/crm_vertical/i18n/ar.po index 8e027b407f3..10979f29058 100644 --- a/addons/crm_vertical/i18n/ar.po +++ b/addons/crm_vertical/i18n/ar.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-18 12:52+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-06-22 12:13+0000\n" +"Last-Translator: Majd Aldin Almontaser \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-06-22 04:19+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_vertical diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po index 7f05e84d881..59a51cb9666 100644 --- a/addons/document/i18n/ru.po +++ b/addons/document/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-04-13 05:32+0000\n" -"Last-Translator: grisha \n" +"PO-Revision-Date: 2010-06-22 14:24+0000\n" +"Last-Translator: Чистый \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-06-22 04:18+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document @@ -36,8 +36,6 @@ msgstr "" msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" -"Название объекта должно начинаться с x_ и не должно содержать специальных " -"символов !" #. module: document #: field:ir.actions.report.xml,model_id:0 @@ -47,17 +45,17 @@ msgstr "" #. module: document #: constraint:document.directory:0 msgid "Error! You can not create recursive Directories." -msgstr "Ошибка! Вы не можете созадавать вложенные друг в друга директории." +msgstr "Ошибка! Вы не можете созадавать вложенные Директории." #. module: document #: model:ir.ui.menu,name:document.menu_document_configuration msgid "Document Configuration" -msgstr "" +msgstr "Настройки документа" #. module: document #: view:ir.attachment:0 msgid "Preview" -msgstr "Предпросмотр" +msgstr "Предварительный просмотр" #. module: document #: field:ir.attachment,store_method:0 @@ -84,7 +82,7 @@ msgstr "" #. module: document #: selection:document.directory,type:0 msgid "Other Resources" -msgstr "" +msgstr "Другие ресурсы" #. module: document #: field:document.directory,ressource_parent_type_id:0 @@ -104,7 +102,7 @@ msgstr "" #. module: document #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: document #: selection:document.directory,type:0 @@ -132,13 +130,13 @@ msgstr "" #. module: document #: field:document.directory,type:0 msgid "Type" -msgstr "" +msgstr "Тип" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_tree #: model:ir.ui.menu,name:document.menu_document_directories_tree msgid "Directorie's Structure" -msgstr "" +msgstr "Структура папок" #. module: document #: field:document.directory,parent_id:0 @@ -148,13 +146,13 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "File Information" -msgstr "" +msgstr "Информация о файле" #. module: document #: field:document.directory,file_ids:0 #: view:ir.attachment:0 msgid "Files" -msgstr "" +msgstr "Файлы" #. module: document #: field:ir.attachment,store_fname:0 @@ -165,17 +163,17 @@ msgstr "" #: field:document.directory,write_uid:0 #: field:ir.attachment,write_uid:0 msgid "Last Modification User" -msgstr "" +msgstr "Последние изменения пользователя" #. module: document #: view:document.configuration.wizard:0 msgid "Configure" -msgstr "" +msgstr "Настройка" #. module: document #: field:document.directory,ressource_tree:0 msgid "Tree Structure" -msgstr "" +msgstr "Древовидная структура" #. module: document #: field:ir.attachment,title:0 @@ -192,7 +190,7 @@ msgstr "" #. module: document #: model:ir.model,name:document.model_document_directory_content msgid "Directory Content" -msgstr "" +msgstr "Содержимое папки" #. module: document #: help:document.directory,ressource_parent_type_id:0 @@ -204,28 +202,28 @@ msgstr "" #. module: document #: model:ir.ui.menu,name:document.menu_document msgid "Document Management" -msgstr "" +msgstr "Управление документами" #. module: document #: selection:ir.attachment,store_method:0 msgid "Link" -msgstr "" +msgstr "Ссылка" #. module: document #: view:document.directory:0 msgid "Directory Type" -msgstr "" +msgstr "Тип папки" #. module: document #: field:document.directory,group_ids:0 #: field:ir.attachment,group_ids:0 msgid "Groups" -msgstr "" +msgstr "Группы" #. module: document #: field:document.directory.content,report_id:0 msgid "Report" -msgstr "" +msgstr "Отчёт" #. module: document #: help:document.configuration.wizard,host:0 @@ -233,6 +231,7 @@ msgid "" "Put here the server address or IP. Keep localhost if you don't know what to " "write." msgstr "" +"Укажите адрес сервера или IP. Укажите localhost если не знаете что писать." #. module: document #: view:document.configuration.wizard:0 @@ -260,12 +259,12 @@ msgstr "" #. module: document #: view:document.directory:0 msgid "Definition" -msgstr "" +msgstr "Описание" #. module: document #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" +msgstr "Неправильный XML для просмотра структуры!" #. module: document #: model:ir.module.module,description:document.module_meta_information @@ -279,17 +278,17 @@ msgstr "" #. module: document #: field:document.directory,name:0 msgid "Name" -msgstr "" +msgstr "Имя" #. module: document #: field:document.directory.content.type,code:0 msgid "Extension" -msgstr "" +msgstr "Расширение" #. module: document #: selection:ir.attachment,store_method:0 msgid "Database" -msgstr "" +msgstr "База данных" #. module: document #: field:document.directory,content_ids:0 @@ -332,30 +331,30 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "Attached To" -msgstr "" +msgstr "Вложено в" #. module: document #: selection:ir.attachment,store_method:0 msgid "Filesystem" -msgstr "" +msgstr "Файловая система" #. module: document #: field:document.directory,file_type:0 #: field:document.directory.content.type,name:0 #: field:ir.attachment,file_type:0 msgid "Content Type" -msgstr "" +msgstr "Тип данных" #. module: document #: view:document.directory:0 #: view:ir.attachment:0 msgid "Security" -msgstr "" +msgstr "Безопасность" #. module: document #: model:ir.ui.menu,name:document.menu_document_browse msgid "Browse Files Using FTP" -msgstr "" +msgstr "Просмотр файлов используя FTP" #. module: document #: field:document.directory,ressource_type_id:0 @@ -365,7 +364,7 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "History" -msgstr "" +msgstr "История" #. module: document #: help:document.directory,ressource_type_id:0 @@ -377,33 +376,33 @@ msgstr "" #. module: document #: view:ir.attachment:0 msgid "Others Info" -msgstr "" +msgstr "Дополнительная информация" #. module: document #: field:document.directory,domain:0 msgid "Domain" -msgstr "" +msgstr "Домен" #. module: document #: field:document.directory,write_date:0 #: field:ir.attachment,write_date:0 msgid "Date Modified" -msgstr "" +msgstr "Дата изменения" #. module: document #: field:document.directory.content,suffix:0 msgid "Suffix" -msgstr "" +msgstr "Суффикс" #. module: document #: field:document.configuration.wizard,host:0 msgid "Server Address" -msgstr "" +msgstr "Адрес сервера" #. module: document #: model:ir.actions.url,name:document.action_document_browse msgid "Browse Files" -msgstr "" +msgstr "Обзор файлов" #. module: document #: field:document.directory.content,name:0 @@ -419,7 +418,7 @@ msgstr "" #. module: document #: field:document.directory,create_uid:0 msgid "Creator" -msgstr "" +msgstr "Автор" #. module: document #: view:document.directory:0 @@ -429,22 +428,22 @@ msgstr "" #. module: document #: field:document.directory.content,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Сортировать" #. module: document #: model:ir.ui.menu,name:document.menu_document_files msgid "Search a File" -msgstr "" +msgstr "Поиск файла" #. module: document #: view:document.configuration.wizard:0 msgid "Auto Configure" -msgstr "" +msgstr "Авто настройка" #. module: document #: view:document.configuration.wizard:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: document #: field:ir.attachment,partner_id:0 @@ -454,12 +453,12 @@ msgstr "" #. module: document #: view:document.directory:0 msgid "PDF Report" -msgstr "" +msgstr "PDF Отчёт" #. module: document #: field:document.directory.content,extension:0 msgid "Document Type" -msgstr "" +msgstr "Тип документа" #. module: document #: field:document.directory,child_ids:0 @@ -469,4 +468,4 @@ msgstr "" #. module: document #: view:document.directory:0 msgid "Contents" -msgstr "" +msgstr "Содержание" diff --git a/addons/document_ftp/doc_conf_wizard.py b/addons/document_ftp/doc_conf_wizard.py index 1399bc276b5..0f2f970572e 100644 --- a/addons/document_ftp/doc_conf_wizard.py +++ b/addons/document_ftp/doc_conf_wizard.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see # ############################################################################## @@ -23,6 +23,7 @@ import base64 from osv import osv, fields from osv.orm import except_orm +from tools import config import urlparse import os @@ -35,45 +36,12 @@ class document_configuration_wizard(osv.osv_memory): _rec_name = 'host' _columns = { 'host': fields.char('Address', size=64, - help="Server address or IP.", required=True), + help="Server address or IP and port to which users should connect to for DMS access", + required=True), } - def detect_ip_addr(self, cr, uid, context=None): - def _detect_ip_addr(self, cr, uid, context=None): - from array import array - import socket - from struct import pack, unpack - - try: - import fcntl - except ImportError: - fcntl = None - - if not fcntl: # not UNIX: - host = socket.gethostname() - ip_addr = socket.gethostbyname(host) - else: # UNIX: - # get all interfaces: - nbytes = 128 * 32 - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - names = array('B', '\0' * nbytes) - outbytes = unpack('iL', fcntl.ioctl( s.fileno(), 0x8912, pack('iL', nbytes, names.buffer_info()[0])))[0] - namestr = names.tostring() - ifaces = [namestr[i:i+32].split('\0', 1)[0] for i in range(0, outbytes, 32)] - - for ifname in [iface for iface in ifaces if iface != 'lo']: - ip_addr = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, pack('256s', ifname[:15]))[20:24]) - break - return ip_addr - - try: - ip_addr = _detect_ip_addr(self, cr, uid, context) - except: - ip_addr = 'localhost' - return ip_addr - _defaults = { - 'host': detect_ip_addr, + 'host': config.get('ftp_server_host', 'localhost') + ':' + config.get('ftp_server_port', '8021'), } def execute(self, cr, uid, ids, context=None): @@ -145,5 +113,5 @@ class document_configuration_wizard(osv.osv_memory): # Update the action for FTP browse. aid = objid._get_id(cr, uid, 'document_ftp', 'action_document_browse') aid = objid.browse(cr, uid, aid, context=context).res_id - self.pool.get('ir.actions.url').write(cr, uid, [aid], {'url': 'ftp://'+(conf.host or 'localhost')+':8021/'}) + self.pool.get('ir.actions.url').write(cr, uid, [aid], {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/'}) document_configuration_wizard() diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index 481274add93..eef04d3eb93 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -25,13 +25,8 @@ import authorizer import abstracted_fs import netsvc from tools import config -from tools.misc import detect_ip_addr - -if detect_ip_addr: - HOST = config.get('ftp_server_host', detect_ip_addr()) -else: - HOST = config.get('ftp_server_host', '127.0.0.1') +HOST = config.get('ftp_server_host', '127.0.0.1') PORT = int(config.get('ftp_server_port', '8021')) PASSIVE_PORTS = None pps = config.get('ftp_server_passive_ports', '').split(':') diff --git a/addons/idea/idea.py b/addons/idea/idea.py index 171ff85505f..e1a522b6381 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -304,7 +304,7 @@ class idea_vote(osv.osv): _rec_name = 'score' _columns = { - 'user_id': fields.many2one('res.users', 'By user', readonly="True"), + 'user_id': fields.many2one('res.users', 'User', readonly="True"), 'idea_id': fields.many2one('idea.idea', 'Idea', readonly="True", ondelete='cascade'), 'score': fields.selection(VoteValues, 'Vote Status', readonly="True"), 'date': fields.datetime('Date', readonly="True"), diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 0f69931ca43..6b728560277 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -149,8 +149,22 @@ + + + + - + @@ -371,6 +385,7 @@ form tree,form + {'search_default_week':1} diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py index 831bc45d122..46346889834 100644 --- a/addons/lunch/__openerp__.py +++ b/addons/lunch/__openerp__.py @@ -45,12 +45,13 @@ 'wizard/lunch_cashbox_clean_view.xml', 'lunch_view.xml', 'lunch_report.xml', + 'report/report_lunch_order_view.xml', #'process/lunch_process.xml' ], "demo_xml": ['lunch_demo.xml', ], "test": ['test/test_lunch.yml' - ], + ], "installable": True, } diff --git a/addons/lunch/report/__init__.py b/addons/lunch/report/__init__.py index acf05a0ca2a..4a56869bf83 100644 --- a/addons/lunch/report/__init__.py +++ b/addons/lunch/report/__init__.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,10 +15,11 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## import order +import report_lunch_order # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/lunch/report/report_lunch_order.py b/addons/lunch/report/report_lunch_order.py new file mode 100644 index 00000000000..51fa3bf841b --- /dev/null +++ b/addons/lunch/report/report_lunch_order.py @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import tools +from osv import fields,osv + +class report_lunch_order(osv.osv): + _name = "report.lunch.order" + _description = "Lunch Orders Statistics" + _auto = False + _rec_name = 'date' + _columns = { + 'date': fields.date('Date Order', readonly=True), + 'year': fields.char('Year', size=4, readonly=True), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), + ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), + 'day': fields.char('Day', size=128, readonly=True), + 'user_id': fields.many2one('res.users', 'User Name'), + 'box_name': fields.char('Name', size=30), + 'price_total':fields.float('Total Price', readonly=True), + } + _order = 'date desc' + def init(self, cr): + tools.drop_view_if_exists(cr, 'report_lunch_order') + cr.execute(""" + create or replace view report_lunch_order as ( + select + min(lo.id) as id, + lo.date as date, + to_char(lo.date, 'YYYY') as year, + to_char(lo.date, 'MM') as month, + to_char(lo.date, 'YYYY-MM-DD') as day, + lo.user_id, + cm.name as box_name, + sum(lp.price) as price_total + + from + lunch_order as lo + left join lunch_cashmove as cm on (cm.id = lo.cashmove) + left join lunch_cashbox as lc on (lc.id = cm.box) + left join lunch_product as lp on (lo.product = lp.id) + + group by + lo.date,lo.user_id,cm.name + ) + """) +report_lunch_order() \ No newline at end of file diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml new file mode 100644 index 00000000000..25377799204 --- /dev/null +++ b/addons/lunch/report/report_lunch_order_view.xml @@ -0,0 +1,69 @@ + + + + + + report.lunch.order.tree + report.lunch.order + tree + + + + + + + + + + + + + + + report.lunch.order.search + report.lunch.order + search + + + + + + + + + + + + + + + + + + + + + + + Lunch Order Analysis + report.lunch.order + form + tree + + {'search_default_month':1,'search_default_User':1} + + + + + + \ No newline at end of file diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po index 0044446eaf8..c2fe33b5681 100644 --- a/addons/mrp/i18n/zh_CN.po +++ b/addons/mrp/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-29 00:43+0000\n" -"Last-Translator: digitalsatori \n" +"PO-Revision-Date: 2010-06-22 22:36+0000\n" +"Last-Translator: sagas \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-06-22 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: mrp @@ -32,7 +32,7 @@ msgid "" "Triggers an automatic procurement for all products that have a virtual stock " "under 0. You should probably not use this option, we suggest using a MTO " "configuration on products." -msgstr "触发所有虚拟库存为小于0产品自动的产品需求.你或者不应该使用这个选项.建议你使用产品按单生产的设置" +msgstr "对所有虚拟库存为小于0产品自动备货.你或许不应该使用这个选项.建议你使用产品按单生产(MTO)的设置" #. module: mrp #: model:ir.module.module,shortdesc:mrp.module_meta_information @@ -42,7 +42,7 @@ msgstr "MRP(产品需求计划)" #. module: mrp #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "在这动作定义中有无效的模块名" +msgstr "在动作定义中使用了无效的模快名。" #. module: mrp #: field:mrp.bom.revision,indice:0 @@ -53,13 +53,13 @@ msgstr "版本" #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2 msgid "Compute Stock Minimum Rules Only" -msgstr "仅计算最少库存规则" +msgstr "仅运算最少库存规则" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5 msgid "Exceptions Procurements" -msgstr "异常需求单" +msgstr "异常备货单" #. module: mrp #: view:mrp.routing.workcenter:0 diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po index 7c77c34ecd5..3d304b1b3e1 100644 --- a/addons/product/i18n/ru.po +++ b/addons/product/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-04-13 05:28+0000\n" +"PO-Revision-Date: 2010-06-22 10:03+0000\n" "Last-Translator: grisha \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-06-22 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-06-23 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product @@ -276,7 +276,7 @@ msgstr "В другом каталоге" #: model:ir.ui.menu,name:product.menu_products #: view:product.product:0 msgid "Products" -msgstr "Продукция" +msgstr "ТМЦ" #. module: product #: help:product.pricelist.item,price_round:0 @@ -428,7 +428,7 @@ msgstr "Средняя цена" #. module: product #: model:process.node,note:product.process_node_product0 msgid "Create new Product" -msgstr "Создать новый продукт" +msgstr "Создать ТМЦ" #. module: product #: help:product.pricelist.item,name:0 @@ -693,7 +693,7 @@ msgstr "Снабжение" #: model:ir.actions.act_window,name:product.product_category_action #: model:ir.ui.menu,name:product.menu_product_category_action msgid "Products by Category" -msgstr "Продукция по категориям" +msgstr "ТМЦ по категориям" #. module: product #: model:product.template,name:product.product_product_hdd1_product_template @@ -716,7 +716,7 @@ msgstr "Жёсткий диск Seagate 7200.8 160GB" #. module: product #: view:product.product:0 msgid "Product Variant" -msgstr "Вариант продукции" +msgstr "Вариант ТМЦ" #. module: product #: field:product.packaging,ul:0 @@ -891,7 +891,7 @@ msgstr "Доступные запасы" #. module: product #: view:product.category:0 msgid "Product Categories" -msgstr "Категории продукции" +msgstr "Категории ТМЦ" #. module: product #: help:product.uom,category_id:0 @@ -1146,7 +1146,7 @@ msgstr "" #: model:ir.model,name:product.model_product_category #: field:product.pricelist.item,categ_id:0 msgid "Product Category" -msgstr "Категория продукции" +msgstr "Категория ТМЦ" #. module: product #: field:product.price.type,field:0 @@ -1214,7 +1214,7 @@ msgstr "" #: field:product.product,product_tmpl_id:0 #: view:product.template:0 msgid "Product Template" -msgstr "Шаблон продукта" +msgstr "Шаблон ТМЦ" #. module: product #: model:ir.model,name:product.model_product_ul @@ -1255,7 +1255,7 @@ msgstr "Информация партнера" #: view:product.template:0 #: field:product.template,type:0 msgid "Product Type" -msgstr "Тип продукции" +msgstr "Тип ТМЦ" #. module: product #: model:product.category,name:product.product_category_7 @@ -1266,7 +1266,7 @@ msgstr "Вмешательство на месте" #. module: product #: model:product.category,name:product.cat0 msgid "All products" -msgstr "Все продукты" +msgstr "Все ТМЦ" #. module: product #: wizard_button:product.price_list,init,end:0 @@ -1420,7 +1420,7 @@ msgstr "Тип цены" #: field:product.supplierinfo,product_id:0 #: model:res.request.link,name:product.req_link_product msgid "Product" -msgstr "Продукция" +msgstr "Товарно-материальные ценности" #. module: product #: field:product.template,volume:0 @@ -1531,7 +1531,7 @@ msgstr "Дата окончания" #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form msgid "Products Categories" -msgstr "Категории продукции" +msgstr "Категории ТМЦ" #. module: product #: field:product.product,packaging:0 @@ -1607,7 +1607,7 @@ msgstr "Конец жизненного цикла" #. module: product #: model:ir.module.module,shortdesc:product.module_meta_information msgid "Products & Pricelists" -msgstr "Изделия и каталоги" +msgstr "ТМЦ и каталоги" #. module: product #: help:product.uom,factor:0 diff --git a/addons/product/product.py b/addons/product/product.py index e4d111f1d7d..8c35990cf9e 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -586,6 +586,7 @@ class product_packaging(osv.osv): _name = "product.packaging" _description = "Packaging" _rec_name = 'ean' + _order = 'sequence' _columns = { 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of packaging."), 'name' : fields.text('Description', size=64), @@ -609,7 +610,6 @@ class product_packaging(osv.osv): 'length': fields.float('Length', help='The length of the package'), } - _order = 'sequence' def name_get(self, cr, uid, ids, context={}): if not len(ids): diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index d04b6204940..555390d1921 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -30,12 +30,13 @@
- - + + - - + + +
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 5aa1ac1aed4..8c24b5000ee 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -112,131 +112,5 @@ class sale_report(osv.osv): """) sale_report() -class sale_order_by_clients(osv.osv): - _name = "sale.order.by.clients" - _description = "Sales order by clients" - _auto = False - _rec_name = 'partner' - _columns = { - 'total_orders': fields.integer('Total'), - 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True) - } - _order = 'total_orders desc' - def init(self, cr): - tools.drop_view_if_exists(cr, 'sale_order_by_clients') - cr.execute(""" - create or replace view sale_order_by_clients as ( - select - min(s.id) as id, - count(*) as total_orders, - s.partner_id as partner_id - from - sale_order s - where - s.state='manual' or s.state='progress' - group by - s.partner_id - ) - """) -sale_order_by_clients() - -class uninvoiced_lines_per_month(osv.osv): - _name = "uninvoiced.lines.per.month" - _description = "Uninvoiced lines per month" - _auto = False - _rec_name = 'month' - _columns = { - 'number_of_lines': fields.integer('Total Lines', readonly=True), - 'year': fields.char('Year', size=10, readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), - - } - _order = 'number_of_lines desc' - def init(self, cr): - tools.drop_view_if_exists(cr, 'uninvoiced_lines_per_month') - cr.execute(""" - create or replace view uninvoiced_lines_per_month as ( - select - min(s.id) as id, - count(*) as number_of_lines, - to_char(s.create_date, 'MM') as month, - to_char(s.create_date, 'YYYY') as year - from - sale_order_line s - where - s.state='draft' - group by - to_char(s.create_date, 'MM'),to_char(s.create_date, 'YYYY') - ) - """) -uninvoiced_lines_per_month() - -class product_bought_by_sale_order(osv.osv): - _name = "product.bought.by.sale.order" - _description = "Product bought by sale order" - _auto = False - _rec_name = 'month' - _columns = { - 'total_products': fields.integer('Total Products', readonly=True), - 'product_id':fields.many2one('product.product', 'Product', readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), - 'year': fields.char('Year', size=64, readonly=True) - } - _order = 'total_products desc' - def init(self, cr): - tools.drop_view_if_exists(cr, 'product_bought_by_sale_order') - cr.execute(""" - create or replace view product_bought_by_sale_order as ( - select - min(s.id) as id, - l.product_id as product_id, - to_char(l.create_date, 'MM') as month, - to_char(l.create_date, 'YYYY') as year, - count(*) as total_products - from - sale_order_line l - left join - sale_order s on (s.id=l.order_id) - where - s.state='manual' or s.state='progress' - group by - l.product_id, to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY') - ) - """) -product_bought_by_sale_order() - -class sales_by_regions(osv.osv): - _name = "sales.by.regions" - _description = "Sales by regions" - _auto = False - _rec_name = 'name' - _columns = { - 'total_sales': fields.integer('Total Sales', readonly=True), - 'name': fields.char('Country', size=64, readonly=True), - } - _order = 'total_sales desc' - def init(self, cr): - tools.drop_view_if_exists(cr, 'sales_by_regions') - cr.execute(""" - create or replace view sales_by_regions as ( - select - min(s.id) as id, - rc.name as name, - count(s.name) as total_sales - from - sale_order s,res_partner_address p,res_country rc - where - s.partner_id=p.id and - p.country_id=rc.id and - (s.state='manual' or s.state='progress') - group by - rc.name - ) - """) -sales_by_regions() diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 5024e09672c..8e50e6978ba 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -139,137 +139,133 @@ - - sale.order.by.clients.tree - sale.order.by.clients + + sales.by.partner.tree + sale.report tree - + - + - - sale.order.by.clients.graph - sale.order.by.clients + + sales.by.partner.graph + sale.report graph - + - + - - Sales Orders - sale.order.by.clients - form - tree,graph - - - - - uninvoiced.lines.per.month.tree - uninvoiced.lines.per.month - tree - - - - - - - - - - - uninvoiced.lines.per.month.graph - uninvoiced.lines.per.month - graph - - - - - - - - - - Uninvoiced Lines - uninvoiced.lines.per.month - form - tree,graph - - - - - product.bought.by.sale.order.tree - product.bought.by.sale.order - tree - - - - - - - - - - - - product.bought.by.sale.order.graph - product.bought.by.sale.order - graph - - - - - - - - - - - Product bought by sale order - product.bought.by.sale.order + + Sales By Partner + sale.report form graph,tree - [('year','=', time.strftime('%Y'))] - + [('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] + - - sales.by.regions.tree - sales.by.regions + + sales.by.salesman.tree + sale.report tree - - - + + + - - sales.by.regions.graph - sales.by.regions + + sales.by.salesman.graph + sale.report graph - - - + + + - - Sales by regions - sales.by.regions + + Sales By Salesman + sale.report form - tree,graph - + graph,tree + [('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] + + + + + sold.product.total.price.tree + sale.report + tree + + + + + + + + + + sold.product.total.price.graph + sale.report + graph + + + + + + + + + + Sold product and Total Price + sale.report + form + graph,tree + [('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] + + + + + + sales.category.product.price.tree + sale.report + tree + + + + + + + + + Total Price By Product Category + sale.report + form + tree + [('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] + + + + + Quotation For Sale + sale.order + form + tree,form + [('state','=','draft'),('date_order','<=', time.strftime('%Y-%m-%d')),('date_order','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] +