odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merged with addons/trunk. 

bzr revid: tde@openerp.com-20121018072448-y2yvsh2kvznnmg8j
This commit is contained in:
Thibault Delavallée 2012-10-18 09:24:48 +02:00
parent bd1d7f9e78 df2750f9fd
commit 86868af1f1
33 changed files with 4572 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/account/account_move_line.py
View File

@ -514,8 +514,7 @@ class account_move_line(osv.osv):
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'Status', readonly=True,
help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
"this field will contain the basic amount(without tax)."),

4
addons/account/account_view.xml
View File

@ -1078,7 +1078,7 @@
<field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
<field name="reconcile_partial_id"/>
<field name="reconcile_id"/>
<field name="state"/>
<field name="state" invisible="1"/>
</tree>
</field>
</record>
@ -1980,7 +1980,7 @@
<field name="credit" sum="Total credit"/>
<field name="account_tax_id"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="state"/>
<field name="state" invisible="1"/>
</tree>
</field>
</record>

5
addons/account/data/account_data.xml
View File

@ -127,6 +127,7 @@
<field name="view_id" ref="account_journal_bank_view"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
<record id="bank_col20" model="account.journal.column">
@ -214,6 +215,7 @@
<field name="view_id" ref="account_journal_bank_view_multi"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
<record id="bank_col20_multi" model="account.journal.column">
@ -289,6 +291,7 @@
<field name="view_id" ref="account_journal_view"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
@ -370,6 +373,7 @@
<field name="view_id" ref="account_sp_journal_view"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
<record id="sp_journal_col20" model="account.journal.column">
@ -456,6 +460,7 @@
<field name="view_id" ref="account_sp_refund_journal_view"/>
<field name="name">Status</field>
<field name="field">state</field>
<field eval="True" name="invisible"/>
<field eval="19" name="sequence"/>
</record>
<record id="sp_refund_journal_col20" model="account.journal.column">

4
addons/account/i18n/es_EC.po
View File

@ -16,8 +16,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/gu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: account
#: view:account.invoice.report:0

4
addons/account/i18n/pt_BR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: account
#: view:account.invoice.report:0

566
addons/account/i18n/ro.po
View File

File diff suppressed because it is too large Load Diff

6
addons/account/static/src/js/account_move_reconciliation.js
View File

@ -106,8 +106,10 @@ openerp.account = function (instance) {
result.context = _.extend(result.context || {}, additional_context);
result.flags = result.flags || {};
result.flags.new_window = true;
return self.do_action(result, function () {
self.do_search(self.last_domain, self.last_context, self.last_group_by);
return self.do_action(result, {
on_close: function () {
self.do_search(self.last_domain, self.last_context, self.last_group_by);
}
});
});
});

14
addons/account_asset/i18n/ro.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-04-18 07:47+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-10-17 08:25+0000\n"
"Last-Translator: filsys <office@filsystem.ro>\n"
"Language-Team: Romanian <ro@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: account_asset
#: view:account.asset.asset:0
@ -440,12 +440,12 @@ msgstr "Metoda Timp"
#. module: account_asset
#: view:account.asset.category:0
msgid "Analytic Information"
msgstr ""
msgstr "Informatii analitice"
#. module: account_asset
#: view:asset.modify:0
msgid "Asset Durations to Modify"
msgstr ""
msgstr "Durata de modificat"
#. module: account_asset
#: constraint:account.move.line:0
@ -622,7 +622,7 @@ msgstr "Prorata Temporis"
#. module: account_asset
#: view:account.asset.category:0
msgid "Accounting Information"
msgstr ""
msgstr "Informații contabile"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice

4143
addons/account_coda/i18n/ro.po Normal file
View File

File diff suppressed because it is too large Load Diff

6
addons/base_import/static/src/js/import.js
View File

@ -53,8 +53,10 @@ openerp.base_import = function (instance) {
params: {
model: self.dataset.model
}
}, void 0, void 0, function () {
self.reload();
}, {
on_reverse_breadcrumb: function () {
self.reload();
},
});
return false;
});

4
addons/document_page/i18n/pt_BR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: document_page
#: field:document.page.type,template:0

4
addons/hr/i18n/pt_BR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: hr
#: model:process.node,name:hr.process_node_openerpuser0

4
addons/hr_evaluation/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: hr_evaluation
#: help:hr_evaluation.plan.phase,send_anonymous_manager:0

4
addons/hr_holidays/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0

39
addons/hr_payroll/i18n/es_EC.po
View File

