diff --git a/addons/account/account.py b/addons/account/account.py index 6589ec724a2..432a90a653e 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3265,14 +3265,20 @@ class wizard_multi_charts_accounts(osv.osv_memory): obj_tax_temp = self.pool.get('account.tax.template') chart_template = obj_wizard.chart_template_id vals = {} + # get the ids of all the parents of the selected account chart template + current_chart_template = chart_template + all_parents = [current_chart_template.id] + while current_chart_template.parent_id: + current_chart_template = current_chart_template.parent_id + all_parents.append(current_chart_template.id) # create tax templates and tax code templates from purchase_tax_rate and sale_tax_rate fields if not chart_template.complete_tax_set: - if obj_wizard.sale_tax: - value = obj_wizard.sale_tax_rate - obj_tax_temp.write(cr, uid, [obj_wizard.sale_tax.id], {'amount': value/100.0, 'name': _('Tax %.2f%%') % value}) - if obj_wizard.purchase_tax: - value = obj_wizard.purchase_tax_rate - obj_tax_temp.write(cr, uid, [obj_wizard.purchase_tax.id], {'amount': value/100.0, 'name': _('Purchase Tax %.2f%%') % value}) + value = obj_wizard.sale_tax_rate + ref_tax_ids = obj_tax_temp.search(cr, uid, [('type_tax_use','in', ('sale','all')), ('chart_template_id', 'in', all_parents)], context=context, order="sequence, id desc", limit=1) + obj_tax_temp.write(cr, uid, ref_tax_ids, {'amount': value/100.0, 'name': _('Tax %.2f%%') % value}) + value = obj_wizard.purchase_tax_rate + ref_tax_ids = obj_tax_temp.search(cr, uid, [('type_tax_use','in', ('purchase','all')), ('chart_template_id', 'in', all_parents)], context=context, order="sequence, id desc", limit=1) + obj_tax_temp.write(cr, uid, ref_tax_ids, {'amount': value/100.0, 'name': _('Purchase Tax %.2f%%') % value}) return True def execute(self, cr, uid, ids, context=None): diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 9772984bc3b..166d146829b 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -259,7 +259,7 @@ class account_invoice(osv.osv): 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50), }, help="It indicates that the invoice has been paid and the journal entry of the invoice has been reconciled with one or several journal entries of payment."), 'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account', - help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}), + help='Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Supplier Refund, otherwise a Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}), 'move_lines':fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'), 'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Account'), string='Balance', store={ diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index e198e9e3069..986f21c27fa 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -168,8 +168,7 @@ - - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 9b33c1ed364..3d34396248b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1363,7 +1363,7 @@ - +
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index dd247a98110..760ba00feb8 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:55+0000\n" -"PO-Revision-Date: 2012-01-05 15:14+0000\n" -"Last-Translator: kifcaliph \n" +"PO-Revision-Date: 2012-01-10 19:38+0000\n" +"Last-Translator: kifcaliph \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: 2012-01-06 04:49+0000\n" -"X-Generator: Launchpad (build 14637)\n" +"X-Launchpad-Export-Date: 2012-01-11 04:40+0000\n" +"X-Generator: Launchpad (build 14640)\n" #. module: account #: view:account.invoice.report:0 #: view:analytic.entries.report:0 msgid "last month" -msgstr "" +msgstr "الشهر الماضي" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -588,7 +588,7 @@ msgstr "المتواليات" #: field:account.financial.report,account_report_id:0 #: selection:account.financial.report,type:0 msgid "Report Value" -msgstr "" +msgstr "قيمة التقرير" #. module: account #: view:account.entries.report:0 @@ -897,7 +897,7 @@ msgstr "تجميع" #: model:account.account.type,name:account.data_account_type_liability #: model:account.financial.report,name:account.account_financial_report_liability0 msgid "Liability" -msgstr "" +msgstr "الخصوم" #. module: account #: view:account.entries.report:0 @@ -1016,7 +1016,7 @@ msgstr "" #. module: account #: field:account.report.general.ledger,sortby:0 msgid "Sort by" -msgstr "" +msgstr "ترتيب حسب" #. module: account #: help:account.fiscalyear.close,fy_id:0 @@ -1742,7 +1742,7 @@ msgstr "لا يمكنك إنشاء حركة سطر علي حساب مغلق." #: code:addons/account/account.py:428 #, python-format msgid "Error!" -msgstr "" +msgstr "خطأ!" #. module: account #: sql_constraint:account.move.line:0 @@ -1774,7 +1774,7 @@ msgstr "القيود في سطر" #. module: account #: field:account.vat.declaration,based_on:0 msgid "Based on" -msgstr "" +msgstr "بالاستناد الى" #. module: account #: field:account.invoice,move_id:0 @@ -1863,7 +1863,7 @@ msgstr "تعريف الضريبة" #: code:addons/account/account.py:3076 #, python-format msgid "Deposit" -msgstr "" +msgstr "ايداع" #. module: account #: help:wizard.multi.charts.accounts,seq_journal:0 @@ -2395,7 +2395,7 @@ msgstr "ضرائب المورد" #. module: account #: view:account.entries.report:0 msgid "entries" -msgstr "" +msgstr "المدخلات" #. module: account #: help:account.invoice,date_due:0 @@ -2823,7 +2823,7 @@ msgstr "" #: field:account.account,child_parent_ids:0 #: field:account.account.template,child_parent_ids:0 msgid "Children" -msgstr "" +msgstr "فرعي" #. module: account #: code:addons/account/account.py:962 @@ -3414,7 +3414,7 @@ msgstr "تاريخ" #. module: account #: view:account.move:0 msgid "Post" -msgstr "" +msgstr "ترحيل" #. module: account #: view:account.unreconcile:0 @@ -3430,7 +3430,7 @@ msgstr "إلغاء التسوية" #: view:analytic.entries.report:0 #: field:analytic.entries.report,user_id:0 msgid "User" -msgstr "" +msgstr "مستخدم" #. module: account #: view:account.chart.template:0 @@ -3846,7 +3846,7 @@ msgstr "" #. module: account #: view:res.partner:0 msgid "Bank Account Owner" -msgstr "" +msgstr "مالِك الحساب المصرفي" #. module: account #: report:account.account.balance:0 @@ -4267,7 +4267,7 @@ msgstr "" #. module: account #: view:account.payment.term.line:0 msgid "Example" -msgstr "" +msgstr "مثال" #. module: account #: constraint:account.account:0 @@ -4317,7 +4317,7 @@ msgstr "مؤكد" #. module: account #: report:account.invoice:0 msgid "Cancelled Invoice" -msgstr "" +msgstr "فاتورة ملغاة" #. module: account #: code:addons/account/account_invoice.py:71 @@ -4337,7 +4337,7 @@ msgstr "" #. module: account #: selection:account.bank.statement,state:0 msgid "New" -msgstr "" +msgstr "جديد" #. module: account #: field:account.invoice.refund,date:0 @@ -4432,7 +4432,7 @@ msgstr "مندوب المبيعات" #. module: account #: view:account.invoice.report:0 msgid "Invoiced" -msgstr "" +msgstr "مفوتر" #. module: account #: view:account.move:0 @@ -4605,7 +4605,7 @@ msgstr "" #. module: account #: model:res.groups,name:account.group_account_user msgid "Accountant" -msgstr "" +msgstr "محاسب" #. module: account #: model:ir.actions.act_window,help:account.action_account_treasury_report_all @@ -4937,7 +4937,7 @@ msgstr "بيع" #. module: account #: view:account.financial.report:0 msgid "Report" -msgstr "" +msgstr "تقرير" #. module: account #: view:account.analytic.line:0 @@ -5015,7 +5015,7 @@ msgstr "" #. module: account #: field:account.partner.reconcile.process,progress:0 msgid "Progress" -msgstr "" +msgstr "تقدّم" #. module: account #: view:report.hr.timesheet.invoice.journal:0 @@ -5203,7 +5203,7 @@ msgstr "تاريخ الدفع" #. module: account #: selection:account.automatic.reconcile,power:0 msgid "6" -msgstr "" +msgstr "٦" #. module: account #: view:account.analytic.account:0 @@ -5253,7 +5253,7 @@ msgstr "" #: field:report.account.sales,quantity:0 #: field:report.account_type.sales,quantity:0 msgid "Quantity" -msgstr "" +msgstr "كمية" #. module: account #: view:account.move.line:0 @@ -5352,7 +5352,7 @@ msgstr "" #: view:account.move:0 #: view:account.move.line:0 msgid "Journal Item" -msgstr "" +msgstr "عنصر يومية" #. module: account #: model:ir.model,name:account.model_account_move_journal @@ -5385,7 +5385,7 @@ msgstr "" #. module: account #: field:report.invoice.created,create_date:0 msgid "Create Date" -msgstr "" +msgstr "إنشاء تاريخ" #. module: account #: view:account.analytic.journal:0 @@ -5397,7 +5397,7 @@ msgstr "يوميات تحليلية" #. module: account #: field:account.account,child_id:0 msgid "Child Accounts" -msgstr "" +msgstr "حسابات فرعية" #. module: account #: code:addons/account/account_move_line.py:1213 @@ -5410,7 +5410,7 @@ msgstr "" #: code:addons/account/account_move_line.py:857 #, python-format msgid "Write-Off" -msgstr "" +msgstr "إلغاء" #. module: account #: field:res.partner,debit:0 @@ -5421,7 +5421,7 @@ msgstr "إجمالي مستحق الدفع" #: model:account.account.type,name:account.data_account_type_income #: model:account.financial.report,name:account.account_financial_report_income0 msgid "Income" -msgstr "" +msgstr "الدخل" #. module: account #: selection:account.bank.statement.line,type:0 @@ -5430,7 +5430,7 @@ msgstr "" #: code:addons/account/account_invoice.py:328 #, python-format msgid "Supplier" -msgstr "" +msgstr "مورِّد" #. module: account #: selection:account.entries.report,month:0 @@ -5439,7 +5439,7 @@ msgstr "" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "March" -msgstr "" +msgstr "مارس" #. module: account #: view:account.account.template:0 @@ -5496,7 +5496,7 @@ msgstr "" #. module: account #: field:account.invoice,address_invoice_id:0 msgid "Invoice Address" -msgstr "" +msgstr "عنوان الفاتورة" #. module: account #: model:ir.actions.act_window,help:account.action_account_entries_report_all @@ -5541,7 +5541,7 @@ msgstr "قوة الفترة" #: view:account.invoice.report:0 #: field:account.invoice.report,nbr:0 msgid "# of Lines" -msgstr "" +msgstr "عدد السطور" #. module: account #: field:account.aged.trial.balance,filter:0 @@ -5622,7 +5622,7 @@ msgstr "عدد الأيام" #. module: account #: selection:account.automatic.reconcile,power:0 msgid "7" -msgstr "" +msgstr "٧" #. module: account #: code:addons/account/account_bank_statement.py:398 @@ -5630,7 +5630,7 @@ msgstr "" #: code:addons/account/wizard/account_period_close.py:51 #, python-format msgid "Invalid action !" -msgstr "" +msgstr "إجراء خاطئ!" #. module: account #: code:addons/account/wizard/account_move_journal.py:102 @@ -5659,7 +5659,7 @@ msgstr "تاريخ الطباعة" #: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "None" -msgstr "" +msgstr "لا شئ" #. module: account #: view:analytic.entries.report:0 @@ -5691,7 +5691,7 @@ msgstr "" #: code:addons/account/wizard/account_report_common.py:128 #, python-format msgid "not implemented" -msgstr "" +msgstr "غير مطبق" #. module: account #: help:account.journal,company_id:0 @@ -5766,7 +5766,7 @@ msgstr "" #. module: account #: field:account.entries.report,date_created:0 msgid "Date Created" -msgstr "" +msgstr "تاريخ الإنشاء" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form @@ -5799,7 +5799,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_analytic_line msgid "Analytic Line" -msgstr "" +msgstr "خط بياني" #. module: account #: field:product.template,taxes_id:0 @@ -5862,7 +5862,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_res_company msgid "Companies" -msgstr "" +msgstr "الشركات" #. module: account #: code:addons/account/account.py:663 @@ -5960,7 +5960,7 @@ msgstr "" #: view:validate.account.move.lines:0 #, python-format msgid "Cancel" -msgstr "" +msgstr "إلغاء" #. module: account #: selection:account.account,type:0 @@ -5973,7 +5973,7 @@ msgstr "" #. module: account #: view:account.invoice:0 msgid "Other Info" -msgstr "" +msgstr "معلومات أخرى" #. module: account #: field:account.journal,default_credit_account_id:0 @@ -5990,7 +5990,7 @@ msgstr "" #: code:addons/account/account.py:3075 #, python-format msgid "Current" -msgstr "" +msgstr "الحالي" #. module: account #: view:account.bank.statement:0 @@ -6001,7 +6001,7 @@ msgstr "" #: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "Percentage" -msgstr "" +msgstr "النسبة" #. module: account #: selection:account.report.general.ledger,sortby:0 @@ -6011,12 +6011,12 @@ msgstr "" #. module: account #: field:account.automatic.reconcile,power:0 msgid "Power" -msgstr "" +msgstr "طاقة" #. module: account #: report:account.invoice:0 msgid "Price" -msgstr "" +msgstr "السعر" #. module: account #: view:project.account.analytic.line:0 @@ -6134,7 +6134,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_dashboard_acc msgid "Dashboard" -msgstr "" +msgstr "اللوحة الرئيسية" #. module: account #: field:account.bank.statement,move_line_ids:0 @@ -6167,12 +6167,12 @@ msgstr "" #: view:account.tax.code.template:0 #: view:analytic.entries.report:0 msgid "Group By..." -msgstr "" +msgstr "تجميع حسب..." #. module: account #: field:account.journal.column,readonly:0 msgid "Readonly" -msgstr "" +msgstr "للقراءة فقط" #. module: account #: view:account.payment.term.line:0 @@ -6227,7 +6227,7 @@ msgstr "" #: report:account.invoice:0 #: field:account.invoice.tax,base:0 msgid "Base" -msgstr "" +msgstr "أساس" #. module: account #: field:account.model,name:0 @@ -6266,7 +6266,7 @@ msgstr "" #: view:account.invoice.line:0 #: field:account.invoice.line,note:0 msgid "Notes" -msgstr "" +msgstr "ملاحظات" #. module: account #: model:ir.model,name:account.model_analytic_entries_report @@ -6339,7 +6339,7 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "Fax :" -msgstr "" +msgstr "الفاكس:" #. module: account #: view:wizard.multi.charts.accounts:0 @@ -6364,7 +6364,7 @@ msgstr "" #: field:account.tax.template,python_compute:0 #: selection:account.tax.template,type:0 msgid "Python Code" -msgstr "" +msgstr "كود بايثون" #. module: account #: view:account.entries.report:0 @@ -6381,7 +6381,7 @@ msgstr "" #. module: account #: view:account.fiscalyear.close:0 msgid "Create" -msgstr "" +msgstr "إنشاء" #. module: account #: model:process.transition.action,name:account.process_transition_action_createentries0 @@ -6424,7 +6424,7 @@ msgstr "" #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" -msgstr "" +msgstr "خطأ !" #. module: account #: selection:account.financial.report,sign:0 @@ -6458,7 +6458,7 @@ msgstr "" #. module: account #: field:account.invoice.tax,manual:0 msgid "Manual" -msgstr "" +msgstr "يدوي" #. module: account #: view:account.automatic.reconcile:0 @@ -6482,7 +6482,7 @@ msgstr "" #: view:account.move:0 #: field:account.move,to_check:0 msgid "To Review" -msgstr "" +msgstr "للمراجعة" #. module: account #: help:account.partner.ledger,initial_balance:0 @@ -6558,6 +6558,8 @@ msgstr "" msgid "" "Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"خطأ: لابد أن تكون وحدة القياس الإفتراضية و وحدة القياس في جزء المشتريات من " +"نوع واحد" #. module: account #: view:account.journal.select:0 @@ -6622,7 +6624,7 @@ msgstr "" #. module: account #: view:account.chart.template:0 msgid "Properties" -msgstr "" +msgstr "خصائص" #. module: account #: model:ir.model,name:account.model_account_tax_chart @@ -6723,7 +6725,7 @@ msgstr "" #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 msgid "Done" -msgstr "" +msgstr "تم" #. module: account #: model:ir.actions.act_window,help:account.action_bank_tree @@ -6754,7 +6756,7 @@ msgstr "" #: field:account.invoice,origin:0 #: field:report.invoice.created,origin:0 msgid "Source Document" -msgstr "" +msgstr "مستند المصدر" #. module: account #: code:addons/account/account.py:1429 @@ -6783,7 +6785,7 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "Taxes:" -msgstr "" +msgstr "ضرائب:" #. module: account #: help:account.tax,amount:0 @@ -6823,7 +6825,7 @@ msgstr "" #. module: account #: selection:account.automatic.reconcile,power:0 msgid "9" -msgstr "" +msgstr "٩" #. module: account #: help:account.invoice.refund,date:0 @@ -6847,7 +6849,7 @@ msgstr "سطور تحليلية" #: field:account.analytic.journal,line_ids:0 #: field:account.tax.code,line_ids:0 msgid "Lines" -msgstr "" +msgstr "سطور" #. module: account #: code:addons/account/account_invoice.py:532 @@ -6929,7 +6931,7 @@ msgstr "" #: field:account.invoice,date_invoice:0 #: field:report.invoice.created,date_invoice:0 msgid "Invoice Date" -msgstr "" +msgstr "تاريخ الفاتورة" #. module: account #: view:account.invoice.report:0 @@ -6944,18 +6946,18 @@ msgstr "إجمالي المبلغ المدين لهذا العميل لك." #. module: account #: model:ir.model,name:account.model_ir_sequence msgid "ir.sequence" -msgstr "" +msgstr "ir.sequence" #. module: account #: field:account.journal.period,icon:0 msgid "Icon" -msgstr "" +msgstr "أيقونة" #. module: account #: view:account.automatic.reconcile:0 #: view:account.use.model:0 msgid "Ok" -msgstr "" +msgstr "تم" #. module: account #: field:account.chart.template,tax_code_root_id:0 @@ -6983,7 +6985,7 @@ msgstr "" #. module: account #: field:account.automatic.reconcile,date2:0 msgid "Ending Date" -msgstr "" +msgstr "تاريخ الانتهاء" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax:0 @@ -6998,7 +7000,7 @@ msgstr "" #. module: account #: view:account.bank.statement:0 msgid "Confirm" -msgstr "" +msgstr "تأكيد" #. module: account #: help:account.invoice,partner_bank_id:0 @@ -7044,7 +7046,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_reporting msgid "Reporting" -msgstr "" +msgstr "التقارير" #. module: account #: code:addons/account/account_move_line.py:759 @@ -7091,13 +7093,13 @@ msgstr "" #. module: account #: field:account.move.line.reconcile.writeoff,comment:0 msgid "Comment" -msgstr "" +msgstr "تعليق" #. module: account #: field:account.tax,domain:0 #: field:account.tax.template,domain:0 msgid "Domain" -msgstr "" +msgstr "نطاق" #. module: account #: model:ir.model,name:account.model_account_use_model @@ -7124,7 +7126,7 @@ msgstr "" #: field:account.invoice.tax,invoice_id:0 #: model:ir.model,name:account.model_account_invoice_line msgid "Invoice Line" -msgstr "" +msgstr "خط الفاتورة" #. module: account #: view:account.invoice.report:0 @@ -7170,7 +7172,7 @@ msgstr "غير متوازن" #. module: account #: selection:account.move.line,centralisation:0 msgid "Normal" -msgstr "" +msgstr "عادي" #. module: account #: model:ir.actions.act_window,name:account.action_email_templates @@ -7192,7 +7194,7 @@ msgstr "دفتر اليومية يجب أن يتضمن حساب إفتراضي #. module: account #: report:account.general.journal:0 msgid ":" -msgstr "" +msgstr ":" #. module: account #: selection:account.account,currency_mode:0 @@ -7286,7 +7288,7 @@ msgstr "إجمالي المبلغ المستحق:" #: field:account.analytic.chart,to_date:0 #: field:project.account.analytic.line,to_date:0 msgid "To" -msgstr "" +msgstr "إلى" #. module: account #: selection:account.move.line,centralisation:0 @@ -7329,7 +7331,7 @@ msgstr "" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "May" -msgstr "" +msgstr "مايو" #. module: account #: view:account.account:0 @@ -7374,7 +7376,7 @@ msgstr "" #. module: account #: field:account.financial.report,name:0 msgid "Report Name" -msgstr "" +msgstr "اسم التقرير" #. module: account #: model:account.account.type,name:account.data_account_type_cash @@ -7385,7 +7387,7 @@ msgstr "" #: code:addons/account/account.py:3077 #, python-format msgid "Cash" -msgstr "" +msgstr "نقدي" #. module: account #: field:account.fiscal.position.account,account_dest_id:0 @@ -7427,7 +7429,7 @@ msgstr "" #: field:account.tax,sequence:0 #: field:account.tax.template,sequence:0 msgid "Sequence" -msgstr "" +msgstr "مسلسل" #. module: account #: constraint:product.category:0 @@ -7442,7 +7444,7 @@ msgstr "" #. module: account #: view:account.state.open:0 msgid "Yes" -msgstr "" +msgstr "نعم" #. module: account #: view:report.account_type.sales:0 @@ -7457,7 +7459,7 @@ msgstr "" #. module: account #: selection:account.installer,period:0 msgid "Monthly" -msgstr "" +msgstr "شهرياً" #. module: account #: model:ir.actions.act_window,help:account.action_account_journal_view @@ -7589,7 +7591,7 @@ msgstr "حساب الإشتراك" #: model:ir.model,name:account.model_res_partner #: field:report.invoice.created,partner_id:0 msgid "Partner" -msgstr "" +msgstr "شريك" #. module: account #: help:account.change.currency,currency_id:0 @@ -7618,7 +7620,7 @@ msgstr "لا سطور للفاتورة !" #. module: account #: view:account.financial.report:0 msgid "Report Type" -msgstr "" +msgstr "نوع التقرير" #. module: account #: view:account.analytic.account:0 @@ -7828,7 +7830,7 @@ msgstr "للضرائب ادخل النسبة % بين 0 و 1." #. module: account #: selection:account.automatic.reconcile,power:0 msgid "8" -msgstr "" +msgstr "٨" #. module: account #: view:account.analytic.account:0 @@ -7868,7 +7870,7 @@ msgstr "" #: field:account.treasury.report,period_id:0 #: field:validate.account.move,period_id:0 msgid "Period" -msgstr "" +msgstr "فترة" #. module: account #: help:account.account,adjusted_balance:0 @@ -7966,7 +7968,7 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "Tel. :" -msgstr "" +msgstr "هاتف:" #. module: account #: field:account.account,company_currency_id:0 @@ -7995,7 +7997,7 @@ msgstr "شجرة الحساب" #: model:process.node,name:account.process_node_paymententries0 #: model:process.transition,name:account.process_transition_reconcilepaid0 msgid "Payment" -msgstr "" +msgstr "الدفع" #. module: account #: field:account.bank.statement,balance_end_real:0 @@ -8157,7 +8159,7 @@ msgstr "" #. module: account #: view:account.analytic.account:0 msgid "Contacts" -msgstr "" +msgstr "جهات الاتصال" #. module: account #: field:account.tax.code,parent_id:0 @@ -8350,7 +8352,7 @@ msgstr "" #: model:account.account.type,name:account.data_account_type_expense #: model:account.financial.report,name:account.account_financial_report_expense0 msgid "Expense" -msgstr "" +msgstr "مصروف" #. module: account #: help:account.chart,fiscalyear:0 @@ -9221,7 +9223,7 @@ msgstr "نشِط" #. module: account #: view:accounting.report:0 msgid "Comparison" -msgstr "" +msgstr "مقارنة" #. module: account #: code:addons/account/account_invoice.py:361 @@ -10724,3 +10726,15 @@ msgstr "" #~ msgid "" #~ "The expected balance (%.2f) is different than the computed one. (%.2f)" #~ msgstr "الرصيد المتوقع(%.2f) مختلف عن الرصيد المحسوب (%.2f)." + +#~ msgid "Line" +#~ msgstr "سطر" + +#~ msgid "Fixed" +#~ msgstr "ثابت" + +#~ msgid "Error ! You can not create recursive associated members." +#~ msgstr "خطأ! لا يمكنك إنشاء أعضاء ذوي ارتباطات متداخلة." + +#~ msgid "Sort By" +#~ msgstr "فرز بحسب" diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 26399d5e982..df284ac0231 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-23 09:55+0000\n" -"PO-Revision-Date: 2011-11-07 12:52+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-09 20:41+0000\n" +"Last-Translator: Erdem U \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: 2011-12-24 05:50+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-10 05:21+0000\n" +"X-Generator: Launchpad (build 14640)\n" #. module: account #: view:account.invoice.report:0 #: view:analytic.entries.report:0 msgid "last month" -msgstr "" +msgstr "geçen ay" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -48,7 +48,7 @@ msgstr "Hesap İstatistikleri" #. module: account #: view:account.invoice:0 msgid "Proforma/Open/Paid Invoices" -msgstr "" +msgstr "Proforma/Açık/Kapalı Faturalar" #. module: account #: field:report.invoice.created,residual:0 @@ -180,7 +180,7 @@ msgstr "Son 15 Günde Oluşturulmuş Faturalar" #. module: account #: field:accounting.report,label_filter:0 msgid "Column Label" -msgstr "" +msgstr "Kolon Etiketi" #. module: account #: code:addons/account/wizard/account_move_journal.py:95 @@ -434,7 +434,7 @@ msgstr "Tutar, seçmeli olarak başka bir para birimiyle belirtilebilir." #. module: account #: field:accounting.report,enable_filter:0 msgid "Enable Comparison" -msgstr "" +msgstr "Karşılaştırmayı Etkinleştir" #. module: account #: help:account.journal.period,state:0 @@ -525,7 +525,7 @@ msgstr "Muhasebe Hesap Planı seçiniz" #. module: account #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Şirket adı tekil olmalı !" #. module: account #: model:ir.model,name:account.model_account_invoice_refund @@ -609,7 +609,7 @@ msgstr "Diziler" #: field:account.financial.report,account_report_id:0 #: selection:account.financial.report,type:0 msgid "Report Value" -msgstr "" +msgstr "Rapor Değeri" #. module: account #: view:account.entries.report:0 @@ -630,7 +630,7 @@ msgstr "Ana dizi şuandakinden farklı olmalı" #: code:addons/account/account.py:3376 #, python-format msgid "TAX-S-%s" -msgstr "" +msgstr "KDV-s-%s" #. module: account #: field:account.invoice.tax,tax_amount:0 @@ -1041,7 +1041,7 @@ msgstr "" #. module: account #: field:account.report.general.ledger,sortby:0 msgid "Sort by" -msgstr "" +msgstr "Sırala" #. module: account #: help:account.fiscalyear.close,fy_id:0 @@ -1174,7 +1174,7 @@ msgstr "" #. module: account #: view:account.tax.template:0 msgid "Taxes used in Purchases" -msgstr "" +msgstr "Satınalmalarda kullanılan vergiler" #. module: account #: field:account.invoice.tax,tax_code_id:0 @@ -1314,7 +1314,7 @@ msgstr "Başlangıç ve bitiş dönemi seçin" #. module: account #: model:account.financial.report,name:account.account_financial_report_profitandloss0 msgid "Profit and Loss" -msgstr "" +msgstr "Kâr ve Zarar" #. module: account #: model:ir.model,name:account.model_account_account_template @@ -1787,7 +1787,7 @@ msgstr "Kapanmış bir hesap için hareket yaratamazsınız." #: code:addons/account/account.py:428 #, python-format msgid "Error!" -msgstr "" +msgstr "Hata!" #. module: account #: sql_constraint:account.move.line:0 @@ -1819,7 +1819,7 @@ msgstr "Entries By Line" #. module: account #: field:account.vat.declaration,based_on:0 msgid "Based on" -msgstr "" +msgstr "Temel alınan:" #. module: account #: field:account.invoice,move_id:0 @@ -2116,7 +2116,7 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "Customer Code" -msgstr "" +msgstr "Müşteri Kodu" #. module: account #: view:account.installer:0 @@ -3862,7 +3862,7 @@ msgstr "Onayla" #. module: account #: model:account.financial.report,name:account.account_financial_report_assets0 msgid "Assets" -msgstr "" +msgstr "Varlıklar" #. module: account #: view:account.invoice.confirm:0 diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 9fc2e7e612c..07400c68534 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -60,7 +60,6 @@ - diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index c1086285f93..b3b5a5afa2d 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -23,6 +23,7 @@ "version" : "1.1", "author" : "OpenERP SA", "category": 'Accounting & Finance', + "sequence": 10, 'complexity': "normal", "description": """ Accounting Access Rights. diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 3fe60e449cd..d379ba232fc 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -33,9 +33,7 @@ class account_analytic_account(osv.osv): def _analysis_all(self, cr, uid, ids, fields, arg, context=None): dp = 2 res = dict([(i, {}) for i in ids]) - - parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)) - res.update(dict([(i, {}) for i in parent_ids])) + parent_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy. accounts = self.browse(cr, uid, ids, context=context) for f in fields: @@ -72,10 +70,6 @@ class account_analytic_account(osv.osv): if account_id not in res: res[account_id] = {} res[account_id][f] = sum - for account in accounts: - for child in account.child_ids: - if res[account.id][f] < res.get(child.id, {}).get(f): - res[account.id][f] = res.get(child.id, {}).get(f, False) elif f == 'ca_to_invoice': for id in ids: res[id][f] = 0.0 @@ -111,13 +105,6 @@ class account_analytic_account(osv.osv): res[account_id] = {} res[account_id][f] = round(sum, dp) - for account in accounts: - #res.setdefault(account.id, 0.0) - res2.setdefault(account.id, 0.0) - for child in account.child_ids: - if child.id != account.id: - res[account.id][f] += res.get(child.id, {}).get(f, 0.0) - res2[account.id] += res2.get(child.id, 0.0) # sum both result on account_id for id in ids: res[id][f] = round(res.get(id, {}).get(f, 0.0), dp) + round(res2.get(id, 0.0), 2) @@ -135,10 +122,6 @@ class account_analytic_account(osv.osv): GROUP BY account_analytic_line.account_id",(parent_ids,)) for account_id, lid in cr.fetchall(): res[account_id][f] = lid - for account in accounts: - for child in account.child_ids: - if res[account.id][f] < res.get(child.id, {}).get(f): - res[account.id][f] = res.get(child.id, {}).get(f, False) elif f == 'last_worked_date': for id in ids: res[id][f] = False @@ -152,10 +135,6 @@ class account_analytic_account(osv.osv): if account_id not in res: res[account_id] = {} res[account_id][f] = lwd - for account in accounts: - for child in account.child_ids: - if res[account.id][f] < res.get(child.id, {}).get(f): - res[account.id][f] = res.get(child.id, {}).get(f, False) elif f == 'hours_qtt_non_invoiced': for id in ids: res[id][f] = 0.0 @@ -173,10 +152,6 @@ class account_analytic_account(osv.osv): if account_id not in res: res[account_id] = {} res[account_id][f] = round(sua, dp) - for account in accounts: - for child in account.child_ids: - if account.id != child.id: - res[account.id][f] += res.get(child.id, {}).get(f, 0.0) for id in ids: res[id][f] = round(res[id][f], dp) elif f == 'hours_quantity': @@ -195,19 +170,12 @@ class account_analytic_account(osv.osv): if account_id not in res: res[account_id] = {} res[account_id][f] = round(hq, dp) - for account in accounts: - for child in account.child_ids: - if account.id != child.id: - if account.id not in res: - res[account.id] = {f: 0.0} - res[account.id][f] += res.get(child.id, {}).get(f, 0.0) for id in ids: res[id][f] = round(res[id][f], dp) elif f == 'ca_theorical': # TODO Take care of pricelist and purchase ! for id in ids: res[id][f] = 0.0 - res2 = {} # Warning # This computation doesn't take care of pricelist ! # Just consider list_price @@ -232,31 +200,15 @@ class account_analytic_account(osv.osv): AND account_analytic_journal.type IN ('purchase', 'general') GROUP BY account_analytic_line.account_id""",(parent_ids,)) for account_id, sum in cr.fetchall(): - res2[account_id] = round(sum, dp) - - for account in accounts: - res2.setdefault(account.id, 0.0) - for child in account.child_ids: - if account.id != child.id: - if account.id not in res: - res[account.id] = {f: 0.0} - res[account.id][f] += res.get(child.id, {}).get(f, 0.0) - res[account.id][f] += res2.get(child.id, 0.0) - - # sum both result on account_id - for id in ids: - res[id][f] = round(res[id][f], dp) + round(res2.get(id, 0.0), dp) - + res[account_id][f] = round(sum, dp) return res def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None): res = {} res_final = {} - child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)) + child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy. for i in child_ids: - res[i] = {} - for n in [name]: - res[i][n] = 0.0 + res[i] = 0.0 if not child_ids: return res @@ -269,24 +221,18 @@ class account_analytic_account(osv.osv): AND account_analytic_journal.type = 'sale' \ GROUP BY account_analytic_line.account_id", (child_ids,)) for account_id, sum in cr.fetchall(): - res[account_id][name] = round(sum,2) - data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context=context) - for i in data: - res_final[i] = data[i][name] + res[account_id] = round(sum,2) + res_final = res return res_final def _total_cost_calc(self, cr, uid, ids, name, arg, context=None): res = {} res_final = {} - child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)) - + child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy. for i in child_ids: - res[i] = {} - for n in [name]: - res[i][n] = 0.0 + res[i] = 0.0 if not child_ids: return res - if child_ids: cr.execute("""SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \ FROM account_analytic_line \ @@ -296,10 +242,8 @@ class account_analytic_account(osv.osv): AND amount<0 \ GROUP BY account_analytic_line.account_id""",(child_ids,)) for account_id, sum in cr.fetchall(): - res[account_id][name] = round(sum,2) - data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context) - for i in data: - res_final[i] = data[i][name] + res[account_id] = round(sum,2) + res_final = res return res_final def _remaining_hours_calc(self, cr, uid, ids, name, arg, context=None): @@ -455,7 +399,7 @@ class account_analytic_account_summary_user(osv.osv): max_user = cr.fetchone()[0] account_ids = [int(str(x/max_user - (x%max_user == 0 and 1 or 0))) for x in ids] user_ids = [int(str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user))) for x in ids] - parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)], context=context)) + parent_ids = tuple(account_ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy. if parent_ids: cr.execute('SELECT id, unit_amount ' \ 'FROM account_analytic_analysis_summary_user ' \ @@ -463,12 +407,6 @@ class account_analytic_account_summary_user(osv.osv): 'AND "user" IN %s',(parent_ids, tuple(user_ids),)) for sum_id, unit_amount in cr.fetchall(): res[sum_id] = unit_amount - for obj_id in ids: - res.setdefault(obj_id, 0.0) - for child_id in account_obj.search(cr, uid, - [('parent_id', 'child_of', [int(str(obj_id/max_user - (obj_id%max_user == 0 and 1 or 0)))])]): - if child_id != int(str(obj_id/max_user - (obj_id%max_user == 0 and 1 or 0))): - res[obj_id] += res.get((child_id * max_user) + obj_id -((obj_id/max_user - (obj_id%max_user == 0 and 1 or 0)) * max_user), 0.0) for id in ids: res[id] = round(res.get(id, 0.0), 2) return res @@ -619,7 +557,7 @@ class account_analytic_account_summary_month(osv.osv): account_obj = self.pool.get('account.analytic.account') account_ids = [int(str(int(x))[:-6]) for x in ids] month_ids = [int(str(int(x))[-6:]) for x in ids] - parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)], context=context)) + parent_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy. if parent_ids: cr.execute('SELECT id, unit_amount ' \ 'FROM account_analytic_analysis_summary_month ' \ @@ -627,12 +565,6 @@ class account_analytic_account_summary_month(osv.osv): 'AND month_id IN %s ',(parent_ids, tuple(month_ids),)) for sum_id, unit_amount in cr.fetchall(): res[sum_id] = unit_amount - for obj_id in ids: - res.setdefault(obj_id, 0.0) - for child_id in account_obj.search(cr, uid, - [('parent_id', 'child_of', [int(str(int(obj_id))[:-6])])]): - if child_id != int(str(int(obj_id))[:-6]): - res[obj_id] += res.get(int(child_id * 1000000 + int(str(int(obj_id))[-6:])), 0.0) for id in ids: res[id] = round(res.get(id, 0.0), 2) return res @@ -778,5 +710,4 @@ class account_analytic_account_summary_month(osv.osv): return res account_analytic_account_summary_month() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 73c98e650f8..60d30f9fff0 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -93,6 +93,7 @@ + diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po index 75a9239b840..d8a66ed7645 100644 --- a/addons/account_analytic_default/i18n/tr.po +++ b/addons/account_analytic_default/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-22 13:43+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-10 23:06+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 06:57+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-11 04:40+0000\n" +"X-Generator: Launchpad (build 14640)\n" #. module: account_analytic_default #: help:account.analytic.default,partner_id:0 @@ -62,7 +62,7 @@ msgstr "Toplama Listesi" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Comapny" -msgstr "" +msgstr "Şirket" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -135,12 +135,12 @@ msgstr "Varsayılan Analizler" #. module: account_analytic_default #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Referans her şirket için tekil olmalı!" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Analytical defaults whose end date is greater than today or None" -msgstr "" +msgstr "Bitiş tarihi bugünden sonra ya da boş olan Analitik varsayılanlar" #. module: account_analytic_default #: help:account.analytic.default,product_id:0 diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index a8745fa088b..944216fd423 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -30,6 +30,7 @@ """, "website" : "http://www.openerp.com", "category" : "Accounting & Finance", + "sequence": 32, "init_xml" : [ ], "demo_xml" : [ 'account_asset_demo.xml' diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po index a3590b31653..d7c7490475f 100644 --- a/addons/account_budget/i18n/tr.po +++ b/addons/account_budget/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-22 16:37+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-10 23:08+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 07:10+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-11 04:40+0000\n" +"X-Generator: Launchpad (build 14640)\n" #. module: account_budget #: field:crossovered.budget,creating_user_id:0 @@ -263,7 +263,7 @@ msgstr "Bütçe" #. module: account_budget #: view:crossovered.budget:0 msgid "To Approve Budgets" -msgstr "" +msgstr "Bütçeleri Onaylama" #. module: account_budget #: code:addons/account_budget/account_budget.py:119 @@ -427,7 +427,7 @@ msgstr "den Analiz" #. module: account_budget #: view:crossovered.budget:0 msgid "Draft Budgets" -msgstr "" +msgstr "Taslak Bütçeler" #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Görüntüleme mimarisi için Geçersiz XML" diff --git a/addons/account_cancel/i18n/tr.po b/addons/account_cancel/i18n/tr.po index 14e7518ac63..9fcd4a2ae6f 100644 --- a/addons/account_cancel/i18n/tr.po +++ b/addons/account_cancel/i18n/tr.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-01-13 01:34+0000\n" -"Last-Translator: Arif Aydogmus \n" +"PO-Revision-Date: 2012-01-10 22:55+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:19+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-11 04:40+0000\n" +"X-Generator: Launchpad (build 14640)\n" #. module: account_cancel #: view:account.invoice:0 msgid "Cancel" -msgstr "" +msgstr "İptal Et" #~ msgid "Account Cancel" #~ msgstr "Hesabı iptal et" diff --git a/addons/account_coda/test_coda_file/Ontvangen CODA.2011-01-11-18.59.15.txt b/addons/account_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt similarity index 100% rename from addons/account_coda/test_coda_file/Ontvangen CODA.2011-01-11-18.59.15.txt rename to addons/account_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 3fc2d716e66..00c4b15b252 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -110,7 +110,7 @@ @@ -130,6 +120,9 @@
+ diff --git a/addons/product/product.py b/addons/product/product.py index a443ebe6033..e6b4b4c6348 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -214,7 +214,7 @@ class product_category(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True, translate=True, select=True), 'complete_name': fields.function(_name_get_fnc, type="char", string='Name'), - 'parent_id': fields.many2one('product.category','Parent Category', select=True), + 'parent_id': fields.many2one('product.category','Parent Category', select=True, ondelete='cascade'), 'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'), 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of product categories."), 'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'), diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py index 1577dddad73..2f4070db381 100644 --- a/addons/product_visible_discount/product_visible_discount.py +++ b/addons/product_visible_discount/product_visible_discount.py @@ -103,8 +103,8 @@ sale_order_line() class account_invoice_line(osv.osv): _inherit = "account.invoice.line" - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None): - res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context) + def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None): + res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context, company_id=company_id) def get_real_price(res_dict, product_id, qty, uom, pricelist): item_obj = self.pool.get('product.pricelist.item') diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index 1b25c9d15cc..bcf7aae2604 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -26,6 +26,7 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Project Management", + "sequence": 8, 'complexity': "easy", "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"], "depends": ["base_setup", "product", "analytic", "board", "mail", "resource"], diff --git a/addons/project/project.py b/addons/project/project.py index 5dcfef1a47e..aabea22da8e 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -522,13 +522,6 @@ class task(osv.osv): return {'value':{'partner_id':partner_id.id}} return {} - def _default_project(self, cr, uid, context=None): - if context is None: - context = {} - if 'project_id' in context and context['project_id']: - return int(context['project_id']) - return False - def duplicate_task(self, cr, uid, map_ids, context=None): for new in map_ids.values(): task = self.browse(cr, uid, new, context) @@ -642,7 +635,6 @@ class task(osv.osv): 'progress': 0, 'sequence': 10, 'active': True, - 'project_id': _default_project, 'user_id': lambda obj, cr, uid, context: uid, 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c) } diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index dab7e235671..28d451b9ee0 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -72,6 +72,7 @@ + 2 @@ -82,6 +83,7 @@ + 2 @@ -91,6 +93,7 @@ + 2 @@ -101,6 +104,7 @@ + 2 @@ -113,6 +117,7 @@ + 2 @@ -125,6 +130,7 @@ + 2 @@ -134,6 +140,7 @@ + 2 @@ -143,6 +150,7 @@ + 2 @@ -153,6 +161,7 @@ + 2 @@ -162,6 +171,7 @@ + 2 @@ -172,6 +182,7 @@ + 2 @@ -183,6 +194,7 @@ + 2 @@ -194,6 +206,7 @@ + 2 @@ -205,6 +218,7 @@ + 2 @@ -215,6 +229,7 @@ + 2 @@ -226,6 +241,7 @@ + 2 @@ -237,6 +253,7 @@ + 2 @@ -247,6 +264,7 @@ + 2 diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8f666067d50..c1b8fedbfb4 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -651,7 +651,7 @@ - + diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py index 7dae4706b70..2f4c19387d3 100644 --- a/addons/project_gtd/__openerp__.py +++ b/addons/project_gtd/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Todo Lists', 'version': '1.0', 'category': 'Project Management', + "sequence": 20, 'complexity': "easy", 'description': """ This module implements all concepts defined by the Getting Things Done methodology. diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py index 012f9b5e799..3fe54fc2a2f 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Issues Tracker', 'version': '1.0', 'category': 'Project Management', + "sequence": 22, 'complexity': "easy", 'description': """ This module provides Issues/Bugs Management in Project. diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po index 048e8d24a37..fabf4f2085e 100644 --- a/addons/project_timesheet/i18n/nl.po +++ b/addons/project_timesheet/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:46+0000\n" -"PO-Revision-Date: 2010-10-30 13:13+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-08 13:59+0000\n" +"Last-Translator: Erwin (Endian Solutions) \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: 2011-12-23 07:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-09 04:50+0000\n" +"X-Generator: Launchpad (build 14640)\n" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task @@ -51,12 +51,12 @@ msgstr "Urenstaat taak" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by year of date" -msgstr "" +msgstr "Groepeer per jaar of datum" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task Hours in current month" -msgstr "" +msgstr "Taakuren in huidige maand" #. module: project_timesheet #: constraint:project.task:0 @@ -94,7 +94,7 @@ msgstr "Groepeer op..." #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_triggerinvoice0 msgid "Trigger invoices from sale order lines" -msgstr "" +msgstr "Trigger facturatie van verkooporder regels" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -110,7 +110,7 @@ msgstr "Jaar" #. module: project_timesheet #: view:project.project:0 msgid "Billable" -msgstr "" +msgstr "Factureerbaar" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue @@ -137,7 +137,7 @@ msgstr "Fout! Project startdatum moet liggen voor project einddatum." #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue msgid "Customer Projects" -msgstr "" +msgstr "Klant projecten" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_account_analytic_line @@ -172,7 +172,7 @@ msgstr "Fout! U kunt geen recursieve taken aanmaken." #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours msgid "Timesheet Lines" -msgstr "" +msgstr "Urenstaat regels" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:231 @@ -183,12 +183,12 @@ msgstr "Ongeldige actie !" #. module: project_timesheet #: view:project.project:0 msgid "Billable Project" -msgstr "" +msgstr "Factureerbaar project" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts msgid "Contracts to Renew" -msgstr "" +msgstr "Te vernieuwen contracten" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in @@ -239,7 +239,7 @@ msgstr "Maak uw urenstaat compleet." #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task Hours in current year" -msgstr "" +msgstr "Taakuren huidige jaar" #. module: project_timesheet #: view:project.project:0 @@ -373,12 +373,12 @@ msgstr "September" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "December" -msgstr "" +msgstr "December" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0 msgid "After task is completed, Create its invoice." -msgstr "" +msgstr "Wanneer taak voltooid is, wordt een factuur gecreeërd" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -394,12 +394,12 @@ msgstr "report.timesheet.task.user" #: view:report.timesheet.task.user:0 #: field:report.timesheet.task.user,month:0 msgid "Month" -msgstr "" +msgstr "Maand" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form msgid "My Timesheet" -msgstr "" +msgstr "Mijn urenstaat" #. module: project_timesheet #: constraint:account.analytic.line:0 @@ -425,7 +425,7 @@ msgstr "" #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user #: view:report.timesheet.task.user:0 msgid "Task Hours Per Month" -msgstr "" +msgstr "Taak uren per maand" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0 @@ -472,3 +472,6 @@ msgstr "Urenstaat invullen" #~ "die regels\n" #~ "\n" #~ " " + +#~ msgid " Month " +#~ msgstr " Maand " diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 373c7b51fc2..2504eb811b1 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -24,6 +24,7 @@ 'name': 'Purchase Management', 'version': '1.1', 'category': 'Purchase Management', + "sequence": 19, 'complexity': "easy", 'description': """ Purchase module is for generating a purchase order for purchase of goods from a supplier. diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index f63b86f11f2..3895fd39667 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -743,10 +743,8 @@ class purchase_order_line(osv.osv): # - determine name and notes based on product in partner lang. lang = res_partner.browse(cr, uid, partner_id).lang - if lang: - context['lang'] = lang - context['partner_id'] = partner_id - product = product_product.browse(cr, uid, product_id, context=context) + context_partner = {'lang': lang, 'partner_id': partner_id} + product = product_product.browse(cr, uid, product_id, context=context_partner) res_value.update({'name': product.name, 'notes': notes or product.description_purchase}) # - set a domain on product_uom @@ -770,7 +768,6 @@ class purchase_order_line(osv.osv): qty = qty or 1.0 seller_delay = 0 - supplierinfo_ids = product_supplierinfo.search(cr, uid, [('name','=',partner_id),('product_id','=',product.id)]) for supplierinfo in product_supplierinfo.browse(cr, uid, supplierinfo_ids, context=context): seller_delay = supplierinfo.delay diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 7e828403437..c3753f5de3b 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -38,6 +38,7 @@ import time import logging from mako.template import Template +from mako.lookup import TemplateLookup from mako import exceptions import netsvc @@ -56,8 +57,8 @@ def mako_template(text): This template uses UTF-8 encoding """ - # default_filters=['unicode', 'h'] can be used to set global filters - return Template(text, input_encoding='utf-8', output_encoding='utf-8') + tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance + return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup) class WebKitParser(report_sxw): diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 318e305b8ea..d4b37bf311c 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -23,6 +23,7 @@ 'name': 'Sales Management', 'version': '1.0', 'category': 'Sales Management', + "sequence": 14, 'complexity': "easy", 'description': """ The base module to manage quotations and sales orders. diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po index 1660ab7a4ff..c7bfa423c6c 100644 --- a/addons/sale/i18n/ar.po +++ b/addons/sale/i18n/ar.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-11-05 10:31+0000\n" -"Last-Translator: Ahmad Khayyat \n" +"PO-Revision-Date: 2012-01-09 21:43+0000\n" +"Last-Translator: kifcaliph \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: 2011-12-23 06:46+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-10 05:22+0000\n" +"X-Generator: Launchpad (build 14640)\n" #. module: sale #: field:sale.config.picking_policy,timesheet:0 @@ -81,7 +81,7 @@ msgstr "تم تحويل العرض المالي '%s' إلى طلب مبيعات" #: code:addons/sale/wizard/sale_make_invoice.py:42 #, python-format msgid "Warning !" -msgstr "" +msgstr "تحذير !" #. module: sale #: report:sale.order:0 @@ -1505,7 +1505,7 @@ msgstr "" #. module: sale #: field:sale.order,origin:0 msgid "Source Document" -msgstr "المستند المصدر" +msgstr "مستند المصدر" #. module: sale #: view:sale.order.line:0 diff --git a/addons/sale/sale.py b/addons/sale/sale.py index af5cb906ec9..4f430c0a957 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -206,7 +206,7 @@ class sale_order(osv.osv): ('invoice_except', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled') - ], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True), + ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True), 'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}), 'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."), 'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."), diff --git a/addons/sale_order_dates/i18n/ro.po b/addons/sale_order_dates/i18n/ro.po new file mode 100644 index 00000000000..66d845dd2b3 --- /dev/null +++ b/addons/sale_order_dates/i18n/ro.po @@ -0,0 +1,71 @@ +# Romanian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:46+0000\n" +"PO-Revision-Date: 2012-01-07 21:40+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-08 05:04+0000\n" +"X-Generator: Launchpad (build 14640)\n" + +#. module: sale_order_dates +#: sql_constraint:sale.order:0 +msgid "Order Reference must be unique per Company!" +msgstr "" + +#. module: sale_order_dates +#: help:sale.order,requested_date:0 +msgid "Date on which customer has requested for sales." +msgstr "Data la care clientul a cerut vanzarea." + +#. module: sale_order_dates +#: field:sale.order,commitment_date:0 +msgid "Commitment Date" +msgstr "Data angajamentului" + +#. module: sale_order_dates +#: field:sale.order,effective_date:0 +msgid "Effective Date" +msgstr "Data efectivă" + +#. module: sale_order_dates +#: help:sale.order,effective_date:0 +msgid "Date on which picking is created." +msgstr "Data cand este creată ridicarea." + +#. module: sale_order_dates +#: field:sale.order,requested_date:0 +msgid "Requested Date" +msgstr "Data solicitată" + +#. module: sale_order_dates +#: model:ir.model,name:sale_order_dates.model_sale_order +msgid "Sales Order" +msgstr "Comandă de vânzare" + +#. module: sale_order_dates +#: help:sale.order,commitment_date:0 +msgid "Date on which delivery of products is to be made." +msgstr "Data cand va fi efectuată livrarea produselor." + +#~ msgid "Order Reference must be unique !" +#~ msgstr "Referinţa comenzii trebuie să fie unică !" + +#~ msgid "" +#~ "\n" +#~ "Add commitment, requested and effective dates on the sales order.\n" +#~ msgstr "" +#~ "\n" +#~ "Adaugă angajamentul, datele solicitate si efective pe comanda de vanzare.\n" + +#~ msgid "Sales Order Dates" +#~ msgstr "Date comenzi de vânzare" diff --git a/addons/share/i18n/ro.po b/addons/share/i18n/ro.po new file mode 100644 index 00000000000..c6969521871 --- /dev/null +++ b/addons/share/i18n/ro.po @@ -0,0 +1,544 @@ +# Romanian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:46+0000\n" +"PO-Revision-Date: 2012-01-07 22:47+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-08 05:04+0000\n" +"X-Generator: Launchpad (build 14640)\n" + +#. module: share +#: field:share.wizard,embed_option_title:0 +msgid "Display title" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Access granted!" +msgstr "" + +#. module: share +#: field:share.wizard,user_type:0 +msgid "Sharing method" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Share with these people (one e-mail per line)" +msgstr "" + +#. module: share +#: field:share.wizard,name:0 +msgid "Share Title" +msgstr "" + +#. module: share +#: model:ir.module.category,name:share.module_category_share +msgid "Sharing" +msgstr "Partajare" + +#. module: share +#: field:share.wizard,share_root_url:0 +msgid "Share Access URL" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:783 +#, python-format +msgid "You may use your current login (%s) and password to view them.\n" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:602 +#, python-format +msgid "(Modified)" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:770 +#, python-format +msgid "" +"The documents are not attached, you can view them online directly on my " +"OpenERP server at:" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:580 +#, python-format +msgid "Sharing filter created by user %s (%s) for group %s" +msgstr "" + +#. module: share +#: field:share.wizard,embed_url:0 +#: field:share.wizard.result.line,share_url:0 +msgid "Share URL" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:777 +#, python-format +msgid "These are your credentials to access this protected area:\n" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:644 +#, python-format +msgid "You must be a member of the Share/User group to use the share wizard" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Access info" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Share" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:552 +#, python-format +msgid "(Duplicated for modified sharing permissions)" +msgstr "" + +#. module: share +#: help:share.wizard,domain:0 +msgid "Optional domain for further data filtering" +msgstr "" + +#. module: share +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Nu pot exista doi utilizatori cu acelasi nume de autentificare !" + +#. module: share +#: model:ir.model,name:share.model_ir_model_access +msgid "ir.model.access" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Next" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:778 +#, python-format +msgid "Username" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Sharing Options" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:766 +#, python-format +msgid "Hello," +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Close" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:641 +#, python-format +msgid "Action and Access Mode are required to create a shared access" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "" +"Please select the action that opens the screen containing the data you want " +"to share." +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:782 +#, python-format +msgid "" +"The documents have been automatically added to your current OpenERP " +"documents.\n" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Cancel" +msgstr "" + +#. module: share +#: field:res.groups,share:0 +msgid "Share Group" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:757 +#, python-format +msgid "Email required" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "" +"Optionally, you may specify an additional domain restriction that will be " +"applied to the shared data." +msgstr "" + +#. module: share +#: help:share.wizard,name:0 +msgid "Title for the share (displayed to users as menu and shortcut name)" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Options" +msgstr "" + +#. module: share +#: view:res.groups:0 +msgid "Regular groups only (no share groups" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:788 +#, python-format +msgid "" +"OpenERP is a powerful and user-friendly suite of Business Applications (CRM, " +"Sales, HR, etc.)\n" +"It is open source and can be found on http://www.openerp.com." +msgstr "" + +#. module: share +#: field:share.wizard,action_id:0 +msgid "Action to share" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Optional: include a personal message" +msgstr "" + +#. module: share +#: field:res.users,share:0 +msgid "Share User" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:648 +#, python-format +msgid "Please indicate the emails of the persons to share with, one per line" +msgstr "" + +#. module: share +#: field:share.wizard,embed_code:0 +#: field:share.wizard.result.line,user_id:0 +msgid "unknown" +msgstr "" + +#. module: share +#: help:res.groups,share:0 +msgid "Group created to set access rights for sharing data with some users." +msgstr "" +"Grup creat pentru a seta drepturile de acces pentru impărtirea datelor cu " +"unii utilizatori." + +#. module: share +#: help:share.wizard,action_id:0 +msgid "" +"The action that opens the screen containing the data you wish to share." +msgstr "" + +#. module: share +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" +"Compania aleasă nu se află printre companiile permise acestui utilizator" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:527 +#, python-format +msgid "(Copy for sharing)" +msgstr "" + +#. module: share +#: field:share.wizard.result.line,newly_created:0 +msgid "Newly created" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:617 +#, python-format +msgid "Indirect sharing filter created by user %s (%s) for group %s" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:768 +#, python-format +msgid "I've shared %s with you!" +msgstr "" + +#. module: share +#: help:share.wizard,share_root_url:0 +msgid "Main access page for users that are granted shared access" +msgstr "" + +#. module: share +#: sql_constraint:res.groups:0 +msgid "The name of the group must be unique !" +msgstr "" + +#. module: share +#: model:res.groups,name:share.group_share_user +msgid "User" +msgstr "" + +#. module: share +#: view:res.groups:0 +msgid "Groups" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:637 +#, python-format +msgid "" +"Sorry, the current screen and filter you are trying to share are not " +"supported at the moment.\n" +"You may want to try a simpler filter." +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Use this link" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:780 +#, python-format +msgid "Database" +msgstr "" + +#. module: share +#: field:share.wizard,domain:0 +msgid "Domain" +msgstr "" + +#. module: share +#: view:share.wizard:0 +#: field:share.wizard,result_line_ids:0 +msgid "Summary" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:494 +#, python-format +msgid "Copied access for sharing" +msgstr "" + +#. module: share +#: model:ir.actions.act_window,name:share.action_share_wizard_step1 +msgid "Share your documents" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Or insert the following code where you want to embed your documents" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "" +"An e-mail notification with instructions has been sent to the following " +"people:" +msgstr "" + +#. module: share +#: model:ir.model,name:share.model_share_wizard_result_line +msgid "share.wizard.result.line" +msgstr "" + +#. module: share +#: help:share.wizard,user_type:0 +msgid "Select the type of user(s) you would like to share data with." +msgstr "" + +#. module: share +#: field:share.wizard,view_type:0 +msgid "Current View Type" +msgstr "" + +#. module: share +#: selection:share.wizard,access_mode:0 +msgid "Can view" +msgstr "" + +#. module: share +#: selection:share.wizard,access_mode:0 +msgid "Can edit" +msgstr "" + +#. module: share +#: help:share.wizard,message:0 +msgid "" +"An optional personal message, to be included in the e-mail notification." +msgstr "" + +#. module: share +#: model:ir.model,name:share.model_res_users +msgid "res.users" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:60 +#: code:addons/share/wizard/share_wizard.py:636 +#, python-format +msgid "Sharing access could not be created" +msgstr "" + +#. module: share +#: help:res.users,share:0 +msgid "" +"External user with limited access, created only for the purpose of sharing " +"data." +msgstr "" + +#. module: share +#: model:ir.actions.act_window,name:share.action_share_wizard +#: model:ir.model,name:share.model_share_wizard +#: field:share.wizard.result.line,share_wizard_id:0 +msgid "Share Wizard" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:741 +#, python-format +msgid "Shared access created!" +msgstr "" + +#. module: share +#: model:res.groups,comment:share.group_share_user +msgid "" +"\n" +"Members of this groups have access to the sharing wizard, which allows them " +"to invite external users to view or edit some of their documents." +msgstr "" + +#. module: share +#: model:ir.model,name:share.model_res_groups +msgid "Access Groups" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:779 +#: field:share.wizard.result.line,password:0 +#, python-format +msgid "Password" +msgstr "" + +#. module: share +#: field:share.wizard,new_users:0 +msgid "Emails" +msgstr "" + +#. module: share +#: field:share.wizard,embed_option_search:0 +msgid "Display search view" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:198 +#, python-format +msgid "No e-mail address configured" +msgstr "" + +#. module: share +#: field:share.wizard,message:0 +msgid "Personal Message" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:757 +#, python-format +msgid "" +"The current user must have an email address configured in User Preferences " +"to be able to send outgoing emails." +msgstr "" + +#. module: share +#: field:share.wizard.result.line,login:0 +msgid "Login" +msgstr "" + +#. module: share +#: view:res.users:0 +msgid "Regular users only (no share user)" +msgstr "" + +#. module: share +#: field:share.wizard,access_mode:0 +msgid "Access Mode" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Sharing: preparation" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:199 +#, python-format +msgid "" +"You must configure your e-mail address in the user preferences before using " +"the Share button." +msgstr "" + +#. module: share +#: help:share.wizard,access_mode:0 +msgid "Access rights to be granted on the shared documents." +msgstr "" + +#~ msgid "Who would you want to share this data with?" +#~ msgstr "Cu cine doriti să impărtiti aceste date?" + +#, python-format +#~ msgid "" +#~ "Dear,\n" +#~ "\n" +#~ msgstr "" +#~ "Stimate,\n" +#~ "\n" + +#, python-format +#~ msgid "" +#~ "This additional data has been automatically added to your current access.\n" +#~ msgstr "" +#~ "Aceste date suplimentare au fost adăugate automat pentru accesul " +#~ "dumneavoastră curent.\n" + +#~ msgid "Existing External Users" +#~ msgstr "Utilizatori externi existenti" + +#, python-format +#~ msgid "" +#~ "You may use your existing login and password to view it. As a reminder, your " +#~ "login is %s.\n" +#~ msgstr "" +#~ "Puteti folosi numele de autentificare si parola existentă pentru " +#~ "vizualizare. Pentru a vă aminti, numele de autentificare este %s.\n" + +#, python-format +#~ msgid "Sharing Wizard - Step 1" +#~ msgstr "Wizard partajare - Pasul 1" diff --git a/addons/share/i18n/tr.po b/addons/share/i18n/tr.po new file mode 100644 index 00000000000..26585265b4a --- /dev/null +++ b/addons/share/i18n/tr.po @@ -0,0 +1,527 @@ +# Turkish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:46+0000\n" +"PO-Revision-Date: 2012-01-11 00:04+0000\n" +"Last-Translator: Ahmet Altınışık \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-11 04:40+0000\n" +"X-Generator: Launchpad (build 14640)\n" + +#. module: share +#: field:share.wizard,embed_option_title:0 +msgid "Display title" +msgstr "Başlık Göster" + +#. module: share +#: view:share.wizard:0 +msgid "Access granted!" +msgstr "Erişim Verildi!" + +#. module: share +#: field:share.wizard,user_type:0 +msgid "Sharing method" +msgstr "Paylaşım Metodu" + +#. module: share +#: view:share.wizard:0 +msgid "Share with these people (one e-mail per line)" +msgstr "Şu kişilerle paylaş (her satırda bir e-posta)" + +#. module: share +#: field:share.wizard,name:0 +msgid "Share Title" +msgstr "Paylaşım Başlığı" + +#. module: share +#: model:ir.module.category,name:share.module_category_share +msgid "Sharing" +msgstr "Paylaşım" + +#. module: share +#: field:share.wizard,share_root_url:0 +msgid "Share Access URL" +msgstr "Erişim Adresini (URL) Paylaş" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:783 +#, python-format +msgid "You may use your current login (%s) and password to view them.\n" +msgstr "Görmek için şuanki kullanıcı (%s) ve şifrenizi kullanabilirsiniz.\n" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:602 +#, python-format +msgid "(Modified)" +msgstr "(Değiştirildi)" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:770 +#, python-format +msgid "" +"The documents are not attached, you can view them online directly on my " +"OpenERP server at:" +msgstr "" +"Dökümanlar mesaja eklenmedi. Online olarak doğrudan sunucumuzdaki şu " +"adresten inceleyebilirsiniz:" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:580 +#, python-format +msgid "Sharing filter created by user %s (%s) for group %s" +msgstr "" +"%s (%s) kullanıcısı tarafından %s grubu için oluşturulan Paylaşım filtresi" + +#. module: share +#: field:share.wizard,embed_url:0 +#: field:share.wizard.result.line,share_url:0 +msgid "Share URL" +msgstr "Paylaşım Adresi" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:777 +#, python-format +msgid "These are your credentials to access this protected area:\n" +msgstr "Korumalı alana erişebilmek için kimlik bilgileriniz:\n" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:644 +#, python-format +msgid "You must be a member of the Share/User group to use the share wizard" +msgstr "" +"Paylaşım sihirbazını çalıştırabilmek için Paylaşım/kullanıcı grubuna üye " +"olmalısınız" + +#. module: share +#: view:share.wizard:0 +msgid "Access info" +msgstr "Erişim Bilgisi" + +#. module: share +#: view:share.wizard:0 +msgid "Share" +msgstr "Paylaş" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:552 +#, python-format +msgid "(Duplicated for modified sharing permissions)" +msgstr "(Değiştirilmiş paylaşım izinleri için çoğaltıldı)" + +#. module: share +#: help:share.wizard,domain:0 +msgid "Optional domain for further data filtering" +msgstr "ileri veri filtreleme için opsiyonel alan" + +#. module: share +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !" + +#. module: share +#: model:ir.model,name:share.model_ir_model_access +msgid "ir.model.access" +msgstr "ir.model.access" + +#. module: share +#: view:share.wizard:0 +msgid "Next" +msgstr "Sonraki" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:778 +#, python-format +msgid "Username" +msgstr "Kullanıcı Adı" + +#. module: share +#: view:share.wizard:0 +msgid "Sharing Options" +msgstr "Paylaşım Seçenekleri" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:766 +#, python-format +msgid "Hello," +msgstr "Merhaba," + +#. module: share +#: view:share.wizard:0 +msgid "Close" +msgstr "Kapat" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:641 +#, python-format +msgid "Action and Access Mode are required to create a shared access" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "" +"Please select the action that opens the screen containing the data you want " +"to share." +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:782 +#, python-format +msgid "" +"The documents have been automatically added to your current OpenERP " +"documents.\n" +msgstr "" +"Dökümanlar otomatik olarak halihazırda paylaşılmış olan OpenERP " +"dökümanlarınıza eklendi.\n" + +#. module: share +#: view:share.wizard:0 +msgid "Cancel" +msgstr "İptal" + +#. module: share +#: field:res.groups,share:0 +msgid "Share Group" +msgstr "Paylaşım Grubu" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:757 +#, python-format +msgid "Email required" +msgstr "E-posta Gerekli" + +#. module: share +#: view:share.wizard:0 +msgid "" +"Optionally, you may specify an additional domain restriction that will be " +"applied to the shared data." +msgstr "" + +#. module: share +#: help:share.wizard,name:0 +msgid "Title for the share (displayed to users as menu and shortcut name)" +msgstr "" +"Paylaşım için Başlık (Kullanıcıya bir menü ve kısayol adı olarak " +"gösterilecek)" + +#. module: share +#: view:share.wizard:0 +msgid "Options" +msgstr "Seçenekler" + +#. module: share +#: view:res.groups:0 +msgid "Regular groups only (no share groups" +msgstr "Sadece normal gruplar (paylaşım grupları değil)" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:788 +#, python-format +msgid "" +"OpenERP is a powerful and user-friendly suite of Business Applications (CRM, " +"Sales, HR, etc.)\n" +"It is open source and can be found on http://www.openerp.com." +msgstr "---" + +#. module: share +#: field:share.wizard,action_id:0 +msgid "Action to share" +msgstr "Paylaşılacak Eylem" + +#. module: share +#: view:share.wizard:0 +msgid "Optional: include a personal message" +msgstr "Opsiyonel:Kişisel bir mesaj ekle" + +#. module: share +#: field:res.users,share:0 +msgid "Share User" +msgstr "Paylaşım Kullanıcısı" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:648 +#, python-format +msgid "Please indicate the emails of the persons to share with, one per line" +msgstr "" +"Lütfen paylaşımın yapılacağı kişilerin e-postalarını girin, her satıra bir " +"kişi" + +#. module: share +#: field:share.wizard,embed_code:0 +#: field:share.wizard.result.line,user_id:0 +msgid "unknown" +msgstr "bilinmeyen" + +#. module: share +#: help:res.groups,share:0 +msgid "Group created to set access rights for sharing data with some users." +msgstr "" +"Verilerinizi bazı kullanıcılarla paylaşırken erişim haklarını düzenlemek " +"için grup oluşturuldu." + +#. module: share +#: help:share.wizard,action_id:0 +msgid "" +"The action that opens the screen containing the data you wish to share." +msgstr "" + +#. module: share +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "Seçilen firma bu kullanıcı için izin verilen şirketler arasında yok" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:527 +#, python-format +msgid "(Copy for sharing)" +msgstr "(paylaşım için kopya)" + +#. module: share +#: field:share.wizard.result.line,newly_created:0 +msgid "Newly created" +msgstr "Yeni Oluşturuldu" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:617 +#, python-format +msgid "Indirect sharing filter created by user %s (%s) for group %s" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:768 +#, python-format +msgid "I've shared %s with you!" +msgstr "Sizinle %s paylaştım!" + +#. module: share +#: help:share.wizard,share_root_url:0 +msgid "Main access page for users that are granted shared access" +msgstr "Paylaşılmış erişim hakkı olan kullanıcılar için ana erişim sayfası" + +#. module: share +#: sql_constraint:res.groups:0 +msgid "The name of the group must be unique !" +msgstr "Grup adı tekil olmalı !" + +#. module: share +#: model:res.groups,name:share.group_share_user +msgid "User" +msgstr "Kullanıcı" + +#. module: share +#: view:res.groups:0 +msgid "Groups" +msgstr "Gruplar" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:637 +#, python-format +msgid "" +"Sorry, the current screen and filter you are trying to share are not " +"supported at the moment.\n" +"You may want to try a simpler filter." +msgstr "" +"Üzgünüm, paylaşmaya çalıştığınız şu anki ekran ve filtre henüz paylaşım için " +"desteklenmiyor.\n" +"Daha basit bir filtre deneyebilirsiniz." + +#. module: share +#: view:share.wizard:0 +msgid "Use this link" +msgstr "Bu adrese gidin" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:780 +#, python-format +msgid "Database" +msgstr "Veritabanı" + +#. module: share +#: field:share.wizard,domain:0 +msgid "Domain" +msgstr "Alan adı" + +#. module: share +#: view:share.wizard:0 +#: field:share.wizard,result_line_ids:0 +msgid "Summary" +msgstr "Özet" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:494 +#, python-format +msgid "Copied access for sharing" +msgstr "Paylaşım için kopyalanmış erişim" + +#. module: share +#: model:ir.actions.act_window,name:share.action_share_wizard_step1 +msgid "Share your documents" +msgstr "Dökümanlarınızı Paylaşın" + +#. module: share +#: view:share.wizard:0 +msgid "Or insert the following code where you want to embed your documents" +msgstr "ya da dökümanlarınızı gömmek istediğiniz yere kodu yerleştirin" + +#. module: share +#: view:share.wizard:0 +msgid "" +"An e-mail notification with instructions has been sent to the following " +"people:" +msgstr "" +"Talimatları içeren bir e-posta mesajı, aşağıdaki kişilere gönderildi:" + +#. module: share +#: model:ir.model,name:share.model_share_wizard_result_line +msgid "share.wizard.result.line" +msgstr "share.wizard.result.line" + +#. module: share +#: help:share.wizard,user_type:0 +msgid "Select the type of user(s) you would like to share data with." +msgstr "Verileri paylaşmak istediğiniz kullanıcıların tiplerini seçiniz" + +#. module: share +#: field:share.wizard,view_type:0 +msgid "Current View Type" +msgstr "Şimdiki Ekran Tipi" + +#. module: share +#: selection:share.wizard,access_mode:0 +msgid "Can view" +msgstr "Görüntüleyebilir" + +#. module: share +#: selection:share.wizard,access_mode:0 +msgid "Can edit" +msgstr "Düzenleyebilir" + +#. module: share +#: help:share.wizard,message:0 +msgid "" +"An optional personal message, to be included in the e-mail notification." +msgstr "E-posta mesajına eklemek için, kişisel mesaj (opsiyonel)" + +#. module: share +#: model:ir.model,name:share.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:60 +#: code:addons/share/wizard/share_wizard.py:636 +#, python-format +msgid "Sharing access could not be created" +msgstr "Paylaşım hakları oluşturulamadı" + +#. module: share +#: help:res.users,share:0 +msgid "" +"External user with limited access, created only for the purpose of sharing " +"data." +msgstr "Sadece veri paylaşımı amaçlı, kısıtlı erişimi olan dış kullanıcı," + +#. module: share +#: model:ir.actions.act_window,name:share.action_share_wizard +#: model:ir.model,name:share.model_share_wizard +#: field:share.wizard.result.line,share_wizard_id:0 +msgid "Share Wizard" +msgstr "Paylaşım Sihirbazı" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:741 +#, python-format +msgid "Shared access created!" +msgstr "Paylaşım izni oluşturuldu!" + +#. module: share +#: model:res.groups,comment:share.group_share_user +msgid "" +"\n" +"Members of this groups have access to the sharing wizard, which allows them " +"to invite external users to view or edit some of their documents." +msgstr "" + +#. module: share +#: model:ir.model,name:share.model_res_groups +msgid "Access Groups" +msgstr "Erişim Grupları" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:779 +#: field:share.wizard.result.line,password:0 +#, python-format +msgid "Password" +msgstr "Parola" + +#. module: share +#: field:share.wizard,new_users:0 +msgid "Emails" +msgstr "E-postalar" + +#. module: share +#: field:share.wizard,embed_option_search:0 +msgid "Display search view" +msgstr "Arama Ekranını Göster" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:198 +#, python-format +msgid "No e-mail address configured" +msgstr "Hiç bir E-posta adresi tanımlanmamış" + +#. module: share +#: field:share.wizard,message:0 +msgid "Personal Message" +msgstr "Kişisel Mesaj" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:757 +#, python-format +msgid "" +"The current user must have an email address configured in User Preferences " +"to be able to send outgoing emails." +msgstr "" +"Geçerli kullanıcının e-posta gönderebilmesi için kullanıcı seçeneklerinde e-" +"posta adresi girilmelidir." + +#. module: share +#: field:share.wizard.result.line,login:0 +msgid "Login" +msgstr "Giriş Yap" + +#. module: share +#: view:res.users:0 +msgid "Regular users only (no share user)" +msgstr "Sadece normal kullanıcılar (paylaşım kullanıcısı değil)" + +#. module: share +#: field:share.wizard,access_mode:0 +msgid "Access Mode" +msgstr "" + +#. module: share +#: view:share.wizard:0 +msgid "Sharing: preparation" +msgstr "" + +#. module: share +#: code:addons/share/wizard/share_wizard.py:199 +#, python-format +msgid "" +"You must configure your e-mail address in the user preferences before using " +"the Share button." +msgstr "" + +#. module: share +#: help:share.wizard,access_mode:0 +msgid "Access rights to be granted on the shared documents." +msgstr "" diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 393d50e3181..5b800b43050 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -48,6 +48,7 @@ Thanks to the double entry management, the inventory controlling is powerful and "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"], "depends" : ["product", "account"], "category" : "Warehouse Management", + "sequence": 16, "init_xml" : [], "demo_xml" : [ "stock_demo.xml", diff --git a/addons/stock/product.py b/addons/stock/product.py index a6198ef83a3..304fa8dcd87 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -184,6 +184,7 @@ class product_product(osv.osv): location_obj = self.pool.get('stock.location') warehouse_obj = self.pool.get('stock.warehouse') + shop_obj = self.pool.get('sale.shop') states = context.get('states',[]) what = context.get('what',()) @@ -193,18 +194,15 @@ class product_product(osv.osv): if not ids: return res - # TODO: write in more ORM way, less queries, more pg84 magic if context.get('shop', False): - cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),)) - res2 = cr.fetchone() - if res2: - context['warehouse'] = res2[0] + warehouse_id = shop_obj.read(cr, uid, int(context['shop']), ['warehouse_id'])['warehouse_id'][0] + if warehouse_id: + context['warehouse'] = warehouse_id if context.get('warehouse', False): - cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),)) - res2 = cr.fetchone() - if res2: - context['location'] = res2[0] + lot_id = warehouse_obj.read(cr, uid, int(context['warehouse']), ['lot_stock_id'])['lot_stock_id'][0] + if lot_id: + context['location'] = lot_id if context.get('location', False): if type(context['location']) == type(1): diff --git a/addons/stock/stock.py b/addons/stock/stock.py index cd9242c6b1f..6acde78f419 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -529,9 +529,8 @@ class stock_tracking(osv.osv): @param context: A standard dictionary @return: A dictionary of values """ - value={} - value=self.pool.get('action.traceability').action_traceability(cr,uid,ids,context) - return value + return self.pool.get('action.traceability').action_traceability(cr,uid,ids,context) + stock_tracking() #---------------------------------------------------------- @@ -2613,6 +2612,13 @@ class stock_inventory(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c) } + def copy(self, cr, uid, id, default=None, context=None): + if default is None: + default = {} + default = default.copy() + default.update({'move_ids': [], 'date_done': False}) + return super(stock_inventory, self).copy(cr, uid, id, default, context=context) + def _inventory_line_hook(self, cr, uid, inventory_line, move_vals): """ Creates a stock move from an inventory line @param inventory_line: diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 2ba44fb6e97..f4409cd90b4 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -217,9 +217,9 @@