diff --git a/addons/account/account.py b/addons/account/account.py index 68af88754f5..ebc1f23a44d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2634,7 +2634,8 @@ class account_fiscal_position_template(osv.osv): 'name': fields.char('Fiscal Position Template', size=64, required=True), 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True), 'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'), - 'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping') + 'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping'), + 'note': fields.text('Notes', translate=True), } account_fiscal_position_template() @@ -2718,7 +2719,7 @@ class account_financial_report(osv.osv): return res _columns = { - 'name': fields.char('Report Name', size=128, required=True), + 'name': fields.char('Report Name', size=128, required=True, translate=True), 'parent_id': fields.many2one('account.financial.report', 'Parent'), 'children_ids': fields.one2many('account.financial.report', 'parent_id', 'Account Report'), 'sequence': fields.integer('Sequence'), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 92d71339168..e105765a31c 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1259,7 +1259,7 @@ class account_move_line(osv.osv): break # Automatically convert in the account's secondary currency if there is one and # the provided values were not already multi-currency - if account.currency_id and not vals.get('ammount_currency') and account.currency_id.id != account.company_id.currency_id.id: + if account.currency_id and (vals.get('amount_currency', False) is False) and account.currency_id.id != account.company_id.currency_id.id: vals['currency_id'] = account.currency_id.id ctx = {} if 'date' in vals: diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 54abae1d992..ec9ded68a12 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -45,7 +45,7 @@ - + @@ -65,6 +65,7 @@ + diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml index 479afd2f2e2..5ec7405d719 100644 --- a/addons/account/test/account_change_currency.yml +++ b/addons/account/test/account_change_currency.yml @@ -33,11 +33,11 @@ - !python {model: account.change.currency}: | self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US', - "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids": + "active_model": "account.invoice", "tz": False, "active_ids": [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"), }) self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US', - "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids": + "active_model": "account.invoice", "tz": False, "active_ids": [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"), }) - @@ -71,7 +71,7 @@ - !python {model: account.change.currency}: | self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US', - "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids": + "active_model": "account.invoice", "tz": False, "active_ids": [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"), }) - diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml index a18adaa0320..a2fe0b3c689 100644 --- a/addons/account/wizard/account_automatic_reconcile_view.xml +++ b/addons/account/wizard/account_automatic_reconcile_view.xml @@ -42,7 +42,7 @@ form tree,form - {'record_id':active_id} + {} new diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml index 336766a2f42..4504f064a1d 100644 --- a/addons/account/wizard/account_change_currency_view.xml +++ b/addons/account/wizard/account_change_currency_view.xml @@ -25,7 +25,7 @@ form form - {'record_id' : active_id} + {} new diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml index 457e144e4ab..d7ac5e85d07 100644 --- a/addons/account/wizard/account_reconcile_partner_process_view.xml +++ b/addons/account/wizard/account_reconcile_partner_process_view.xml @@ -28,7 +28,7 @@ form tree,form - {'record_id':active_id} + {} new diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml index fb0952e4614..bd54b925eea 100644 --- a/addons/account/wizard/account_report_aged_partner_balance_view.xml +++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml @@ -37,7 +37,7 @@ form tree,form - {'record_id':active_id} + {} new diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml index 679ef1aa456..6dbe6d7b77b 100644 --- a/addons/account/wizard/account_report_partner_balance_view.xml +++ b/addons/account/wizard/account_report_partner_balance_view.xml @@ -29,7 +29,7 @@ form tree,form - {'record_id':active_id} + {} new This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance. diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml index 97dcdf8d3f2..c3c731c1954 100644 --- a/addons/account/wizard/account_report_partner_ledger_view.xml +++ b/addons/account/wizard/account_report_partner_ledger_view.xml @@ -34,7 +34,7 @@ form tree,form - {'record_id':active_id} + {} new diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml index 563a15bff73..d3b68cb5186 100644 --- a/addons/account/wizard/account_state_open_view.xml +++ b/addons/account/wizard/account_state_open_view.xml @@ -27,7 +27,7 @@ form form - {'record_id' : active_id} + {} new diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml index 714d64fb400..2efe457b1e2 100644 --- a/addons/account/wizard/account_unreconcile_view.xml +++ b/addons/account/wizard/account_unreconcile_view.xml @@ -64,7 +64,7 @@ form form - {'record_id' : active_id} + {} new diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml index fa3a2774a77..d12ae8d847f 100644 --- a/addons/account/wizard/account_validate_move_view.xml +++ b/addons/account/wizard/account_validate_move_view.xml @@ -66,7 +66,7 @@ form form - {'record_id' : active_id} + {} new This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore. diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 005e5d9ab46..a5ae75cefa9 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -781,7 +781,7 @@ class account_voucher(osv.osv): if not (tax_data.base_code_id and tax_data.tax_code_id): raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name)) sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1 - move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or 0.0 + move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or False voucher_line = move_line_pool.create(cr, uid, move_line) rec_ids = [voucher_line, line.move_line_id.id] @@ -843,8 +843,8 @@ class account_voucher(osv.osv): 'date': inv.date, 'credit': diff > 0 and diff or 0.0, 'debit': diff < 0 and -diff or 0.0, - #'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0, - #'currency_id': company_currency <> current_currency and current_currency or False, + 'amount_currency': company_currency <> current_currency and inv.writeoff_amount or False, + 'currency_id': company_currency <> current_currency and current_currency or False, } move_line_pool.create(cr, uid, move_line) self.write(cr, uid, [inv.id], { @@ -1056,7 +1056,7 @@ class account_bank_statement_line(osv.osv): for obj in self.browse(cr, uid, ids, context=context): if obj.voucher_id: diff = abs(obj.amount) - obj.voucher_id.amount - if not self.pool.get('res.currency').is_zero(cr, uid, obj.voucher_id.currency_id, diff): + if not self.pool.get('res.currency').is_zero(cr, uid, obj.statement_id.currency, diff): return False return True diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 3c6a36b965e..18f267a1df1 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1005,7 +1005,7 @@ class calendar_event(osv.osv): return result _columns = { - 'id': fields.integer('ID'), + 'id': fields.integer('ID', readonly=True), 'sequence': fields.integer('Sequence'), 'name': fields.char('Description', size=64, required=False, states={'done': [('readonly', True)]}), 'date': fields.datetime('Date', states={'done': [('readonly', True)]}), diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index d09e0bf8ba5..b53028c952a 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -133,7 +133,7 @@ class crm_lead(crm_case, osv.osv): 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', select=True, help="Optional linked partner, usually after conversion of the lead"), - 'id': fields.integer('ID'), + 'id': fields.integer('ID', readonly=True), 'name': fields.char('Name', size=64, select=1), 'active': fields.boolean('Active', required=False), 'date_action_last': fields.datetime('Last Action', readonly=1), diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index c3381601cbf..40ba8662f13 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -52,7 +52,7 @@ class crm_meeting(crm_base, osv.osv): 'section_id': fields.many2one('crm.case.section', 'Sales Team', states={'done': [('readonly', True)]}, \ select=True, help='Sales team to which Case belongs to.'), 'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."), - 'id': fields.integer('ID'), + 'id': fields.integer('ID', readonly=True), 'create_date': fields.datetime('Creation Date' , readonly=True), 'write_date': fields.datetime('Write Date' , readonly=True), 'date_action_last': fields.datetime('Last Action', readonly=1), diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index d5d7d6c5614..748f85ad063 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -34,7 +34,7 @@ class crm_phonecall(crm_base, osv.osv): _order = "id desc" _columns = { # From crm.case - 'id': fields.integer('ID'), + 'id': fields.integer('ID', readonly=True), 'name': fields.char('Call Summary', size=64), 'active': fields.boolean('Active', required=False), 'date_action_last': fields.datetime('Last Action', readonly=1), diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py index a935162e98e..07ba7460dec 100644 --- a/addons/crm_fundraising/crm_fundraising.py +++ b/addons/crm_fundraising/crm_fundraising.py @@ -33,7 +33,7 @@ class crm_fundraising(crm.crm_case, osv.osv): _order = "id desc" _inherit = ['mail.thread'] _columns = { - 'id': fields.integer('ID'), + 'id': fields.integer('ID', readonly=True), 'name': fields.char('Name', size=128, required=True), 'active': fields.boolean('Active', required=False), 'date_action_last': fields.datetime('Last Action', readonly=1), diff --git a/addons/l10n_hn/i18n/ca.po b/addons/l10n_hn/i18n/ca.po index 6db7f5a1dd5..2a3d4a52ef4 100755 --- a/addons/l10n_hn/i18n/ca.po +++ b/addons/l10n_hn/i18n/ca.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-03-12 20:48+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) \n" +"PO-Revision-Date: 2011-10-12 06:36+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-03-13 06:16+0000\n" -"X-Generator: Launchpad (build 12559)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/es.po b/addons/l10n_hn/i18n/es.po index d3372528aae..bc2d514595d 100755 --- a/addons/l10n_hn/i18n/es.po +++ b/addons/l10n_hn/i18n/es.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0.0-rc1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-19 12:00+0000\n" -"Last-Translator: Nicolas Vanhoren (OpenERP) \n" +"PO-Revision-Date: 2011-10-12 06:36+0000\n" +"Last-Translator: OpenERP Administrators \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-01-25 06:47+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/fr.po b/addons/l10n_hn/i18n/fr.po index 424997a7e20..489286bc16f 100755 --- a/addons/l10n_hn/i18n/fr.po +++ b/addons/l10n_hn/i18n/fr.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-19 12:00+0000\n" +"PO-Revision-Date: 2011-10-12 06:36+0000\n" "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) " "\n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-25 06:47+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/gl.po b/addons/l10n_hn/i18n/gl.po index af9cb8304e6..279639065a7 100755 --- a/addons/l10n_hn/i18n/gl.po +++ b/addons/l10n_hn/i18n/gl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-02-11 13:05+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-10-12 06:36+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-12 06:06+0000\n" -"X-Generator: Launchpad (build 12351)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/hu.po b/addons/l10n_hn/i18n/hu.po index 803d195e5ac..ec7a48e3e1c 100755 --- a/addons/l10n_hn/i18n/hu.po +++ b/addons/l10n_hn/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-19 12:00+0000\n" +"PO-Revision-Date: 2011-10-12 06:34+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-25 06:47+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/it.po b/addons/l10n_hn/i18n/it.po index 220b98bc9df..bc558d65a10 100755 --- a/addons/l10n_hn/i18n/it.po +++ b/addons/l10n_hn/i18n/it.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-19 12:00+0000\n" -"Last-Translator: Nicola Riolini - Micronaet \n" +"PO-Revision-Date: 2011-10-12 06:36+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-25 06:47+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/pt_BR.po b/addons/l10n_hn/i18n/pt_BR.po index 6dd7ba3c90b..d668e6f4c4a 100755 --- a/addons/l10n_hn/i18n/pt_BR.po +++ b/addons/l10n_hn/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-03-10 23:09+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-10-12 06:36+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-03-11 06:00+0000\n" -"X-Generator: Launchpad (build 12559)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/sr@latin.po b/addons/l10n_hn/i18n/sr@latin.po index 2e5a15962a7..87b6f752d77 100755 --- a/addons/l10n_hn/i18n/sr@latin.po +++ b/addons/l10n_hn/i18n/sr@latin.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-19 12:00+0000\n" +"PO-Revision-Date: 2011-10-12 06:34+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-25 06:47+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 6e5543dbadd..18979e998bd 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -122,7 +122,7 @@ class mrp_repair(osv.osv): 'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"), 'state': fields.selection([ ('draft','Quotation'), - ('confirmed','Confirmed, to repair'), + ('confirmed','Confirmed'), ('ready','Ready to Repair'), ('under_repair','Under Repair'), ('2binvoiced','To be Invoiced'), diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 4f1019e602e..65b356b3845 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -670,7 +670,7 @@ product.product form tree,form - [('income_pdt','=',True)] + [('expense_pdt','=',True)] @@ -696,7 +696,7 @@ product.product form tree,form - [('expense_pdt','=',True)] + [('income_pdt','=',True)] diff --git a/addons/point_of_sale/static/src/pos.html b/addons/point_of_sale/static/src/pos.html index e87b6cc64a4..2484e0a612c 100644 --- a/addons/point_of_sale/static/src/pos.html +++ b/addons/point_of_sale/static/src/pos.html @@ -33,7 +33,7 @@ var db = openerp.init(); openerp.point_of_sale(db); var session = new db.web.Session('DEBUG'); - session.session_login('addons-trunk', 'admin', 'admin').then(function() { + session.session_login('addons-trunk_all', 'admin', 'admin').then(function() { var pos = new db.point_of_sale.PointOfSale({session: session}); pos.appendTo($("body")); }); diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 35798ce939d..254a75fdcdc 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -10,7 +10,7 @@ - + diff --git a/addons/project/project.py b/addons/project/project.py index 967bd4ebbd3..05bed8a9b9a 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -469,7 +469,7 @@ class task(osv.osv): 'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'), 'manager_id': fields.related('project_id', 'analytic_account_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'), 'company_id': fields.many2one('res.company', 'Company'), - 'id': fields.integer('ID'), + 'id': fields.integer('ID', readonly=True), 'color': fields.integer('Color Index'), } diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 74a78a9808a..e94349e028f 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -180,7 +180,7 @@ class project_issue(crm.crm_case, osv.osv): return res _columns = { - 'id': fields.integer('ID'), + 'id': fields.integer('ID', readonly=True), 'name': fields.char('Issue', size=128, required=True), 'active': fields.boolean('Active', required=False), 'create_date': fields.datetime('Creation Date', readonly=True,select=True), diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po index e5bd82d8446..bd2bc6974bf 100644 --- a/addons/project_scrum/i18n/pt_BR.po +++ b/addons/project_scrum/i18n/pt_BR.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-03-15 16:12+0000\n" -"Last-Translator: Emerson \n" +"PO-Revision-Date: 2011-10-13 00:57+0000\n" +"Last-Translator: Joe Pimentel \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-09-05 05:03+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-13 04:38+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: project_scrum #: help:project.scrum.email,scrum_master_email:0 msgid "Email Id of Scrum Master" -msgstr "" +msgstr "Email do Scrum Master" #. module: project_scrum #: view:project.scrum.backlog.assign.sprint:0 @@ -68,12 +68,35 @@ msgid "" " * http://controlchaos.com\n" " " msgstr "" +"\n" +" Este módulo implementa todos os conceitos definidos pela metodologia de " +"gerenciamento\n" +" de projeto Scrum para empresas de TI:\n" +" * Projetos com sprints, Dono do Produto, Scrum Master\n" +" * Sprints com Revisões, Encontros Diários, Feedbacks\n" +" * Backlog do Produto\n" +" * Backlog do Sprint \n" +"\n" +" Ele adiciona alguns conceitos ao modulo de gerenciamento de projetos:\n" +" * Roteiros de Médio e longo prazo\n" +" * Requisitos Funcionais/de Clientes VS técnicos\n" +"\n" +" Ele também cria umnovo relatório:\n" +" * Burn-down chart\n" +"\n" +" The scrum projects and tasks inherit from the real projects and\n" +" tasks, so you can continue working on normal tasks that will also\n" +" include tasks from scrum projects.\n" +"\n" +" Mais informações sobre a Metodologia:\n" +" * http://controlchaos.com\n" +" " #. module: project_scrum #: view:project.scrum.meeting:0 #: view:project.scrum.sprint:0 msgid "What did you do since the last meeting?" -msgstr "" +msgstr "O que você executou desde a última reunião?" #. module: project_scrum #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree @@ -83,6 +106,11 @@ msgid "" "which the team implements a list of product backlogs. The sprint review is " "organized when the team presents its work to the customer and product owner." msgstr "" +"A metodologia ágil Scrum é utilizada no desenvolvimento de projetos de " +"software. Nesta metodologia, um Sprint é um período curto de tempo (ex. 1 " +"mes) durante o qual o time implementa uma lista de Backlogs de Produto. A " +"revisão do Sprint é organizada quando o time apresenta o seu trabalho para o " +"Cliente e o Dono do Produto." #. module: project_scrum #: view:project.scrum.meeting:0 @@ -117,7 +145,7 @@ msgstr "Scrum Master" #: code:addons/project_scrum/project_scrum.py:83 #, python-format msgid "The sprint '%s' has been opened." -msgstr "" +msgstr "O Sprint '%s' foi iniciado." #. module: project_scrum #: constraint:project.project:0 @@ -159,24 +187,24 @@ msgstr "Definir como Provisório" #. module: project_scrum #: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge msgid "Merge Product Backlogs" -msgstr "" +msgstr "Mesclar Backlog de Produtos" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge #: view:project.scrum.backlog.merge:0 msgid "Merge Backlogs" -msgstr "" +msgstr "Mesclar Backlogs" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_email.py:53 #, python-format msgid "Scrum Meeting : %s" -msgstr "" +msgstr "Reuniáo Scrum: %s" #. module: project_scrum #: view:project.task:0 msgid "Backlog" -msgstr "" +msgstr "Backlog" #. module: project_scrum #: model:ir.model,name:project_scrum.model_project_scrum_email @@ -206,7 +234,7 @@ msgstr "Ok" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Spent hours" -msgstr "" +msgstr "Horas Gastas" #. module: project_scrum #: model:ir.actions.act_window,help:project_scrum.action_meeting_form @@ -215,30 +243,36 @@ msgid "" "this methodology, a daily meeting is organized by the scrum master with his " "team in order to detect the difficulties the team faced/will face." msgstr "" +"A metodologia ágil Scrum é usada em projetos de desenvolvimento de software. " +"Nesta metodologia, uma reunião diária é organizada pelo Scrum Master com o " +"time de forma a detectar as dificuldades as quais o time está ou irá " +"encontrar." #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:316 #, python-format msgid "Please provide email address for product owner defined on sprint." msgstr "" +"Por favor, forneça um endereço de email para o Dono do Produto definido no " +"Sprint." #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:327 #, python-format msgid "Scrum Meeting of %s" -msgstr "" +msgstr "Reunião Scrum de %s" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57 #, python-format msgid "Product Backlog '%s' is converted into Task %d." -msgstr "" +msgstr "Backlog de Produto '%s' esta convertida na Tarefa %d." #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62 #, python-format msgid "Product Backlog '%s' is assigned sprint:%s" -msgstr "" +msgstr "Backlog de Produto '%s' esta atribuída a Sprint: %s" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57 @@ -264,7 +298,7 @@ msgstr "Projeto" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Start Task" -msgstr "" +msgstr "Iniciar Tarefa" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_email.py:90 @@ -272,12 +306,12 @@ msgstr "" #: code:addons/project_scrum/wizard/project_scrum_email.py:96 #, python-format msgid "None" -msgstr "" +msgstr "Nenhum(a)" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Change Stage" -msgstr "" +msgstr "Mudar Estágio" #. module: project_scrum #: view:project.scrum.sprint:0 @@ -293,7 +327,7 @@ msgstr "Data Final" #: view:project.scrum.meeting:0 #: view:project.scrum.sprint:0 msgid "Links" -msgstr "" +msgstr "Ligações" #. module: project_scrum #: help:project.scrum.sprint,effective_hours:0 @@ -304,17 +338,17 @@ msgstr "Calculado usando a soma do trabalho realizado da tarefa." #: code:addons/project_scrum/wizard/project_scrum_email.py:91 #, python-format msgid "Task for Today" -msgstr "" +msgstr "Tarefa de Hoje" #. module: project_scrum #: field:project.scrum.backlog.assign.sprint,state_open:0 msgid "Open Backlog" -msgstr "" +msgstr "Abrir Backlog" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Total Spent Hours" -msgstr "" +msgstr "Total de Horas Gastas" #. module: project_scrum #: field:project.scrum.sprint,date_start:0 @@ -325,24 +359,24 @@ msgstr "Data de Início" #: code:addons/project_scrum/wizard/project_scrum_email.py:94 #, python-format msgid "Blocking points encountered:" -msgstr "" +msgstr "Pontos de bloqueio encontrados:" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Planning" -msgstr "" +msgstr "Planejamento" #. module: project_scrum #: view:project.scrum.backlog.assign.sprint:0 #: view:project.scrum.backlog.create.task:0 #: view:project.scrum.email:0 msgid "_Cancel" -msgstr "" +msgstr "_Cancelar" #. module: project_scrum #: help:project.scrum.sprint,scrum_master_id:0 msgid "The person who is maintains the processes for the product" -msgstr "" +msgstr "A pessoa que mantem os processos para o produto" #. module: project_scrum #: view:project.scrum.product.backlog:0 @@ -354,7 +388,7 @@ msgstr "Horas planejadas" #. module: project_scrum #: field:project.scrum.email,subject:0 msgid "Subject" -msgstr "" +msgstr "Assunto" #. module: project_scrum #: view:board.board:0 @@ -364,28 +398,28 @@ msgstr "" #: view:project.scrum.product.backlog:0 #: view:project.scrum.sprint:0 msgid "Sprints" -msgstr "" +msgstr "Sprints" #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:314 #, python-format msgid "Email notification could not be sent to the product owner %s" -msgstr "" +msgstr "Email de notificação não pode ser enviado para o Dono do Prodyuto %s" #. module: project_scrum #: field:project.scrum.backlog.assign.sprint,convert_to_task:0 msgid "Convert To Task" -msgstr "" +msgstr "Converter em Tarefa" #. module: project_scrum #: view:project.scrum.backlog.merge:0 msgid "Are you sure you want to merge these Backlogs?" -msgstr "" +msgstr "Tem certeza que deseja mesclar estes Backlogs?" #. module: project_scrum #: help:project.scrum.backlog.create.task,user_id:0 msgid "Responsible user who can work on task" -msgstr "" +msgstr "Usuário responsável que pode trabalhar na tarefa" #. module: project_scrum #: view:project.scrum.product.backlog:0 @@ -408,14 +442,14 @@ msgstr "Scrum Diário" #. module: project_scrum #: view:project.scrum.backlog.create.task:0 msgid "C_onvert" -msgstr "" +msgstr "C_onverter" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form #: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form #: view:project.scrum.product.backlog:0 msgid "Product Backlogs" -msgstr "" +msgstr "Backlogs de Produto" #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:301 @@ -424,18 +458,18 @@ msgstr "" #: code:addons/project_scrum/project_scrum.py:316 #, python-format msgid "Error !" -msgstr "" +msgstr "Erro!" #. module: project_scrum #: field:project.scrum.product.backlog,create_date:0 msgid "Creation Date" -msgstr "" +msgstr "Data de Criação" #. module: project_scrum #: view:project.scrum.meeting:0 #: view:project.scrum.sprint:0 msgid "Are there anything blocking you?" -msgstr "" +msgstr "Existe alguma coisa bloqueando você?" #. module: project_scrum #: model:ir.ui.menu,name:project_scrum.menu_scrum @@ -459,32 +493,32 @@ msgstr "Tarefas desde ontem" #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71 #, python-format msgid "Warning" -msgstr "" +msgstr "Aviso" #. module: project_scrum #: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint msgid "Assign sprint to backlogs" -msgstr "" +msgstr "Atribuir Sprint para Backlogs" #. module: project_scrum #: help:project.scrum.sprint,expected_hours:0 msgid "Estimated time to do the task." -msgstr "" +msgstr "Tempo estimado para realizar a tarefa" #. module: project_scrum #: field:project.scrum.product.backlog,task_hours:0 msgid "Task Hours" -msgstr "" +msgstr "Horas da Tarefa" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Dates" -msgstr "" +msgstr "Datas" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Send to Scrum Master" -msgstr "" +msgstr "Enviar para Scrum Master" #. module: project_scrum #: selection:project.scrum.product.backlog,state:0 @@ -504,11 +538,13 @@ msgid "" "Hello , \n" "I am sending you Scrum Meeting : %s for the Sprint '%s' of Project '%s'" msgstr "" +"Olá ,\n" +"Estou enviando-lhe Reunião Scrum: %s para o Sprint '%s' do Projeto '%s'" #. module: project_scrum #: view:project.scrum.meeting:0 msgid "Daily" -msgstr "" +msgstr "Diária" #. module: project_scrum #: field:project.scrum.sprint,backlog_ids:0 @@ -518,24 +554,24 @@ msgstr "Backlog do Sprint" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Delegate" -msgstr "" +msgstr "Delegar" #. module: project_scrum #: view:board.board:0 msgid "My Board" -msgstr "" +msgstr "Meu Painel" #. module: project_scrum #: view:postpone.wizard:0 msgid "Postpone Backlog" -msgstr "" +msgstr "Adiar Backlog" #. module: project_scrum #: view:board.board:0 #: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph #: view:project.task:0 msgid "Task Progress" -msgstr "" +msgstr "Progresso da Tarefa" #. module: project_scrum #: field:project.scrum.meeting,date:0 @@ -554,17 +590,17 @@ msgstr "Tarefas" #. module: project_scrum #: field:project.scrum.email,product_owner_email:0 msgid "Product Owner Email" -msgstr "" +msgstr "Email do Dono do Produto" #. module: project_scrum #: view:project.scrum.email:0 msgid "_Send" -msgstr "" +msgstr "_Enviar" #. module: project_scrum #: help:project.scrum.backlog.assign.sprint,sprint_id:0 msgid "Select Sprint to assign backlog." -msgstr "" +msgstr "Selecione Sprint para atribuir Backlog" #. module: project_scrum #: help:project.scrum.product.backlog,progress:0 @@ -576,7 +612,7 @@ msgstr "Calculado como: Tempo Gasto / Tempo Total." #: view:project.scrum.meeting:0 #: view:project.scrum.sprint:0 msgid "Month" -msgstr "" +msgstr "Mês" #. module: project_scrum #: field:project.scrum.meeting,question_blocks:0 @@ -587,23 +623,25 @@ msgstr "Bloqueios encontrados" #: help:project.scrum.backlog.assign.sprint,state_open:0 msgid "Change the state of product backlogs to open if its in draft state" msgstr "" +"Alterar o estado do Backlog de Produto para Aberto se estiver em estado " +"Rascunho" #. module: project_scrum #: view:project.scrum.email:0 #: field:project.scrum.email,message:0 msgid "Message" -msgstr "" +msgstr "Mensagem" #. module: project_scrum #: field:project.scrum.email,scrum_master_email:0 msgid "Scrum Master Email" -msgstr "" +msgstr "Email do Scrum Master" #. module: project_scrum #: help:project.project,product_owner_id:0 #: help:project.scrum.sprint,product_owner_id:0 msgid "The person who is responsible for the product" -msgstr "" +msgstr "A pesoa que é responsável pelo produto" #. module: project_scrum #: view:project.scrum.meeting:0 @@ -614,7 +652,7 @@ msgstr "Scrum Sprint" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Product owner" -msgstr "" +msgstr "Dono do Produto" #. module: project_scrum #: view:project.scrum.sprint:0 @@ -642,19 +680,21 @@ msgstr "Esboço" msgid "" "Related product backlog that contains this task. Used in SCRUM methodology" msgstr "" +"Backlog de Produto relacionado que contém esta tarefa. Utilizado na " +"Metodologia SCRUM" #. module: project_scrum #: view:project.scrum.meeting:0 #: view:project.scrum.sprint:0 msgid "What do you plan to do till the next meeting?" -msgstr "" +msgstr "O que você planeja realizar até a próxima reuniáo" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard #: view:postpone.wizard:0 #: view:project.scrum.product.backlog:0 msgid "Postpone" -msgstr "" +msgstr "Adiar" #. module: project_scrum #: view:project.scrum.product.backlog:0 @@ -668,17 +708,17 @@ msgstr "Pendente" #: view:project.scrum.meeting:0 #: view:project.scrum.sprint:0 msgid "Optional Info" -msgstr "" +msgstr "Informação Opcional" #. module: project_scrum #: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task msgid "Create Tasks from Product Backlogs" -msgstr "" +msgstr "Criar Tarefas a partir do Backlog de Produto" #. module: project_scrum #: help:project.project,sprint_size:0 msgid "Number of days allocated for sprint" -msgstr "" +msgstr "Número de dias alocados para o Sprint" #. module: project_scrum #: field:project.project,product_owner_id:0 @@ -690,6 +730,7 @@ msgstr "Proprietário do Produto" #: help:project.scrum.product.backlog,sequence:0 msgid "Gives the sequence order when displaying a list of product backlog." msgstr "" +"Fornece a ordem de sequência quando mostrando uma lista de Backlog de Produto" #. module: project_scrum #: model:process.node,name:project_scrum.process_node_productbacklog0 @@ -706,12 +747,12 @@ msgstr "Backlogs" #: code:addons/project_scrum/project_scrum.py:326 #, python-format msgid "Thank you" -msgstr "" +msgstr "Obrigado" #. module: project_scrum #: help:project.scrum.backlog.assign.sprint,convert_to_task:0 msgid "Create Task for Product Backlog" -msgstr "" +msgstr "Criar Tarefa para o Backlog de Produto" #. module: project_scrum #: field:project.scrum.product.backlog,active:0 @@ -722,22 +763,22 @@ msgstr "Ativo" #: model:ir.actions.act_window,name:project_scrum.action_meeting_form #: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form msgid "Scrum Meetings" -msgstr "" +msgstr "Reuniões de Scrum" #. module: project_scrum #: help:project.scrum.product.backlog,expected_hours:0 msgid "Estimated total time to do the Backlog" -msgstr "" +msgstr "Tempo total estimado para realizar o Backlog" #. module: project_scrum #: help:project.scrum.backlog.merge,project_id:0 msgid "Select project for the new product backlog" -msgstr "" +msgstr "Selecione o projeto para o novo Backlog de Produto" #. module: project_scrum #: view:project.scrum.backlog.merge:0 msgid "Merge" -msgstr "" +msgstr "Mesclar" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open @@ -754,7 +795,7 @@ msgstr "Precisão do Backlog" #: view:project.scrum.backlog.create.task:0 #: view:project.scrum.product.backlog:0 msgid "Convert to Task" -msgstr "" +msgstr "Converter para Tarefa" #. module: project_scrum #: help:project.scrum.sprint,project_id:0 @@ -773,20 +814,20 @@ msgstr "Seqüência" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Send to Product Owner" -msgstr "" +msgstr "Enviar para o Dono do Produto" #. module: project_scrum #: view:board.board:0 #: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph #: view:project.scrum.product.backlog:0 msgid "Backlog Progress" -msgstr "" +msgstr "Progresso do Backlog" #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:301 #, python-format msgid "Email notification could not be sent to the scrum master %s" -msgstr "" +msgstr "Notificação de Email não pode ser enviada para o Scrum Master %s" #. module: project_scrum #: view:project.scrum.product.backlog:0 @@ -806,7 +847,7 @@ msgstr "Cancelar" #: view:project.scrum.product.backlog:0 #: view:project.scrum.sprint:0 msgid "Close" -msgstr "" +msgstr "Fechar" #. module: project_scrum #: view:project.scrum.product.backlog:0 @@ -825,7 +866,7 @@ msgstr "Horas efetivas" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Information" -msgstr "" +msgstr "Informação" #. module: project_scrum #: view:project.scrum.product.backlog:0 @@ -835,7 +876,7 @@ msgstr "Horas Restantes" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Responsible" -msgstr "" +msgstr "Responsável" #. module: project_scrum #: field:project.scrum.product.backlog,name:0 @@ -848,17 +889,17 @@ msgstr "Característica" #: view:project.scrum.sprint:0 #: view:project.task:0 msgid "Current" -msgstr "" +msgstr "Atual" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "My Backlogs" -msgstr "" +msgstr "Meus Backlogs" #. module: project_scrum #: view:project.scrum.email:0 msgid "Send Email for Scrum Meeting Details" -msgstr "" +msgstr "Enviar email para Detalhes da Reunião Scrum" #. module: project_scrum #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form @@ -868,6 +909,11 @@ msgid "" "can be planified in a development sprint and may be split into several " "tasks. The product backlog is managed by the product owner of the project." msgstr "" +"A metodologia ágil Scrum é usada em projetos de desenvolvimento de software. " +" O Backlog de Produto é a lista de características a ser implementadas. Um " +"Backlog de Produto pode ser planejado em um Sprint de desenvolvimento e pode " +"ser quebrado em várias tarefas. O Backlog de Produto é gerenciado pelo Dono " +"do Produto" #. module: project_scrum #: model:process.transition,name:project_scrum.process_transition_backlogtask0 @@ -893,7 +939,7 @@ msgstr "Reunião de Scrum" #: model:ir.actions.report.xml,name:project_scrum.report_scrum_sprint_burndown_chart #: view:project.scrum.sprint:0 msgid "Burndown Chart" -msgstr "" +msgstr "Burndown Chart" #. module: project_scrum #: view:project.scrum.sprint:0 @@ -903,7 +949,7 @@ msgstr "Reuniões Diárias" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Expected hours" -msgstr "" +msgstr "Horas Esperadas" #. module: project_scrum #: field:project.project,sprint_size:0 @@ -913,7 +959,7 @@ msgstr "Dias do Sprint" #. module: project_scrum #: help:project.scrum.email,product_owner_email:0 msgid "Email Id of Product Owner" -msgstr "" +msgstr "Id do Email do Dono do Produto" #. module: project_scrum #: field:project.scrum.sprint,progress:0 @@ -928,6 +974,10 @@ msgid "" " \n" "I am sending you Daily Meeting Details of date %s for the Sprint %s\n" msgstr "" +"Olá %s,\n" +"\n" +"Estou lhe enviando os Detalhes da Reunião Diária da data %s para o Sprint " +"%s\n" #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:325 @@ -942,6 +992,14 @@ msgid "" "*Blocks encountered:\n" "_______________________ %s" msgstr "" +"\n" +"*Tarefas desde ontem:\n" +"_______________________%s\n" +"*Tarefas para Hoje:\n" +"_______________________ %s\n" +"\n" +"*Bloqueios encontrados:\n" +"_______________________ %s" #. module: project_scrum #: help:project.scrum.product.backlog,active:0 @@ -949,11 +1007,13 @@ msgid "" "If Active field is set to true, it will allow you to hide the product " "backlog without removing it." msgstr "" +"Se o campo Ativo estiver ajustado para verdadeiro, permitirá esconder o " +"Backlog de Produto sem removê-lo." #. module: project_scrum #: help:project.scrum.product.backlog,task_hours:0 msgid "Estimated time of the total hours of the tasks" -msgstr "" +msgstr "Tempo estimado do total de horas das tarefas" #. module: project_scrum #: view:project.project:0 @@ -963,12 +1023,12 @@ msgstr "Dados do Scrum" #. module: project_scrum #: field:project.project,scrum:0 msgid "Is a Scrum Project" -msgstr "" +msgstr "É um Projeto Scrum" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Edit" -msgstr "" +msgstr "Editar" #. module: project_scrum #: field:project.scrum.product.backlog,tasks_id:0 @@ -978,12 +1038,12 @@ msgstr "Detalhes das Tarefas" #. module: project_scrum #: model:ir.model,name:project_scrum.model_postpone_wizard msgid "postpone.wizard" -msgstr "" +msgstr "postpone.wizard" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Total Planned Hours" -msgstr "" +msgstr "Horas Totais Planejadas" #. module: project_scrum #: view:project.scrum.backlog.merge:0 @@ -991,39 +1051,43 @@ msgid "" "This wizard merge backlogs and create one new backlog with draft state (Old " "backlogs Will be deleted). And it also merge old tasks from backlogs" msgstr "" +"Este assistente mescla Backlogs e cria um novo Backlog no estado Rascunho " +"(Antigos Backlogs serão deletados). E isto também mescla antigas tarefas dos " +"Backlogs." #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:303 #, python-format msgid "Please provide email address for scrum master defined on sprint." msgstr "" +"Favor providenciar endereço de email do Scrum Master definido no Sprint" #. module: project_scrum #: view:project.scrum.backlog.merge:0 msgid "Select the project for merged backlogs" -msgstr "" +msgstr "Selecione o projeto para Backlogs mesclados" #. module: project_scrum #: view:board.board:0 #: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree msgid "My Sprint" -msgstr "" +msgstr "Meu Sprint" #. module: project_scrum #: field:project.scrum.product.backlog,effective_hours:0 msgid "Spent Hours" -msgstr "" +msgstr "Horas Gastas" #. module: project_scrum #: help:project.scrum.product.backlog,effective_hours:0 msgid "Computed using the sum of the time spent on every related tasks" -msgstr "" +msgstr "Computado usando a soma do tempo gasto em cada tarefa relacionada" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum #: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm msgid "Scrum Dashboard" -msgstr "" +msgstr "Painel Scrum" #. module: project_scrum #: model:ir.model,name:project_scrum.model_project_scrum_sprint @@ -1033,31 +1097,31 @@ msgstr "" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Feature Description" -msgstr "" +msgstr "Descrição da Característica" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71 #, python-format msgid "Please select any Project." -msgstr "" +msgstr "Favor selecionar algum Projeto" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_email.py:97 #, python-format msgid "Thank you," -msgstr "" +msgstr "Obrigado" #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:90 #, python-format msgid "The sprint '%s' has been closed." -msgstr "" +msgstr "O Sprint '%s' foi fechado." #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint #: view:project.scrum.backlog.assign.sprint:0 msgid "Assign Sprint" -msgstr "" +msgstr "Atribuir Sprint" #. module: project_scrum #: field:project.scrum.backlog.create.task,user_id:0 @@ -1067,7 +1131,7 @@ msgstr "Atribuir para" #. module: project_scrum #: view:postpone.wizard:0 msgid "Are you sure to postpone Backlog ?" -msgstr "" +msgstr "Tem certeza de adiar Backlog" #. module: project_scrum #: field:project.scrum.backlog.assign.sprint,sprint_id:0 @@ -1084,7 +1148,7 @@ msgstr "Sprint" #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39 #, python-format msgid "Please select at least two product Backlogs" -msgstr "" +msgstr "Favor selecionar no mínimo dois Backlogs de Produto" #. module: project_scrum #: field:project.scrum.sprint,review:0 diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index d0b0c13c211..f947857a016 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -99,8 +99,8 @@ - - + + diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml index 829fae14b6b..fe49e8eae9f 100644 --- a/addons/stock/report/report_stock_view.xml +++ b/addons/stock/report/report_stock_view.xml @@ -38,7 +38,7 @@ + domain="[('product_id.type','=', 'consu')]"/> diff --git a/addons/warning/warning.py b/addons/warning/warning.py index ab7a5926653..9f699ab9911 100644 --- a/addons/warning/warning.py +++ b/addons/warning/warning.py @@ -197,7 +197,7 @@ class sale_order_line(osv.osv): def product_id_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False, qty_uos=0, uos=False, name='', partner_id=False, lang=False, update_tax=True, date_order=False, packaging=False, - fiscal_position=False, flag=False): + fiscal_position=False, flag=False, context=None): warning = {} if not product: return {'value': {'th_weight' : 0, 'product_packaging': False, @@ -232,7 +232,7 @@ class purchase_order_line(osv.osv): _inherit = 'purchase.order.line' def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom, partner_id, date_order=False, fiscal_position=False, date_planned=False, - name=False, price_unit=False, notes=False): + name=False, price_unit=False, notes=False, context=None): warning = {} if not product: return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}