@ -8,15 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-06-11 13:23+0000\n"
"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
"<chris.ormaza@gmail.com>\n"
"PO-Revision-Date: 2012-10-17 04:38+0000\n"
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-08-28 06:33+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: hr_payroll
#: field:hr.payslip.line,condition_select:0
@ -170,7 +169,7 @@ msgstr "Todas las reglas hijas"
#. module: hr_payroll
#: view:hr.payslip:0 view:hr.salary.rule:0
msgid "Input Data"
msgstr ""
msgstr "Datos de entrada"
#. module: hr_payroll
#: constraint:hr.payslip:0
@ -228,7 +227,7 @@ msgstr "Detalle regla salarial"
#. module: hr_payroll
#: report:paylip.details:0 report:payslip:0
msgid "Note"
msgstr ""
msgstr "Notas"
#. module: hr_payroll
#: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
@ -271,7 +270,7 @@ msgstr "Suma de el sueldo de todos los contratos actuales del empleado"
#. module: hr_payroll
#: view:hr.payslip:0
msgid "Total Working Days"
msgstr ""
msgstr "Total de días trabajado"
#. module: hr_payroll
#: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
@ -363,7 +362,7 @@ msgstr "Semi-anualmente"
#. module: hr_payroll
#: view:hr.salary.rule:0
msgid "Children Definition"
msgstr ""
msgstr "Definición de Hijos"
#. module: hr_payroll
#: report:paylip.details:0 report:payslip:0
@ -373,29 +372,29 @@ msgstr "Correo electrónico"
#. module: hr_payroll
#: view:hr.payslip.run:0
msgid "Search Payslip Batches"
msgstr ""
msgstr "Buscar bloque de roles"
#. module: hr_payroll
#: field:hr.payslip.line,amount_percentage_base:0
#: field:hr.salary.rule,amount_percentage_base:0
msgid "Percentage based on"
msgstr ""
msgstr "Porcentaje basado en"
#. module: hr_payroll
#: help:hr.payslip.line,amount_percentage:0
#: help:hr.salary.rule,amount_percentage:0
msgid "For example, enter 50.0 to apply a percentage of 50%"
msgstr ""
msgstr "Por ejemplo, ingrese 50.0 para aplicar el 50%"
#. module: hr_payroll
#: field:hr.payslip,paid:0
msgid "Made Payment Order ? "
msgstr ""
msgstr "Orden de Pago generada ? "
#. module: hr_payroll
#: report:contribution.register.lines:0
msgid "PaySlip Lines by Contribution Register"
msgstr ""
msgstr "Detalle de nómina por contribución registrada"
#. module: hr_payroll
#: help:hr.payslip,state:0
@ -513,7 +512,7 @@ msgstr "Regla de salario hija"
#: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
#: field:payslip.lines.contribution.register,date_to:0
msgid "Date To"
msgstr ""
msgstr "Fecha hasta"
#. module: hr_payroll
#: selection:hr.payslip.line,condition_select:0
@ -576,7 +575,7 @@ msgstr "El contrato al cual aplica este ingreso"
#. module: hr_payroll
#: view:hr.salary.rule:0
msgid "Computation"
msgstr ""
msgstr "Cálculo"
#. module: hr_payroll
#: help:hr.payslip.input,amount:0
@ -711,7 +710,7 @@ msgstr "Expresión de python"
#. module: hr_payroll
#: report:paylip.details:0 report:payslip:0
msgid "Designation"
msgstr ""
msgstr "Designación"
#. module: hr_payroll
#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
@ -839,7 +838,7 @@ msgstr "Registrar Nombre"
#. module: hr_payroll
#: view:hr.salary.rule:0
msgid "General"
msgstr ""
msgstr "General"
#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:664
@ -913,7 +912,7 @@ msgstr "Detalle del rol"
#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
msgid "Employee Payslips"
msgstr ""
msgstr "Roles de Empleado"
#. module: hr_payroll
#: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
@ -1004,7 +1003,7 @@ msgstr "Lineas de roles por registro de contribuciones"
#. module: hr_payroll
#: selection:hr.payslip,state:0
msgid "Waiting"
msgstr ""
msgstr "Esperando"
#. module: hr_payroll
#: report:paylip.details:0 report:payslip:0

4
addons/l10n_be/i18n/pt_BR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: l10n_be
#: field:partner.vat.intra,test_xml:0

4
addons/l10n_be_hr_payroll/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: l10n_be_hr_payroll
#: help:hr.employee,disabled_spouse_bool:0

4
addons/l10n_cn/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: l10n_cn
#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss

30
addons/l10n_ec/i18n/es_EC.po
View File

@ -8,24 +8,24 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-12-23 09:56+0000\n"
"PO-Revision-Date: 2011-04-11 18:21+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-10-17 04:39+0000\n"
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-08-28 06:42+0000\n"
"X-Generator: Launchpad (build 15864)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_expense
msgid "Gasto"
msgstr ""
msgstr "Gasto"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_stock
msgid "Inventario"
msgstr ""
msgstr "Inventario"
#. module: l10n_ec
#: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
@ -50,47 +50,47 @@ msgstr ""
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_receivable
msgid "Por Cobrar"
msgstr ""
msgstr "Por Cobrar"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_asset
msgid "Activo"
msgstr ""
msgstr "Activo"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_tax
msgid "Impuesto"
msgstr ""
msgstr "Impuesto"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_liability
msgid "Pasivo"
msgstr ""
msgstr "Pasivo"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_capital
msgid "Capital"
msgstr ""
msgstr "Capital"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_cash
msgid "Efectivo"
msgstr ""
msgstr "Efectivo"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_payable
msgid "Por Pagar"
msgstr ""
msgstr "Por Pagar"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_income
msgid "Ingreso"
msgstr ""
msgstr "Ingreso"
#. module: l10n_ec
#: model:account.account.type,name:l10n_ec.account_type_view
msgid "View"
msgstr ""
msgstr "Vista"
#~ msgid ""
#~ "\n"

4
addons/l10n_ma/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: l10n_ma
#: model:account.account.type,name:l10n_ma.cpt_type_imm

4
addons/lunch/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: lunch
#: view:lunch.cashbox.clean:0

4
addons/mail/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: mail
#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0

4
addons/mail/static/src/js/mail.js
View File

@ -17,7 +17,7 @@ openerp.mail = function(session) {
*/
session.web.FormView = session.web.FormView.extend({
do_action: function(action, on_close) {
do_action: function(action) {
if (action.res_model == 'mail.compose.message') {
/* hack for stop context propagation of wrong value
@ -44,7 +44,7 @@ openerp.mail = function(session) {
$('.openerp .oe_mail_wall_threads .oe_mail_thread button.oe_mail_wall_button_fetch').click();
}
return this._super(action, on_close);
return this._super.apply(this, arguments);
},
});

8
addons/mail/static/src/js/mail_followers.js
View File

@ -73,7 +73,11 @@ openerp_mail_followers = function(session, mail) {
'default_res_id': self.view.datarecord.id
},
}
self.do_action(action, function() { self.read_value(); });
self.do_action(action, {
on_close: function() {
self.read_value();
},
});
});
},
@ -209,4 +213,4 @@ openerp_mail_followers = function(session, mail) {
},
});
};
};

4
addons/mrp_repair/i18n/pt_BR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: mrp_repair
#: view:mrp.repair:0

4
addons/point_of_sale/i18n/id.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:39+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: point_of_sale
#: field:report.transaction.pos,product_nb:0

4
addons/point_of_sale/i18n/pt_BR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:39+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: point_of_sale
#: field:report.transaction.pos,product_nb:0

4
addons/project/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:39+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: project
#: view:report.project.task.user:0

4
addons/project_long_term/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:41+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: project_long_term
#: model:ir.actions.act_window,name:project_long_term.act_project_phases

13
addons/sale/sale_demo.xml
View File

@ -294,8 +294,8 @@
<field name="model">sale.order</field>
<field name="res_id" ref="sale_order_2"/>
<field name="body">Hi,
I have a confusion for pricing of Services, I have heard there is a discount above 25 hours.
Can you clarify please?</field>
I have a question regarding services pricing: I heard of a possible discount for quantities exceeding 25 hours.
Could you confirm, please?</field>
<field name="type">comment</field>
<field name="author_id" ref="base.partner_demo"/>
</record>
@ -305,10 +305,9 @@ Can you clarify please?</field>
<field name="res_id" ref="sale_order_2"/>
<field name="parent_id" ref="message_sale_1"/>
<field name="body">Hello,
Sorry but that scheme is not available for now,
We would like to know if you confirm the quotation with pricing we sent to you.
Thanks,
Sales Department</field>
Unfortunately that was a temporary discount that is not available anymore.
Do you still plan to confirm the order based on the quoted prices?
Thanks!</field>
<field name="type">comment</field>
<field name="author_id" ref="base.partner_root"/>
</record>
@ -317,7 +316,7 @@ Sales Department</field>
<field name="model">sale.order</field>
<field name="res_id" ref="sale_order_2"/>
<field name="parent_id" ref="message_sale_2"/>
<field name="body">Ok, fine, we will intimate you after discussing with our team.</field>
<field name="body">Alright, thanks for the clarification. I will confirm the order as soon as I get my manager's approval.</field>
<field name="type">comment</field>
<field name="author_id" ref="base.partner_demo"/>
</record>

4
addons/stock/i18n/pt_BR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:35+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:39+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: stock
#: field:product.product,track_outgoing:0

4
addons/survey/i18n/pt_BR.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-17 04:36+0000\n"
"X-Generator: Launchpad (build 16152)\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
#. module: survey
#: view:survey.print:0