diff options
| author | ron@tinyerp.com <> | 2011-11-11 16:33:56 +0530 |
|---|---|---|
| committer | ron@tinyerp.com <> | 2011-11-11 16:33:56 +0530 |
| commit | afe2cdb3c7632f4a03569bbca5eb5401a0f446e7 (patch) | |
| tree | d4d724c224718ac462284a4e1c4c0d67a9f82cc2 | |
| parent | 7a34cf55a3607c0d164d8eb08b78c698de0df452 (diff) | |
| parent | a5abffbc65aa80ef8c896846a526e9f2ca504a25 (diff) | |
[MERGE] Merged with lp:addons
bzr revid: ron@tinyerp.com-20111111110356-gas4sfpm9knt104h
378 files changed, 7035 insertions, 1861 deletions
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index b35b37aa972..230078c4e33 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -28,7 +28,8 @@ <field name="charts"/> <group colspan="4" groups="account.group_account_user"> <separator col="4" colspan="4" string="Configure Fiscal Year"/> - <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> + <field name="has_default_company" invisible="1" /> + <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> <field name="date_start" on_change="on_change_start_date(date_start)"/> <field name="date_stop"/> <field name="period" colspan="4"/> diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 8f873065014..e100e174498 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -306,9 +306,9 @@ class account_invoice(osv.osv): view_id = view_id[0] res = super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu) - type = context.get('journal_type', 'sale') + type = context.get('journal_type', False) for field in res['fields']: - if field == 'journal_id': + if field == 'journal_id' and type: journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1) res['fields'][field]['selection'] = journal_select @@ -1559,6 +1559,7 @@ class account_invoice_tax(osv.osv): for line in inv.invoice_line: for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']: + tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit']) val={} val['invoice_id'] = inv.id val['name'] = tax['name'] diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index bca024793fd..0ac7a51405d 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -199,15 +199,15 @@ </record> <record id="conf_cli" model="account.account.template"> - <field name="code">111</field> + <field name="code">12</field> <field name="name">Current Liabilities</field> - <field ref="conf_nca" name="parent_id"/> + <field ref="conf_bal" name="parent_id"/> <field name="type">view</field> <field name="user_type" ref="account_type_liability_view1"/> </record> <record id="conf_a_pay" model="account.account.template"> - <field name="code">1111</field> + <field name="code">120</field> <field name="name">Creditors</field> <field ref="conf_cli" name="parent_id"/> <field name="type">payable</field> @@ -216,7 +216,7 @@ </record> <record id="conf_iva" model="account.account.template"> - <field name="code">1112</field> + <field name="code">121</field> <field name="name">Tax Received</field> <field ref="conf_cli" name="parent_id"/> <field name="type">other</field> @@ -224,7 +224,7 @@ </record> <record id="conf_a_reserve_and_surplus" model="account.account.template"> - <field name="code">1113</field> + <field name="code">122</field> <field name="name">Reserve and Profit/Loss Account</field> <field ref="conf_cli" name="parent_id"/> <field name="type">other</field> @@ -233,7 +233,7 @@ </record> <record id="conf_o_expense" model="account.account.template"> - <field name="code">1114</field> + <field name="code">123</field> <field name="name">Opening Expense Account</field> <field ref="conf_cli" name="parent_id"/> <field name="type">other</field> diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index baac2ec03d0..54a4ed3c9e8 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -266,7 +266,7 @@ msgstr "" #: code:addons/account/invoice.py:1210 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" -msgstr "" +msgstr "فاتورة '%s' ستدفع علي الأجزاء التالية: %s%s of %s%s (%s%s المتبقي)" #. module: account #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 @@ -664,7 +664,7 @@ msgstr "" #. module: account #: field:account.fiscalyear.close,period_id:0 msgid "Opening Entries Period" -msgstr "" +msgstr "فترة قيود إفتتاحية" #. module: account #: model:ir.model,name:account.model_account_journal_period @@ -1325,7 +1325,7 @@ msgstr "لا يمكنك إستخدام هذا الحساب العام في هذ #: report:pl.account:0 #: report:pl.account.horizontal:0 msgid "With balance is not equal to 0" -msgstr "" +msgstr "برصيد لا يساوي صفر" #. module: account #: view:account.tax:0 diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po index 02a76796cdc..b6f703a02cb 100644 --- a/addons/account/i18n/bg.po +++ b/addons/account/i18n/bg.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po index 7a4a57ec008..b6732915bcf 100644 --- a/addons/account/i18n/br.po +++ b/addons/account/i18n/br.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po index 1f170b6df90..31f8d5e5ff7 100644 --- a/addons/account/i18n/bs.po +++ b/addons/account/i18n/bs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po index 2b465073f48..989d6033466 100644 --- a/addons/account/i18n/ca.po +++ b/addons/account/i18n/ca.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-08-17 22:28+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 13:03+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11762,6 +11762,9 @@ msgstr "Passiu" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balanç de situació (comptes d'actiu)" + #, python-format #~ msgid "is validated." #~ msgstr "està validada." diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 5f780150272..240bbf5c248 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-16 08:47+0000\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" "Last-Translator: Jiří Hajda <robie@centrum.cz>\n" "Language-Team: Czech <cs@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: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" @@ -10150,5 +10150,8 @@ msgstr "" #~ msgid "The statement balance is incorrect !\n" #~ msgstr "Nesprávný zůstatek výpisu!\n" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Rozvaha (Majetkové účty)" + #~ msgid "Chart of Account" #~ msgstr "Účtový rozvrh" diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 61e2b5d9e6b..64893f3533f 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-11-01 21:03+0000\n" +"PO-Revision-Date: 2011-11-08 11:58+0000\n" "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:08+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -2439,7 +2439,7 @@ msgstr "Bankafstemning" #. module: account #: report:account.invoice:0 msgid "Disc.(%)" -msgstr "" +msgstr "Rabatprocent" #. module: account #: report:account.general.ledger:0 @@ -2744,6 +2744,8 @@ msgid "" "Set if the amount of tax must be included in the base amount before " "computing the next taxes." msgstr "" +"Vælg: Hvis afgiftsbeløbet, skal indgå i beregningsgrundlaget for beregning " +"af de følgende afgifter" #. module: account #: help:account.journal,user_id:0 @@ -4789,7 +4791,7 @@ msgstr "" #. module: account #: report:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "" +msgstr "(Konto / Kontakt) Navn" #. module: account #: view:account.bank.statement:0 @@ -7125,7 +7127,7 @@ msgstr "" #. module: account #: field:account.tax.code,sum_period:0 msgid "Period Sum" -msgstr "" +msgstr "Periode sum" #. module: account #: help:account.tax,sequence:0 @@ -7257,7 +7259,7 @@ msgstr "" #: field:account.subscription,state:0 #: field:report.invoice.created,state:0 msgid "State" -msgstr "Stat" +msgstr "Tilstand" #. module: account #: help:account.open.closed.fiscalyear,fyear_id:0 diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 7337ae8a538..d1939efaf5f 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-02 08:42+0000\n" -"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n" +"PO-Revision-Date: 2011-11-07 13:03+0000\n" +"Last-Translator: Ferdinand-camptocamp <Unknown>\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-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11735,6 +11735,9 @@ msgstr "Verbindlichkeiten" #~ msgid "Invoice " #~ msgstr "Rechnung " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilanz (Vermögen)" + #~ msgid "Invalid model name in the action definition." #~ msgstr "Ungültiger Modulname in der Aktionsdefinition." diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po index 5f7a3b0f11f..db972ab2e5f 100644 --- a/addons/account/i18n/el.po +++ b/addons/account/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po index 0cff5a4a0ff..16761252d6c 100644 --- a/addons/account/i18n/en_GB.po +++ b/addons/account/i18n/en_GB.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4398,7 +4398,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po index cc6f498b293..5b1abbe4cd1 100644 --- a/addons/account/i18n/en_US.po +++ b/addons/account/i18n/en_US.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 9fdf65ca0e4..3d9d0cb6d31 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-08-17 23:12+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11766,6 +11766,9 @@ msgstr "Pasivos" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balance de situación (cuentas de activos)" + #, python-format #~ msgid "is validated." #~ msgstr "está validada." diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po index e9c2d3c08c4..0c50fa3431b 100644 --- a/addons/account/i18n/es_AR.po +++ b/addons/account/i18n/es_AR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po index db81b258070..4d8ae4b0df0 100644 --- a/addons/account/i18n/es_CL.po +++ b/addons/account/i18n/es_CL.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4364,7 +4364,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index b33d191c2bc..ea7fead4f0e 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4580,7 +4580,7 @@ msgstr "Detalle de asientos Contables" #. module: account #: selection:account.account.type,report_type:0 msgid "Balance Sheet (Asset Accounts)" -msgstr "Hoja de Balance (Cuentas de Activo)" +msgstr "" #. module: account #: report:account.tax.code.entries:0 @@ -11610,6 +11610,9 @@ msgstr "Pasivos" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Hoja de Balance (Cuentas de Activo)" + #~ msgid "Chart of Account" #~ msgstr "Plan de Cuentas" diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po index cf9e549f8ce..7e625ea038b 100644 --- a/addons/account/i18n/es_PY.po +++ b/addons/account/i18n/es_PY.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4598,8 +4598,8 @@ msgstr "Registros del diario" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" -msgstr "Balance de situación (cuentas de activos)" +msgid "Balance Sheet (Asset Accounts)" +msgstr "" #. module: account #: report:account.tax.code.entries:0 @@ -10401,6 +10401,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balance de situación (cuentas de activos)" + #, python-format #~ msgid "is validated." #~ msgstr "está validada." diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po index aad25b9de20..31516e79afc 100644 --- a/addons/account/i18n/et.po +++ b/addons/account/i18n/et.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po index 17e1b5e2478..e8a27c45eb2 100644 --- a/addons/account/i18n/eu.po +++ b/addons/account/i18n/eu.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po index 7c45244c7fa..fe4ea4f52f7 100644 --- a/addons/account/i18n/fa.po +++ b/addons/account/i18n/fa.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po index a9f720c8193..204473e7f50 100644 --- a/addons/account/i18n/fa_AF.po +++ b/addons/account/i18n/fa_AF.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po index b596cc24779..1d425787f6d 100644 --- a/addons/account/i18n/fi.po +++ b/addons/account/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-18 09:18+0000\n" -"Last-Translator: Pekka Pylvänäinen <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Finnish <fi@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: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11159,6 +11159,9 @@ msgstr "Vastuut" #~ msgid "Balance:" #~ msgstr "Saldo:" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Tase (omaisuustilit)" + #, python-format #~ msgid "is validated." #~ msgstr "on tarkistettu." diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index d24f145b9e7..4129c9cd735 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-16 09:10+0000\n" -"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11744,6 +11744,9 @@ msgstr "Passif" #~ "The expected balance (%.2f) is different than the computed one. (%.2f)" #~ msgstr "Le solde affiché (%.2f) est différent du solde calculé. (%.2f)" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilan (comptes d'actif)" + #~ msgid "Chart of Account" #~ msgstr "Plan comptable" diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po index 143db252a23..f902b492437 100644 --- a/addons/account/i18n/fr_BE.po +++ b/addons/account/i18n/fr_BE.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po index e10d48dd10f..adba5d19687 100644 --- a/addons/account/i18n/gl.po +++ b/addons/account/i18n/gl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-27 15:37+0000\n" -"Last-Translator: Xosé <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Galician <gl@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: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -10079,6 +10079,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balance de situación (contas de activos)" + #, python-format #~ msgid "is validated." #~ msgstr "está validada." diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po index b03bfe6b7ee..2110a95d7f9 100644 --- a/addons/account/i18n/gu.po +++ b/addons/account/i18n/gu.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po index 8caabde1673..2ff59ed17c6 100644 --- a/addons/account/i18n/he.po +++ b/addons/account/i18n/he.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po index b1c439ef657..db02dad0ab5 100644 --- a/addons/account/i18n/hi.po +++ b/addons/account/i18n/hi.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index ee4842b188f..034e5e7de0f 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-17 06:59+0000\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" "Last-Translator: Goran Kliska <gkliska@gmail.com>\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-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -10902,5 +10902,8 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Račun " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilanca (konta imovine)" + #~ msgid "Chart of Account" #~ msgstr "Kontni plan" diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index fff0f9d55c0..0583e83ba5e 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.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-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-03-18 11:11+0000\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " "<openerp@novotrade.hu>\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-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -10615,6 +10615,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Számla " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Mérleg (eszköz számlák)" + #, python-format #~ msgid "is validated." #~ msgstr "jóváhagyásra került." diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po index bdd2ea1a65b..59de935b5c3 100644 --- a/addons/account/i18n/id.po +++ b/addons/account/i18n/id.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index c98787c8263..95b9d8641e9 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-05 12:13+0000\n" -"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11041,6 +11041,9 @@ msgstr "" #~ msgid "Chart of Account" #~ msgstr "Piano dei conti" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilancio (Attività)" + #~ msgid "Header" #~ msgstr "Intestazione" diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po index 6a165c1e3f4..930391188d4 100644 --- a/addons/account/i18n/kab.po +++ b/addons/account/i18n/kab.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po index f0784fb2e36..a2ea28fb56d 100644 --- a/addons/account/i18n/kk.po +++ b/addons/account/i18n/kk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index 338eef94b7e..5a2f2856ab9 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po index 804da13fe16..96bea222d44 100644 --- a/addons/account/i18n/lo.po +++ b/addons/account/i18n/lo.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po index 36e506d3d79..8851d332f62 100644 --- a/addons/account/i18n/lt.po +++ b/addons/account/i18n/lt.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po index b4847723f90..c802a70768e 100644 --- a/addons/account/i18n/lv.po +++ b/addons/account/i18n/lv.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po index 1db0ff18a67..a36c2505229 100644 --- a/addons/account/i18n/mk.po +++ b/addons/account/i18n/mk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4363,7 +4363,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index a86e327aee1..e79fe091e1b 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-19 10:00+0000\n" +"PO-Revision-Date: 2011-11-07 13:02+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Mongolian <mn@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: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11151,6 +11151,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Нэхэмжлэл " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Баланс тайлан (Хөрөнгө)" + #~ msgid "Invalid model name in the action definition." #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна." diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po index e02e573a7eb..c3c90c9dcbe 100644 --- a/addons/account/i18n/nb.po +++ b/addons/account/i18n/nb.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-10-13 07:32+0000\n" -"Last-Translator: Rolv Råen (adEgo) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:43+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Norwegian Bokmal <nb@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: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -9843,6 +9843,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Faktura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balanse (Aktivakonti)" + #~ msgid "Chart of Account" #~ msgstr "Kontoplan" diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index 404f5a8ea77..0cbf9687cb7 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-18 22:08+0000\n" -"Last-Translator: debaetsr <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:54+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11406,3 +11406,6 @@ msgstr "" #, python-format #~ msgid "Invoice " #~ msgstr "Factuur " + +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balans (Actiefrekeningen)" diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po index d62a1d0c4fd..6e7b65bbbda 100644 --- a/addons/account/i18n/nl_BE.po +++ b/addons/account/i18n/nl_BE.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po index e1d3903bcee..442f4af30ef 100644 --- a/addons/account/i18n/oc.po +++ b/addons/account/i18n/oc.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 64ec87643de..b890024372b 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-13 06:21+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11355,6 +11355,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Faktura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilans (konta aktywów)" + #, python-format #~ msgid "is validated." #~ msgstr "zostało zatwierdzone." diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po index e84bf767dc6..5a995f8211b 100644 --- a/addons/account/i18n/pt.po +++ b/addons/account/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-22 00:46+0000\n" -"Last-Translator: Tiago Baptista <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:42+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11715,3 +11715,6 @@ msgstr "" #~ msgid "" #~ "The expected balance (%.2f) is different than the computed one. (%.2f)" #~ msgstr "O saldo esperado (%.2f) é diferente do calculado. (%.2f)" + +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balancete (Contas de Activo)" diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index d8c83002464..36d85714b06 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-02 18:53+0000\n" -"Last-Translator: Nédio Batista Marques <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11659,6 +11659,9 @@ msgstr "" #~ msgid "is validated." #~ msgstr "está validada." +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Planilha de Balanço (Ativos)" + #, python-format #~ msgid "Date not in a defined fiscal year" #~ msgstr "A data não está em um ano fiscal definido" diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index 007c0889e36..6d90115440d 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 755868c518b..935177ef07b 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-06-27 05:16+0000\n" -"Last-Translator: Andrew Yashchuk <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:58+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -10956,6 +10956,9 @@ msgstr "Обязательства" #~ msgid "is validated." #~ msgstr "проверен." +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Баланс (счета активов)" + #~ msgid "Accounting Statement" #~ msgstr "Бухгалтерская ведомость" diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po index 17c5062b20c..ba8ecf327e8 100644 --- a/addons/account/i18n/si.po +++ b/addons/account/i18n/si.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po index 3ce7a5a7398..8d08e6776b5 100644 --- a/addons/account/i18n/sk.po +++ b/addons/account/i18n/sk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po index 15e5ea3f93e..282b716dc63 100644 --- a/addons/account/i18n/sl.po +++ b/addons/account/i18n/sl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po index fe9ef79f9fb..8176d6350c4 100644 --- a/addons/account/i18n/sq.po +++ b/addons/account/i18n/sq.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po index b0d786a9c48..8545e0c8e3f 100644 --- a/addons/account/i18n/sr.po +++ b/addons/account/i18n/sr.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po index fbba4120bf6..5f65b7f4ce1 100644 --- a/addons/account/i18n/sr@latin.po +++ b/addons/account/i18n/sr@latin.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 03f5d86c97a..95adfaa6b15 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.14\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-24 13:10+0000\n" -"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11240,6 +11240,9 @@ msgstr "" #~ "The optional quantity expressed by this line, eg: number of product sold. " #~ "The quantity is not a legal requirement but is very usefull for some reports." +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balansräkning (Tillgångskonton)" + #, python-format #~ msgid "is validated." #~ msgstr "har validerats." diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po index 3365d043af3..058d1d661c3 100644 --- a/addons/account/i18n/ta.po +++ b/addons/account/i18n/ta.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po index 79f7e5457b8..29a1c2c2d92 100644 --- a/addons/account/i18n/te.po +++ b/addons/account/i18n/te.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po index 356c9798096..d074ef0aca9 100644 --- a/addons/account/i18n/th.po +++ b/addons/account/i18n/th.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po index 7cd12ad9b5b..ee21cddc1d0 100644 --- a/addons/account/i18n/tlh.po +++ b/addons/account/i18n/tlh.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 34b2334ba00..60d193ccb9a 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-20 15:30+0000\n" -"Last-Translator: Ayhan KIZILTAN <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11020,6 +11020,9 @@ msgstr "" #~ msgid "Message" #~ msgstr "İleti" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balance Sheet (Assets Accounts)" + #, python-format #~ msgid "The opening journal must not have any entry in the new fiscal year !" #~ msgstr "The opening journal must not have any entry in the new fiscal year !" diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po index 4b06d6db4cf..e7011eaa6fb 100644 --- a/addons/account/i18n/ug.po +++ b/addons/account/i18n/ug.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po index 5a52354a1f9..18548cd6803 100644 --- a/addons/account/i18n/uk.po +++ b/addons/account/i18n/uk.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po index 092372add3d..a855a9b7a26 100644 --- a/addons/account/i18n/ur.po +++ b/addons/account/i18n/ur.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index e7ea2108f3d..9d5ddd58e92 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-20 09:45+0000\n" -"Last-Translator: lam nhut tien <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:57+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Vietnamese <vi@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: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -10565,6 +10565,9 @@ msgstr "Tài sản nợ" #~ msgid "Entry encoding" #~ msgstr "Mã hóa bút toán" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bảng cân đối Kế toán (Các Tài khoản Tài sản)" + #, python-format #~ msgid "is validated." #~ msgstr "đã được kiểm tra." diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 1794c70616d..aa7282fe1ac 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-02 15:26+0000\n" +"PO-Revision-Date: 2011-11-07 12:54+0000\n" "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -11130,6 +11130,9 @@ msgstr "负债" #~ msgid "Invoice " #~ msgstr "发票 " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "资产负债表（资产科目）" + #~ msgid "Chart of Account" #~ msgstr "科目一览表" diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po index 59976feba32..7546f4df059 100644 --- a/addons/account/i18n/zh_HK.po +++ b/addons/account/i18n/zh_HK.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index 67776bf13df..d23bd13822b 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account diff --git a/addons/account/installer.py b/addons/account/installer.py index 530ea7ccc6f..6c6d6c41695 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -38,7 +38,9 @@ class account_installer(osv.osv_memory): def _get_charts(self, cr, uid, context=None): modules = self.pool.get('ir.module.module') - ids = modules.search(cr, uid, [('name', 'like', 'l10n_')], context=context) + # Looking for the module with the 'Account Charts' category + category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts') + ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context) charts = list( sorted(((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids, context=context)), @@ -59,12 +61,17 @@ class account_installer(osv.osv_memory): 'sale_tax': fields.float('Sale Tax(%)'), 'purchase_tax': fields.float('Purchase Tax(%)'), 'company_id': fields.many2one('res.company', 'Company', required=True), + 'has_default_company' : fields.boolean('Has Default Company', readonly=True), } def _default_company(self, cr, uid, context=None): user = self.pool.get('res.users').browse(cr, uid, uid, context=context) return user.company_id and user.company_id.id or False + def _default_has_default_company(self, cr, uid, context=None): + count = self.pool.get('res.company').search_count(cr, uid, [], context=context) + return bool(count == 1) + _defaults = { 'date_start': lambda *a: time.strftime('%Y-01-01'), 'date_stop': lambda *a: time.strftime('%Y-12-31'), @@ -72,6 +79,7 @@ class account_installer(osv.osv_memory): 'sale_tax': 0.0, 'purchase_tax': 0.0, 'company_id': _default_company, + 'has_default_company': _default_has_default_company, 'charts': 'configurable' } diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index ec9ded68a12..b185c8ab10a 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -44,8 +44,8 @@ <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical"/> - <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/> - <filter string="State" icon="terp-folder-green" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/> + <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/> + <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/> </group> </search> </field> diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 7b9bdfa03b3..0c4e633ec15 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -296,7 +296,7 @@ <td><para style="P14"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font> </para></td> <td><para style="P3"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']<>'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td> <td><para style="P3"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font> </para></td> - <td><para style="P3"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</font><font>[[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance'], currency = company.currency_id) ]]</font> </para></td> + <td><para style="P3"><font>[[ (a['type']<>'view' and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</font><font>[[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance'], currency_obj=company.currency_id) ]]</font> </para></td> </tr> </blockTable> <para style="P11"> diff --git a/addons/account/test/account_bank_statement.yml b/addons/account/test/account_bank_statement.yml index 6b66dd9029c..fc46370ef8b 100644 --- a/addons/account/test/account_bank_statement.yml +++ b/addons/account/test/account_bank_statement.yml @@ -1,6 +1,24 @@ - In order to test Bank Statement feature of account I create a bank statement line and confirm it and check it's move created - + I select the period and journal for the bank statement +- + !python {model: account.bank.statement}: | + import time + period = self._get_period(cr, uid, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu', + 'journal_type': 'bank', 'period_id':time.strftime('%m'), 'active_ids': [ref('menu_bank_statement_tree')], 'active_id': ref('menu_bank_statement_tree')}) + assert period, _('Period has not been selected') + journal = self._default_journal_id(cr, uid, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu', + 'journal_type': 'bank', 'period_id': time.strftime('%m'), 'active_ids': [ref('menu_bank_statement_tree')], 'active_id': ref('menu_bank_statement_tree')}) + assert journal, _('Journal has not been selected') +- + I select the date +- + !python {model: account.bank.statement}: | + import time + date = self.onchange_date(cr, uid, [], time.strftime('%Y-%m-%d'), context=None) + assert date, _('Date has not been selected') +- I create a bank statement with Opening and Closing balance 0. - !record {model: account.bank.statement, id: account_bank_statement_0}: @@ -8,29 +26,26 @@ balance_start: 0.0 date: !eval time.strftime('%Y-%m-%d') journal_id: account.bank_journal - name: / - period_id: account.period_10 - line_ids: - - account_id: account.a_recv - amount: 1000.0 - date: !eval time.strftime('%Y-%m-%d') - name: a - partner_id: base.res_partner_4 - sequence: 0.0 - type: general -- - I check that Initially bank statement is in the "Draft" state - - !assert {model: account.bank.statement, id: account_bank_statement_0}: - - state == 'draft' + I create bank statement line +- + !python {model: account.bank.statement.line}: | + partner = self.onchange_partner_id(cr, uid, [], ref('base.res_partner_4'), context=None) + vals = { + 'account_id': partner['value']['account_id'], + 'amount': 1000.0, + 'partner_id': ref('base.res_partner_4'), + 'statement_id': ref('account_bank_statement_0'), + 'name': 'EXT001' + } + vals.update(partner.get('value',{})) + line_id = self.create(cr, uid, vals) + assert line_id, "Account bank statement line has not been created" - I compute bank statement using Compute button - !python {model: account.bank.statement}: | - self.button_dummy(cr, uid, [ref("account_bank_statement_0")], {"lang": "en_US", - "tz": False, "active_model": "ir.ui.menu", "journal_type": "bank", "section_id": - False, "period_id": 10, "active_ids": [ref("account.menu_bank_statement_tree")], - "active_id": ref("account.menu_bank_statement_tree"), }) + self.button_dummy(cr, uid, [ref("account_bank_statement_0")]) - I modify the bank statement and set the Closing Balance. @@ -42,10 +57,7 @@ I confirm the bank statement using Confirm button - !python {model: account.bank.statement}: | - self.button_confirm_bank(cr, uid, [ref("account_bank_statement_0")], {"lang": - "en_US", "tz": False, "active_model": "ir.ui.menu", "journal_type": "bank", - "section_id": False, "period_id": 10, "active_ids": [ref("account.menu_bank_statement_tree")], - "active_id": ref("account.menu_bank_statement_tree"), }) + self.button_confirm_bank(cr, uid, [ref("account_bank_statement_0")]) - I check that bank statement state is now "Closed" - @@ -61,3 +73,11 @@ assert bank_data.move_line_ids, "Move lines not created for bank statement" for line in bank_data.move_line_ids: assert line.move_id.state == 'posted', "Move state is not posted" +- + Then I cancel Bank Statements and verifies that it raises a warning +- + !python {model: account.bank.statement}: | + try: + self.button_cancel(cr, uid, [ref("account_bank_statement_0")]) + except Exception, e: + assert e[0]=='UserError', 'Another exception has been raised!' diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml index d14bf6f3cc1..870def153b1 100644 --- a/addons/account/test/account_customer_invoice.yml +++ b/addons/account/test/account_customer_invoice.yml @@ -1,6 +1,35 @@ - In order to test account invoice I create a new customer invoice - + I will create bank detail +- + !record {model: res.partner.bank, id: res_partner_bank_0}: + state: bank + company_id: base.main_company + partner_id: base.main_partner + acc_number: 123456789 + footer: True + bank: base.res_bank_1 + bank_name: Reserve +- + I select the journal for customer invoice +- + !python {model: account.invoice}: | + journal = self.onchange_journal_id(cr, uid, [], journal_id=ref('account.sales_journal')) +- + I select the partner for customer invoice +- + !python {model: account.invoice}: | + partner = self.onchange_partner_id(cr, uid, [], 'out_invoice', ref('base.res_partner_3'), date_invoice=False, + payment_term=ref('account.account_payment_term_advance'), partner_bank_id=ref('res_partner_bank_0'), company_id=ref('base.main_company')) +- + I select the company for invoice +- + !python {model: account.invoice}: | + company = self.onchange_company_id(cr, uid, [], ref('base.main_company'), False, 'out_invoice', [], ref('base.EUR')) +- + I create a customer invoice +- !record {model: account.invoice, id: account_invoice_customer0}: account_id: account.a_recv address_contact_id: base.res_partner_address_zen @@ -8,16 +37,57 @@ company_id: base.main_company currency_id: base.EUR date_invoice: !eval time.strftime('%Y-%m-%d') - invoice_line: - - account_id: account.a_sale - name: '[PC3] Medium PC' - price_unit: 900.0 - quantity: 10.0 - product_id: product.product_product_pc3 - uos_id: product.product_uom_unit + payment_term: account.account_payment_term_advance + partner_bank_id: res_partner_bank_0 journal_id: account.sales_journal partner_id: base.res_partner_3 reference_type: none + name: 'Test Customer Invoice' +- + I select a product for invoice +- + !python {model: account.invoice.line}: | + product = self.product_id_change(cr, uid, [], ref("product.product_product_pc3"), False, qty=10.0, name='[PC3] Medium PC', + type='out_invoice', partner_id=ref('base.res_partner_3'), fposition_id=False, price_unit= 900.0, address_invoice_id=ref('base.res_partner_address_zen'), + currency_id=ref('base.EUR'), context={'lang': u'en_US', 'tz': False, 'type': 'out_invoice'}, company_id=ref('base.main_company')) + line = {} + line.update(product.get('value', {})) + line.update({ + 'quantity': 10.0, + 'invoice_id': ref("account_invoice_customer0"), + }) + invoice_line = self.create(cr, uid, line) +- + I select product Uos +- + !python {model: account.invoice.line}: | + inv_line_id = self.search(cr, uid, [('invoice_id','=',ref('account_invoice_customer0'))]) + uos = self.uos_id_change(cr, uid, inv_line_id, ref("product.product_product_pc3"), ref('product.product_uom_unit'), qty=0, name='[PC3] Medium PC', type='out_invoice', + partner_id=ref('base.res_partner_3'), fposition_id=False, price_unit=False, address_invoice_id=ref('base.res_partner_address_zen'), + currency_id=ref('base.EUR'), context={'lang': u'en_US', 'tz': False, 'type': 'out_invoice'}, company_id=ref('base.main_company')) +- + I select the account for invoice line +- + !python {model: account.invoice.line}: | + inv_line_id = self.search(cr, uid, [('invoice_id','=',ref('account_invoice_customer0'))]) + account = self.onchange_account_id(cr, uid, inv_line_id, False, ref('account.a_sale')) +- + I manually assign tax on invoice +- + !python {model: account.invoice.tax}: | + amt = self.amount_change(cr, uid, [], 50.0, ref('base.EUR'), ref('base.main_company'), False) + base_amt = self.base_change(cr, uid, [], 9000.0, ref('base.EUR'), ref('base.main_company'), False) + invoice_tax_line = { + 'name': 'Test Tax for Customer Invoice', + 'manual': 1, + 'base': base_amt['value']['base_amount'], + 'amount': amt['value']['tax_amount'], + 'account_id': ref('account.ova'), + 'invoice_id': ref("account_invoice_customer0"), + } + tax = self.create(cr, uid, invoice_tax_line) + assert tax, "Tax has not been assigned correctly" + - I check that Initially customer invoice is in the "Draft" state - @@ -55,6 +125,23 @@ acc_id=self.browse(cr, uid, ref("account_invoice_customer0")) assert acc_id.move_id, "Move not created for open invoice" - + I pay the Invoice +- + !python {model: account.invoice}: | + import time + pay = self.pay_and_reconcile(cr, uid, [ref('account_invoice_customer0')], + 9050.0, ref('cash'), ref('account.period_10'), + ref('bank_journal'), ref('cash'), + ref('account.period_10'), ref('bank_journal'), + name='Payment for test customer invoice') + assert (pay == True), "Incorrect Payment" +- + I verify that invoice is now in Paid state +- + !python {model: account.invoice}: | + inv = self.browse(cr, uid, ref("account_invoice_customer0")) + assert (inv.state == 'paid'), "Invoice is not in Paid state" +- I refund the invoice Using Refund Button - !record {model: account.invoice.refund, id: account_invoice_refund_0}: diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 297911f15f7..d2295b5bbf2 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -69,6 +69,9 @@ class account_fiscalyear_close(osv.osv_memory): cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),)) fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall())) + if not fy_period_set or not fy2_period_set: + raise osv.except_osv(_('UserError'), _('The periods to generate opening entries were not found')) + period = obj_acc_period.browse(cr, uid, data[0].period_id.id, context=context) new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0].fy2_id.id, context=context) old_fyear = obj_acc_fiscalyear.browse(cr, uid, fy_id, context=context) @@ -108,10 +111,10 @@ class account_fiscalyear_close(osv.osv_memory): #1. report of the accounts with defferal method == 'unreconciled' cr.execute(''' - SELECT a.id + SELECT a.id FROM account_account a LEFT JOIN account_account_type t ON (a.user_type = t.id) - WHERE a.active + WHERE a.active AND a.type != 'view' AND t.close_method = %s''', ('unreconciled', )) account_ids = map(lambda x: x[0], cr.fetchall()) @@ -122,15 +125,15 @@ class account_fiscalyear_close(osv.osv_memory): name, create_uid, create_date, write_uid, write_date, statement_id, journal_id, currency_id, date_maturity, partner_id, blocked, credit, state, debit, - ref, account_id, period_id, date, move_id, amount_currency, - quantity, product_id, company_id) + ref, account_id, period_id, date, move_id, amount_currency, + quantity, product_id, company_id) (SELECT name, create_uid, create_date, write_uid, write_date, statement_id, %s,currency_id, date_maturity, partner_id, blocked, credit, 'draft', debit, ref, account_id, %s, date, %s, amount_currency, quantity, product_id, company_id FROM account_move_line - WHERE account_id IN %s - AND ''' + query_line + ''' + WHERE account_id IN %s + AND ''' + query_line + ''' AND reconcile_id IS NULL)''', (new_journal.id, period.id, move_id, tuple(account_ids),)) #We have also to consider all move_lines that were reconciled @@ -197,7 +200,7 @@ class account_fiscalyear_close(osv.osv_memory): query_1st_part = """ INSERT INTO account_move_line ( debit, credit, name, date, move_id, journal_id, period_id, - account_id, currency_id, amount_currency, company_id, state) VALUES + account_id, currency_id, amount_currency, company_id, state) VALUES """ query_2nd_part = "" query_2nd_part_args = [] @@ -207,7 +210,7 @@ class account_fiscalyear_close(osv.osv_memory): cr.execute('SELECT sum(amount_currency) as balance_in_currency FROM account_move_line ' \ 'WHERE account_id = %s ' \ 'AND ' + query_line + ' ' \ - 'AND currency_id = %s', (account.id, account.currency_id.id)) + 'AND currency_id = %s', (account.id, account.currency_id.id)) balance_in_currency = cr.dictfetchone()['balance_in_currency'] company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index 8de1dc79bfb..436ea20a3c2 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory): 'period': fields.many2one('account.period', 'Force period'), 'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'), 'description': fields.char('Description', size=128, required=True), - 'filter_refund': fields.selection([('refund', 'Refund'), ('cancel', 'Cancel'),('modify', 'Modify')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'), + 'filter_refund': fields.selection([('refund', 'Create a draft Refund'), ('cancel', 'Cancel: refund invoice and reconcile'),('modify', 'Modify: refund invoice, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'), } def _get_journal(self, cr, uid, context=None): diff --git a/addons/account_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po index 43a16e89f86..5b199bb2909 100644 --- a/addons/account_accountant/i18n/da.po +++ b/addons/account_accountant/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-11-17 08:53+0000\n" -"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n" +"PO-Revision-Date: 2011-11-08 10:35+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:52+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_accountant #: model:ir.module.module,description:account_accountant.module_meta_information @@ -27,8 +27,8 @@ msgid "" " " msgstr "" "\n" -"Dette modul giver administrator brugeren adgang til alle de regnskabsmæssige " -"funktioner som bogføringsjournaler og kontoplaner.\n" +"Dette modul giver brugeren admin adgang til alle regnskabsfunktioner som " +"bogføringsjournaler og kontoplaner.\n" " " #. module: account_accountant diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py index a7bdb11ad67..429aa011f31 100644 --- a/addons/account_analytic_analysis/__init__.py +++ b/addons/account_analytic_analysis/__init__.py @@ -20,6 +20,7 @@ ############################################################################## import account_analytic_analysis +import cron_account_analytic_account # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index f75fe3d1615..32642caf49c 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -21,9 +21,9 @@ { - 'name' : 'Analytic Account View', + 'name' : 'Sales Contract Management', 'version' : '1.1', - 'category' : 'Hidden', + 'category' : 'Sales Management', 'complexity': "normal", 'description': """ This module is for modifying account analytic view to show important data to project manager of services companies. @@ -42,6 +42,7 @@ user-wise as well as month wise. "security/ir.model.access.csv", "account_analytic_analysis_view.xml", "account_analytic_analysis_menu.xml", + "account_analytic_analysis_cron.xml", ], 'demo_xml' : [], 'installable': True, diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 22eb9401ad7..8ebb75244a1 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -374,7 +374,28 @@ class account_analytic_account(osv.osv): res[id] = round(res.get(id, 0.0),2) return res - _columns ={ + def _is_overdue_quantity(self, cr, uid, ids, fieldnames, args, context=None): + result = dict.fromkeys(ids, 0) + + for record in self.browse(cr, uid, ids, context=context): + if record.quantity == 0.0 and record.quantity_max == 0.0: + result[record.id] = 0 + else: + result[record.id] = int(record.quantity >= record.quantity_max) + + return result + + def _get_analytic_account(self, cr, uid, ids, context=None): + result = set() + for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context): + result.add(line.account_id.id) + return list(result) + + _columns = { + 'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity', + store={ + 'account.analytic.line' : (_get_analytic_account, None, 20), + }), 'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount', help="Total customer invoiced amount for this account.", digits_compute=dp.get_precision('Account')), diff --git a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml new file mode 100644 index 00000000000..8564b1606eb --- /dev/null +++ b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding='UTF-8'?> +<openerp> + <data> + <record model="ir.cron" id="account_analytic_cron"> + <field name="name">Analytic Account Report for Sales</field> + <field name="interval_number">1</field> + <field name="interval_type">weeks</field> + <field name="numbercall">-1</field> + <field eval="False" name="doall"/> + <field eval="'account.analytic.account'" name="model"/> + <field eval="'cron_account_analytic_account'" name="function"/> + <field eval="'()'" name="args"/> + </record> + </data> +</openerp> diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index bfb7a892668..34840814154 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -20,6 +20,67 @@ <field name="view_mode">tree,form,graph</field> <field name="domain">[('date','<=',time.strftime('%Y-%m-%d')),('state','=','open')]</field> </record> - <menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing" groups="analytic.group_analytic_accounting"/> + <menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing" groups="base.group_extended"/> + + <record id="view_account_analytic_account_overdue_search" model="ir.ui.view"> + <field name="name">account.analytic.account.search</field> + <field name="model">account.analytic.account</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Analytic Account"> + <group col="8" colspan="4"> + <filter icon="terp-check" name="draft" string="Draft" domain="[('state','=','draft')]" help="Contracts not signed yet"/> + <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','=','open')]" help="Contracts in progress"/> + <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/> + <separator orientation="vertical"/> + <filter icon="terp-go-today" string="To Renew" domain="['|', '&', ('date', '!=', False), ('date', '<', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" + name="renew" + help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" /> + <filter icon="terp-go-month" + string=" +1 Month" + domain="[('date','<=', (datetime.date.today() + relativedelta(months=1)).strftime('%%Y-%%m-%%d')),('date','>=', time.strftime('%%Y-%%m-%%d'))]" + help="Analytic Accounts with a past deadline in one month." /> + + <separator orientation="vertical"/> + <field name="name" select="1"/> + <field name="code" select="1"/> + <field name="partner_id" select="1"> + <filter string="Has Partner" name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" /> + <filter string="Has No Partner" name="has_no_partner" domain="[('partner_id', '=', False)]" icon="terp-partner" /> + </field> + <field name="user_id"> + <filter string="My Accounts" domain="[('user_id','=',uid)]" icon="terp-personal" name="my_accounts" /> + <filter string="No Account Manager" domain="[('user_id', '=', False)]" icon="terp-personal-" /> + </field> + + </group> + <newline/> + <group expand="0" string="Group By..."> + <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> + <separator orientation="vertical"/> + <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/> + <!-- + <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date_start'}" /> + --> + <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" /> + </group> + </search> + </field> + </record> + + + <record id="action_account_analytic_overdue" model="ir.actions.act_window"> + <field name="name">Overdue Accounts</field> + <field name="res_model">account.analytic.account</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,graph</field> + <field name="context">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field> + <field name="domain">[('type','=','normal')]</field> + <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/> + <field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field> + </record> + <menuitem action="action_account_analytic_overdue" id="menu_action_account_analytic_overdue" sequence="50" parent="sale.menu_invoiced" groups="base.group_extended"/> + </data> </openerp> diff --git a/addons/account_analytic_analysis/cron_account_analytic_account.py b/addons/account_analytic_analysis/cron_account_analytic_account.py new file mode 100644 index 00000000000..581bbfe92e1 --- /dev/null +++ b/addons/account_analytic_analysis/cron_account_analytic_account.py @@ -0,0 +1,79 @@ +#!/usr/bin/env python +from osv import osv +from mako.template import Template +import time +try: + import cStringIO as StringIO +except ImportError: + import StringIO + +import tools + +MAKO_TEMPLATE = u"""Hello ${user.name}, + +Here is a list of contracts that have to be renewed for two +possible reasons: + - the end of contract date is passed + - the customer consumed more hours than expected + +Can you contact the customer in order to sell a new or renew its contract. +The contract has been set with a pending state, can you update the status +of the analytic account following this rule: + - Set Done: if the customer does not want to renew + - Set Open: if the customer purchased an extra contract + +Here is the list of contracts to renew: +% for partner, accounts in partners.iteritems(): + * ${partner.name} + % for account in accounts: + - Name: ${account.name} + % if account.quantity_max != 0.0: + - Quantity: ${account.quantity}/${account.quantity_max} hours + % endif + - Dates: ${account.date_start} to ${account.date and account.date or '???'} + - Contacts: + % for address in account.partner_id.address: + . ${address.name}, ${address.phone}, ${address.email} + % endfor + + % endfor +% endfor + +You can use the report in the menu: Sales > Invoicing > Overdue Accounts + +Regards, + +-- +OpenERP +""" + +class analytic_account(osv.osv): + _inherit = 'account.analytic.account' + + def cron_account_analytic_account(self, cr, uid, context=None): + domain = [ + ('name', 'not ilike', 'maintenance'), + ('partner_id', '!=', False), + ('user_id', '!=', False), + ('user_id.user_email', '!=', False), + ('state', 'in', ('draft', 'open')), + '|', ('date', '<', time.strftime('%Y-%m-%d')), ('date', '=', False), + ] + + account_ids = self.search(cr, uid, domain, context=context, order='name asc') + accounts = self.browse(cr, uid, account_ids, context=context) + + users = dict() + for account in accounts: + users.setdefault(account.user_id, dict()).setdefault(account.partner_id, []).append(account) + + account.write({'state' : 'pending'}, context=context) + + for user, data in users.iteritems(): + subject = '[OPENERP] Reporting: Analytic Accounts' + body = Template(MAKO_TEMPLATE).render_unicode(user=user, partners=data) + tools.email_send('noreply@openerp.com', [user.user_email, ], subject, body) + + return True + +analytic_account() diff --git a/addons/account_analytic_analysis/i18n/da.po b/addons/account_analytic_analysis/i18n/da.po index 545c570647c..95f24a21b1f 100644 --- a/addons/account_analytic_analysis/i18n/da.po +++ b/addons/account_analytic_analysis/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-11-22 07:38+0000\n" -"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n" +"PO-Revision-Date: 2011-11-08 21:41+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:20+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_invoiced:0 @@ -134,7 +134,7 @@ msgstr "Bruger" #. module: account_analytic_analysis #: field:account.analytic.account,ca_to_invoice:0 msgid "Uninvoiced Amount" -msgstr "" +msgstr "Ufaktureret beløb" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin:0 diff --git a/addons/account_analytic_default/i18n/da.po b/addons/account_analytic_default/i18n/da.po index 2cb76cfc57e..7e1a64488e0 100644 --- a/addons/account_analytic_default/i18n/da.po +++ b/addons/account_analytic_default/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-29 12:18+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:24+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:25+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information @@ -65,7 +65,7 @@ msgstr "Plukseddel" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Conditions" -msgstr "" +msgstr "Betingelser" #. module: account_analytic_default #: help:account.analytic.default,company_id:0 diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv index 112fe2fcbf4..f92a9fd4dfa 100644 --- a/addons/account_analytic_default/security/ir.model.access.csv +++ b/addons/account_analytic_default/security/ir.model.access.csv @@ -2,3 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0 access_account_analytic_default_manager,account.analytic.default.manager,model_account_analytic_default,account.group_account_manager,1,1,1,1 access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1 +access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1 diff --git a/addons/account_anglo_saxon/i18n/da.po b/addons/account_anglo_saxon/i18n/da.po new file mode 100644 index 00000000000..bf144945725 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/da.po @@ -0,0 +1,107 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-11-09 21:36+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: sql_constraint:purchase.order:0 +msgid "Order Reference must be unique !" +msgstr "Ordre reference skal være unik !" + +#. module: account_anglo_saxon +#: constraint:product.category:0 +msgid "Error ! You can not create recursive categories." +msgstr "Fejl ! Du kan ikke oprette rekusive katagorier." + +#. module: account_anglo_saxon +#: constraint:product.template:0 +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line +msgid "Invoice Line" +msgstr "Fakturalinie" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_purchase_order +msgid "Purchase Order" +msgstr "Indkøbsordre" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_template +msgid "Product Template" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_category +msgid "Product Category" +msgstr "Produkt katagori" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Accounting for Anglo Saxon countries" +msgstr "" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice +msgid "Invoice" +msgstr "Faktura" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_stock_picking +msgid "Picking List" +msgstr "Plukliste" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by\n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries\n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales.\n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at the moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account\n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account.\n" +" Secondly, price differences between actual purchase price and fixed " +"product standard price are booked on a separate account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index bacd29f1607..832ac75ba46 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -143,8 +143,12 @@ class account_asset_asset(osv.osv): depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context) amount_to_depr = residual_amount = asset.value_residual - - depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d') + if asset.prorata: + depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d') + else: + # depreciation_date = 1st January of purchase year + purchase_date = datetime.strptime(asset.purchase_date, '%Y-%m-%d') + depreciation_date = datetime(purchase_date.year, 1, 1) day = depreciation_date.day month = depreciation_date.month year = depreciation_date.year diff --git a/addons/account_asset/account_asset_demo.xml b/addons/account_asset/account_asset_demo.xml index 004526b1022..77185081848 100644 --- a/addons/account_asset/account_asset_demo.xml +++ b/addons/account_asset/account_asset_demo.xml @@ -4,13 +4,33 @@ <!-- Asset Category Demo --> - + <record id="account_asset_category_fixedassets0" model="account.asset.category"> <field name="account_expense_depreciation_id" ref="account.a_expense"/> <field name="account_asset_id" ref="account.xfa"/> <field name="account_depreciation_id" ref="account.xfa"/> <field name="journal_id" ref="account.expenses_journal"/> - <field name="name">Fixed Assets</field> + <field name="name">Hardware - 3 Years</field> + <field name="method_number">3</field> + </record> + + <record id="account_asset_category_sale" model="account.asset.category"> + <field name="account_expense_depreciation_id" ref="account.a_expense"/> + <field name="account_asset_id" ref="account.xfa"/> + <field name="account_depreciation_id" ref="account.xfa"/> + <field name="journal_id" ref="account.expenses_journal"/> + <field name="name">Cars - 5 Years</field> + <field name="method_number">5</field> + </record> + + + <record id="account_asset_category_sale" model="account.asset.category"> + <field name="account_expense_depreciation_id" ref="account.a_sale"/> + <field name="account_asset_id" ref="account.xfa"/> + <field name="account_depreciation_id" ref="account.xfa"/> + <field name="journal_id" ref="account.expenses_journal"/> + <field name="name">Revenue Recognition Maintenance Contract - 3 Years</field> + <field name="method_number">3</field> </record> <!-- diff --git a/addons/account_asset/i18n/sr@latin.po b/addons/account_asset/i18n/sr@latin.po new file mode 100644 index 00000000000..1b4d07213d3 --- /dev/null +++ b/addons/account_asset/i18n/sr@latin.po @@ -0,0 +1,536 @@ +# Serbian Latin translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-24 12:54+0000\n" +"PO-Revision-Date: 2011-11-10 16:33+0000\n" +"Last-Translator: Milan Milosevic <Unknown>\n" +"Language-Team: Serbian Latin <sr@latin@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: 2011-11-11 04:53+0000\n" +"X-Generator: Launchpad (build 14277)\n" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Open Assets" +msgstr "Slobodna sredstva" + +#. module: account_asset +#: field:account.asset.property,method_end:0 +#: field:account.asset.property.history,method_end:0 +msgid "Ending date" +msgstr "Datum završetka" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation board" +msgstr "Odbor za amortizaciju" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,name:0 +#: field:account.asset.board,asset_id:0 +#: field:account.asset.property,asset_id:0 +#: field:account.invoice.line,asset_id:0 +#: field:account.move.line,asset_id:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.model,name:account_asset.model_account_asset_asset +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +msgid "Asset" +msgstr "Sredstvo" + +#. module: account_asset +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Pogrešno ime modela u definiciji akcije." + +#. module: account_asset +#: selection:account.asset.property,method:0 +msgid "Linear" +msgstr "Linearno" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change duration" +msgstr "Izmeni trajanje" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Child assets" +msgstr "Dečja sredstva" + +#. module: account_asset +#: field:account.asset.board,value_asset:0 +msgid "Asset Value" +msgstr "Vrednost sredstva" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,name:0 +msgid "Reason" +msgstr "Razlog" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,entry_ids:0 +#: wizard_field:account.asset.compute,asset_compute,move_ids:0 +msgid "Entries" +msgstr "Stavke" + +#. module: account_asset +#: wizard_view:account.asset.compute,asset_compute:0 +msgid "Generated entries" +msgstr "Generisane stavke" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,method_delay:0 +#: field:account.asset.property,method_delay:0 +#: field:account.asset.property.history,method_delay:0 +msgid "Number of interval" +msgstr "Broj intervalâ" + +#. module: account_asset +#: wizard_button:account.asset.compute,asset_compute,asset_open:0 +msgid "Open entries" +msgstr "Otvorene stavke" + +#. module: account_asset +#: view:account.asset.asset:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list +#: model:ir.ui.menu,name:account_asset.menu_finance_Assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets +msgid "Assets" +msgstr "Sredstva" + +#. module: account_asset +#: selection:account.asset.property,method:0 +msgid "Progressive" +msgstr "Progresivno" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft +msgid "Draft Assets" +msgstr "Sredstva kao zabeleške" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +#: wizard_field:account.asset.modify,init,note:0 +#: view:account.asset.property.history:0 +msgid "Notes" +msgstr "Napomene" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change history" +msgstr "Izmeni istoriju" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation entries" +msgstr "Stavke amortizacije" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Methods" +msgstr "Metode" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +msgid "Asset properties to modify" +msgstr "Osobine sredstava za izmenu" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +msgid "Partner" +msgstr "Partner" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,method_period:0 +#: field:account.asset.property,method_period:0 +#: field:account.asset.property.history,method_period:0 +msgid "Period per interval" +msgstr "Period po intervalu" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation duration" +msgstr "Trajanje amortizacije" + +#. module: account_asset +#: field:account.asset.property,account_analytic_id:0 +msgid "Analytic account" +msgstr "Analitički konto" + +#. module: account_asset +#: field:account.asset.property,state:0 +msgid "State" +msgstr "Stanje" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation methods" +msgstr "Metodi amortizacije" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Other information" +msgstr "Ostale Informacije" + +#. module: account_asset +#: field:account.asset.board,value_asset_cumul:0 +msgid "Cumul. value" +msgstr "Kumul. vrednost" + +#. module: account_asset +#: view:account.asset.property:0 +msgid "Assets methods" +msgstr "Metodi sredstava" + +#. module: account_asset +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Nepravilan XML format za pregled ''Architecture''!" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_property +msgid "Asset property" +msgstr "Osobina sredstva" + +#. module: account_asset +#: wizard_view:account.asset.compute,asset_compute:0 +#: wizard_view:account.asset.compute,init:0 +#: wizard_button:account.asset.compute,init,asset_compute:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute +#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute +msgid "Compute assets" +msgstr "Izračunaj sredstva" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +#: wizard_button:account.asset.modify,init,asset_modify:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify +msgid "Modify asset" +msgstr "Izmeni sredstvo" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm asset" +msgstr "Potvrdi sredstvo" + +#. module: account_asset +#: view:account.asset.property.history:0 +#: model:ir.model,name:account_asset.model_account_asset_property_history +msgid "Asset history" +msgstr "Istorija sredstava" + +#. module: account_asset +#: field:account.asset.property,date:0 +msgid "Date created" +msgstr "Datum pravljenja" + +#. module: account_asset +#: model:ir.module.module,description:account_asset.module_meta_information +msgid "" +"Financial and accounting asset management.\n" +" Allows to define\n" +" * Asset category. \n" +" * Assets.\n" +" *Asset usage period and property.\n" +" " +msgstr "" +"Uređivanje finansijskih i obračunskih sredstava.\n" +" Omogućava definisanje\n" +" *Kategorije sredstva. \n" +" *Sredstva.\n" +" *Osobinu i trajanje upotrebe sredstva.\n" +" " + +#. module: account_asset +#: field:account.asset.board,value_gross:0 +#: field:account.asset.property,value_total:0 +msgid "Gross value" +msgstr "Bruto vrednost" + +#. module: account_asset +#: selection:account.asset.property,method_time:0 +msgid "Ending period" +msgstr "Datum završetka" + +#. module: account_asset +#: field:account.asset.board,name:0 +msgid "Asset name" +msgstr "Naziv sredstva" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Accounts information" +msgstr "Informacije o računu" + +#. module: account_asset +#: field:account.asset.asset,note:0 +#: field:account.asset.category,note:0 +#: field:account.asset.property.history,note:0 +msgid "Note" +msgstr "Napomena" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: selection:account.asset.property,state:0 +msgid "Draft" +msgstr "Nacrt" + +#. module: account_asset +#: field:account.asset.property,type:0 +msgid "Depr. method type" +msgstr "Tip metode amort." + +#. module: account_asset +#: field:account.asset.property,account_asset_id:0 +msgid "Asset account" +msgstr "Račun sredstva" + +#. module: account_asset +#: field:account.asset.property.history,asset_property_id:0 +msgid "Method" +msgstr "Metod" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +msgid "Normal" +msgstr "Normalno" + +#. module: account_asset +#: field:account.asset.property,method_progress_factor:0 +msgid "Progressif factor" +msgstr "Progresivni faktor" + +#. module: account_asset +#: field:account.asset.asset,localisation:0 +msgid "Localisation" +msgstr "Lokalizacija" + +#. module: account_asset +#: field:account.asset.property,method:0 +msgid "Computation method" +msgstr "Metod obračuna" + +#. module: account_asset +#: field:account.asset.property,method_time:0 +msgid "Time method" +msgstr "Metod vremena" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "Aktivno" + +#. module: account_asset +#: field:account.asset.property.history,user_id:0 +msgid "User" +msgstr "Korisnik" + +#. module: account_asset +#: field:account.asset.asset,property_ids:0 +msgid "Asset method name" +msgstr "Naziv metoda sredstva" + +#. module: account_asset +#: field:account.asset.asset,date:0 +#: field:account.asset.property.history,date:0 +msgid "Date" +msgstr "Datum" + +#. module: account_asset +#: field:account.asset.board,value_net:0 +msgid "Net value" +msgstr "Neto vrednost" + +#. module: account_asset +#: wizard_view:account.asset.close,init:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_close +msgid "Close asset" +msgstr "Zatvoreno sredstvo" + +#. module: account_asset +#: field:account.asset.property,history_ids:0 +msgid "History" +msgstr "Istorijat" + +#. module: account_asset +#: field:account.asset.property,account_actif_id:0 +msgid "Depreciation account" +msgstr "Račun za amortizaciju" + +#. module: account_asset +#: field:account.asset.asset,period_id:0 +#: wizard_field:account.asset.compute,init,period_id:0 +msgid "Period" +msgstr "Period" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form +msgid "Asset Category" +msgstr "Kategorija sredstva" + +#. module: account_asset +#: wizard_button:account.asset.close,init,end:0 +#: wizard_button:account.asset.compute,init,end:0 +#: wizard_button:account.asset.modify,init,end:0 +msgid "Cancel" +msgstr "Otkaži" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: wizard_button:account.asset.compute,asset_compute,end:0 +#: selection:account.asset.property,state:0 +msgid "Close" +msgstr "Zatvori" + +#. module: account_asset +#: selection:account.asset.property,state:0 +msgid "Open" +msgstr "Otvori" + +#. module: account_asset +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Ime stavke mora da počne sa x_ i ne sme da sadrži specijalne karaktere !" + +#. module: account_asset +#: model:ir.module.module,shortdesc:account_asset.module_meta_information +msgid "Asset management" +msgstr "Uređivanje sredstava" + +#. module: account_asset +#: view:account.asset.board:0 +#: field:account.asset.property,board_ids:0 +#: model:ir.model,name:account_asset.model_account_asset_board +msgid "Asset board" +msgstr "Odbor za sredstva" + +#. module: account_asset +#: field:account.asset.asset,state:0 +msgid "Global state" +msgstr "Globalno stanje" + +#. module: account_asset +#: selection:account.asset.property,method_time:0 +msgid "Delay" +msgstr "Kašnjenje" + +#. module: account_asset +#: wizard_view:account.asset.close,init:0 +msgid "General information" +msgstr "Opšti podaci" + +#. module: account_asset +#: field:account.asset.property,journal_analytic_id:0 +msgid "Analytic journal" +msgstr "Analitički dnevnik" + +#. module: account_asset +#: field:account.asset.property,name:0 +msgid "Method name" +msgstr "Naziv metode" + +#. module: account_asset +#: field:account.asset.property,journal_id:0 +msgid "Journal" +msgstr "Dnevnik" + +#. module: account_asset +#: field:account.asset.property.history,name:0 +msgid "History name" +msgstr "Naziv istorijata" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Close method" +msgstr "Zatvorena metoda" + +#. module: account_asset +#: field:account.asset.property,entry_asset_ids:0 +msgid "Asset Entries" +msgstr "Stavke sredstava" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 +#: view:account.asset.category:0 +#: field:account.asset.category,name:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "Kategorija sredstva" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation" +msgstr "Amortizacija" + +#. module: account_asset +#: field:account.asset.asset,code:0 +#: field:account.asset.category,code:0 +msgid "Asset code" +msgstr "Kod sredstva" + +#. module: account_asset +#: field:account.asset.asset,value_total:0 +msgid "Total value" +msgstr "Ukupna vrednost" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +msgid "View" +msgstr "Pregled" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General info" +msgstr "Opšti podaci" + +#. module: account_asset +#: field:account.asset.asset,sequence:0 +msgid "Sequence" +msgstr "Sekvenca" + +#. module: account_asset +#: field:account.asset.property,value_residual:0 +msgid "Residual value" +msgstr "Rezidualna vrednost" + +#. module: account_asset +#: wizard_button:account.asset.close,init,asset_close:0 +msgid "End of asset" +msgstr "Kraj sredstva" + +#. module: account_asset +#: selection:account.asset.property,type:0 +msgid "Direct" +msgstr "Direktno" + +#. module: account_asset +#: selection:account.asset.property,type:0 +msgid "Indirect" +msgstr "Indirektno" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent asset" +msgstr "Glavno sredstvo" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "Hijerarhija sredstava" diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 2f8c8b5d27b..9ea8c819984 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -204,12 +204,13 @@ <field name="arch" type="xml"> <tree string="Budget Lines"> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> + <field name="crossovered_budget_id" invisible="1"/> <field name="general_budget_id"/> <field name="date_from"/> <field name="date_to"/> <field name="paid_date"/> <field name="planned_amount"/> - <field name="practical_amount" select="1"/> + <field name="practical_amount"/> <field name="theoritical_amount"/> <field name="percentage"/> </tree> diff --git a/addons/account_budget/i18n/da.po b/addons/account_budget/i18n/da.po index 4657e9c8f94..90ba071a726 100644 --- a/addons/account_budget/i18n/da.po +++ b/addons/account_budget/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-23 06:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:25+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:36+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_budget #: field:crossovered.budget,creating_user_id:0 @@ -25,7 +25,7 @@ msgstr "" #. module: account_budget #: selection:crossovered.budget,state:0 msgid "Confirmed" -msgstr "" +msgstr "Bekræftet" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.open_budget_post_form @@ -47,7 +47,7 @@ msgstr "" #. module: account_budget #: view:crossovered.budget:0 msgid "Confirm" -msgstr "" +msgstr "Godkend" #. module: account_budget #: field:crossovered.budget,validating_user_id:0 diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po index 875d9341d99..55a5cf35391 100644 --- a/addons/account_budget/i18n/sr@latin.po +++ b/addons/account_budget/i18n/sr@latin.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-23 16:00+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"PO-Revision-Date: 2011-11-10 16:52+0000\n" +"Last-Translator: Milan Milosevic <Unknown>\n" "Language-Team: Serbian latin <sr@latin@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: 2011-11-05 05:37+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-11 04:53+0000\n" +"X-Generator: Launchpad (build 14277)\n" #. module: account_budget #: field:crossovered.budget,creating_user_id:0 msgid "Responsible User" -msgstr "Odgovorni Korisnik" +msgstr "Odgovorni korisnik" #. module: account_budget #: selection:crossovered.budget,state:0 @@ -57,7 +57,7 @@ msgstr "Potvrdi korisnika" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report msgid "Print Summary" -msgstr "Stampa Suamrnog" +msgstr "Ištampaj rezime" #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 @@ -76,7 +76,7 @@ msgstr "Završetak perioda" #: view:crossovered.budget:0 #: selection:crossovered.budget,state:0 msgid "Draft" -msgstr "Priprema" +msgstr "Nacrt" #. module: account_budget #: report:account.budget:0 @@ -88,7 +88,7 @@ msgstr "u" #: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report msgid "Print Budgets" -msgstr "Stampa Budzeta" +msgstr "Ištampaj Budžete" #. module: account_budget #: report:account.budget:0 @@ -98,7 +98,7 @@ msgstr "Valuta:" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_crossvered_report msgid "Account Budget crossvered report" -msgstr "Izvestaj Unakrsnog budzeta Naloga" +msgstr "Izveštaj unakrsnog naloga budžeta" #. module: account_budget #: selection:crossovered.budget,state:0 @@ -118,7 +118,7 @@ msgstr "do" #. module: account_budget #: field:crossovered.budget,state:0 msgid "Status" -msgstr "Status" +msgstr "Stanje" #. module: account_budget #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view @@ -132,11 +132,19 @@ msgid "" "revenue per analytic account and monitor its evolution based on the actuals " "realised during that period." msgstr "" +"Budžet je predviđanje očekivanih dohodaka i rashoda Vašeg preduzeća za " +"jedan period u budućnosti. Sa budžetom, preduzeće može da ima uvid u to " +"koliko novca uzima za jedan dati period, i da odredi najbolji mogući način " +"za njegovu podelu na razne kategorije. Uz praćenje gde novac ide, biće manje " +"izgleda za njegovo suvišno trošenje, kao i za postizanje Vaših finansijskih " +"ciljeva. Predvidite budžet detaljisanjem očekivanog dohotka po analitičkom " +"kontu i pratite mu razvoj baziran na aktuelnostima za vreme trajanja tog " +"perioda." #. module: account_budget #: view:account.budget.crossvered.summary.report:0 msgid "This wizard is used to print summary of budgets" -msgstr "Ovaj carobnjak je koriscen za prikaz sumarnog budzeta" +msgstr "Ovaj wizard se upotrebljava za štampanje rezimee budžeta" #. module: account_budget #: report:account.budget:0 @@ -153,7 +161,7 @@ msgstr "Opis" #. module: account_budget #: report:crossovered.budget.report:0 msgid "Currency" -msgstr "" +msgstr "Valuta" #. module: account_budget #: report:crossovered.budget.report:0 @@ -170,12 +178,12 @@ msgstr "Preduzeće" #. module: account_budget #: view:crossovered.budget:0 msgid "To Approve" -msgstr "Za Odobravanje" +msgstr "Za odobravanje" #. module: account_budget #: view:crossovered.budget:0 msgid "Reset to Draft" -msgstr "Vrati na Pripremu" +msgstr "Vrati na pripremu" #. module: account_budget #: view:account.budget.post:0 @@ -214,35 +222,35 @@ msgstr "Stvarni iznos" #: field:crossovered.budget,date_to:0 #: field:crossovered.budget.lines,date_to:0 msgid "End Date" -msgstr "Završni Datum" +msgstr "Datum završetka" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_analytic #: model:ir.model,name:account_budget.model_account_budget_report msgid "Account Budget report for analytic account" -msgstr "Izvestaj Budzeta Naloga za Analiticki Konto" +msgstr "Izveštaj budžeta za nalog analitičkog konta" #. module: account_budget #: view:account.analytic.account:0 msgid "Theoritical Amount" -msgstr "Teoretski Iznos" +msgstr "Teoretski iznos" #. module: account_budget #: field:account.budget.post,name:0 #: field:crossovered.budget,name:0 msgid "Name" -msgstr "Ime" +msgstr "Naziv" #. module: account_budget #: model:ir.model,name:account_budget.model_crossovered_budget_lines msgid "Budget Line" -msgstr "Lnija Budzeta" +msgstr "Linija budžeta" #. module: account_budget #: view:account.analytic.account:0 #: view:account.budget.post:0 msgid "Lines" -msgstr "redova" +msgstr "Redovi" #. module: account_budget #: report:account.budget:0 @@ -252,13 +260,13 @@ msgstr "redova" #: model:ir.actions.report.xml,name:account_budget.account_budget #: model:ir.model,name:account_budget.model_crossovered_budget msgid "Budget" -msgstr "Budzet" +msgstr "Budžet" #. module: account_budget #: code:addons/account_budget/account_budget.py:119 #, python-format msgid "Error!" -msgstr "Greška" +msgstr "Greška!" #. module: account_budget #: field:account.budget.post,code:0 @@ -270,7 +278,7 @@ msgstr "Kod" #: view:account.budget.analytic:0 #: view:account.budget.crossvered.report:0 msgid "This wizard is used to print budget" -msgstr "Ovaj carobnjak je koristen za prikaz budzeta" +msgstr "Ovaj wizard se upotrebljava za štampanje budžeta" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view @@ -282,19 +290,19 @@ msgstr "Ovaj carobnjak je koristen za prikaz budzeta" #: model:ir.ui.menu,name:account_budget.next_id_31 #: model:ir.ui.menu,name:account_budget.next_id_pos msgid "Budgets" -msgstr "Budzeti" +msgstr "Budžeti" #. module: account_budget #: constraint:account.analytic.account:0 msgid "" "Error! The currency has to be the same as the currency of the selected " "company" -msgstr "" +msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća" #. module: account_budget #: selection:crossovered.budget,state:0 msgid "Cancelled" -msgstr "Отказано" +msgstr "Otkazano" #. module: account_budget #: view:crossovered.budget:0 @@ -305,14 +313,14 @@ msgstr "Odobri" #: field:crossovered.budget,date_from:0 #: field:crossovered.budget.lines,date_from:0 msgid "Start Date" -msgstr "Početni datum" +msgstr "Datum početka" #. module: account_budget #: view:account.budget.post:0 #: field:crossovered.budget.lines,general_budget_id:0 #: model:ir.model,name:account_budget.model_account_budget_post msgid "Budgetary Position" -msgstr "Budzetska pozicija" +msgstr "Budžetska pozicija" #. module: account_budget #: field:account.budget.analytic,date_from:0 @@ -320,12 +328,12 @@ msgstr "Budzetska pozicija" #: field:account.budget.crossvered.summary.report,date_from:0 #: field:account.budget.report,date_from:0 msgid "Start of period" -msgstr "Početak razdoblja" +msgstr "Početak perioda" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report msgid "Account Budget crossvered summary report" -msgstr "Izvestaj unakrsnog budzeta naloga" +msgstr "Izvestaj rezimea budžeta za unakrsni konto" #. module: account_budget #: report:account.budget:0 @@ -339,7 +347,7 @@ msgstr "Teoretska zarada" #: view:account.budget.crossvered.summary.report:0 #: view:account.budget.report:0 msgid "Select Dates Period" -msgstr "Selektuj Datume razdoblja" +msgstr "Izaberi periode datuma" #. module: account_budget #: view:account.budget.analytic:0 @@ -377,38 +385,39 @@ msgid "" "Budgets per Budgets.\n" "\n" msgstr "" -"Ovaj modul omogucava knjigovodjama da obradjuju analize i unakrsne budzete.\n" +"Ovaj modul omogucava knjigovodjama da obradjuju analitičke i unakrsne " +"budžete.\n" "\n" -"Kada je jedno definisan Master Budzet i budzeti ( U knjigovodstvo/Budzeti),\n" -"Menadzer Projekta moze da postavi planirani iznos za svaki analiticki " +"Jednom kad se definišu Master Budžet i budžeti ( U knjigovodstvo/Budžeti),\n" +"Menadžer projekta može da postavi planirani iznos za svaki analitički " "konto.\n" "\n" -"Knjigovodja ima mogucnost da vidi ukupni planirani iznos za svaki\n" -"Budzet i Master Budzet da bi osigurao da ukupno planirani iznos nije manji " -"/veci od \n" -"planiranog Budzeta/Master Budzeta. Svaka lista\n" -"zapisa moze da se prebaci i u grafikon za laksi pregled iste.\n" +"Knjigovodja ima mogućnost da vidi ukupni planirani iznos za svaki\n" +"Budžet i Master Budžet da bi osigurao da ukupni planirani iznos nije manji " +"/veći od \n" +"planiranog Budžeta/Master Budžeta. Svaka lista\n" +"zapisa može da se prebaci i u grafikon.\n" "\n" -"Dostupna su TRI Izvestaja:\n" -" 1. Prvi je dostupan iz liste Budzeta. I on daje rasipanje za te budzete, " -"analitickog konta u odnosu na Master Budzet.\n" -" 2.Drugi je sumarni predhodnog izvestaja, on samo daje rasispanje za " -"selektovani Budzet analitickog konta.\n" -" 3.Poslednji je dostupan iz Analitickog Grafikona naloga ( konta). On " -"daje rasipanje za slektovani analiticki konto, MAster Budzeta po \n" -"Budzetu.\n" +"Dostupna su TRI izveštaja:\n" +" 1. Prvi je dostupan iz liste Budžeta. Za te budžete daje rasipanje " +"analitickog konta u odnosu na Master Budžet.\n" +" 2.Drugi je rezime predhodnog izveštaja, daje rasipanje samo za izabrani " +"Budžet analitičkog konta.\n" +" 3.Poslednji je dostupan iz analitičkog grafikona naloga ( konta). On " +"daje rasipanje za izabrani analitički konto, Master Budžeta po \n" +"Budžetu.\n" "\n" #. module: account_budget #: field:crossovered.budget.lines,analytic_account_id:0 #: model:ir.model,name:account_budget.model_account_analytic_account msgid "Analytic Account" -msgstr "Analitički nalog" +msgstr "Analitički konto" #. module: account_budget #: report:account.budget:0 msgid "Budget :" -msgstr "Budzet" +msgstr "Budžet" #. module: account_budget #: report:account.budget:0 @@ -434,7 +443,7 @@ msgstr "Nalozi" #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view msgid "Budget Lines" -msgstr "Budzetski Redovi" +msgstr "Budžetske linije" #. module: account_budget #: view:account.budget.analytic:0 @@ -448,12 +457,12 @@ msgstr "Otkaži" #. module: account_budget #: model:ir.module.module,shortdesc:account_budget.module_meta_information msgid "Budget Management" -msgstr "Budzetski Menadzment" +msgstr "Uređivanje budžeta" #. module: account_budget #: constraint:account.analytic.account:0 msgid "Error! You can not create recursive analytic accounts." -msgstr "" +msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge." #. module: account_budget #: report:account.budget:0 diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po index 12dea22e2d0..8fa64b04a48 100644 --- a/addons/account_cancel/i18n/da.po +++ b/addons/account_cancel/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-11-20 07:57+0000\n" -"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n" +"PO-Revision-Date: 2011-11-08 10:42+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:46+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_cancel #: model:ir.module.module,description:account_cancel.module_meta_information @@ -25,8 +25,13 @@ msgid "" "journal. If set to true it allows user to cancel entries & invoices.\n" " " msgstr "" +"\n" +" Modulet tilføjer feltet \"Tillad annullering af poster\" til formular " +"visning af bogføringsjournalen. Hvis feltet er afkrydset tillader det " +"brugeren at annullere poster og fakturaer.\n" +" " #. module: account_cancel #: model:ir.module.module,shortdesc:account_cancel.module_meta_information msgid "Account Cancel" -msgstr "" +msgstr "Annuller post" diff --git a/addons/account_chart/i18n/da.po b/addons/account_chart/i18n/da.po index 033ca634ec8..21f9528cfe6 100644 --- a/addons/account_chart/i18n/da.po +++ b/addons/account_chart/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-11-20 07:54+0000\n" -"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n" +"PO-Revision-Date: 2011-11-08 22:06+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:40+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_chart #: model:ir.module.module,description:account_chart.module_meta_information msgid "Remove minimal account chart" -msgstr "Fjern minimal kontoplan" +msgstr "Fjern kontoplan" #. module: account_chart #: model:ir.module.module,shortdesc:account_chart.module_meta_information diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 9081e862cfe..557364372b0 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -86,6 +86,8 @@ class report_rappel(report_sxw.rml_parse): def _get_text(self, partner, followup_id, context=None): + if context is None: + context = {} fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup') fp_line = fp_obj.browse(self.cr, self.uid, followup_id).followup_line li_delay = [] @@ -96,7 +98,6 @@ class report_rappel(report_sxw.rml_parse): a = {} partner_line = pooler.get_pool(self.cr.dbname).get('account.move.line').search(self.cr, self.uid, [('partner_id','=',partner.id),('reconcile_id','=',False)]) partner_delay = [] - context={} context.update({'lang': partner.lang}) for i in pooler.get_pool(self.cr.dbname).get('account.move.line').browse(self.cr, self.uid, partner_line, context): for delay in li_delay: @@ -110,7 +111,7 @@ class report_rappel(report_sxw.rml_parse): 'partner_name': partner.name, 'date': time.strftime('%Y-%m-%d'), 'company_name': fp_obj.browse(self.cr, self.uid, followup_id).company_id.name, - 'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature, + 'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '', } return text diff --git a/addons/account_invoice_layout/i18n/da.po b/addons/account_invoice_layout/i18n/da.po index cda7b3b0d94..a7321fbf92c 100644 --- a/addons/account_invoice_layout/i18n/da.po +++ b/addons/account_invoice_layout/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-12 17:17+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:26+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:22+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: account_invoice_layout #: selection:account.invoice.line,state:0 msgid "Sub Total" -msgstr "" +msgstr "Sub total" #. module: account_invoice_layout #: report:account.invoice.layout:0 diff --git a/addons/account_sequence/i18n/da.po b/addons/account_sequence/i18n/da.po new file mode 100644 index 00000000000..d7604035633 --- /dev/null +++ b/addons/account_sequence/i18n/da.po @@ -0,0 +1,221 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-11-09 21:40+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: account_sequence +#: view:account.sequence.installer:0 +#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer +msgid "Account Sequence Application Configuration" +msgstr "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create entries on different periods/journals in the same move" +msgstr "" + +#. module: account_sequence +#: help:account.move,internal_sequence_number:0 +#: help:account.move.line,internal_sequence_number:0 +msgid "Internal Sequence Number" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,number_next:0 +msgid "Next number of this sequence" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,number_next:0 +msgid "Next Number" +msgstr "Næste nummer" + +#. module: account_sequence +#: field:account.sequence.installer,number_increment:0 +msgid "Increment Number" +msgstr "" + +#. module: account_sequence +#: model:ir.module.module,description:account_sequence.module_meta_information +msgid "" +"\n" +" This module maintains internal sequence number for accounting entries.\n" +" " +msgstr "" + +#. module: account_sequence +#: model:ir.module.module,shortdesc:account_sequence.module_meta_information +msgid "Entries Sequence Numbering" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,number_increment:0 +msgid "The next number of the sequence will be incremented by this number" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure Your Account Sequence Application" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,progress:0 +msgid "Configuration Progress" +msgstr "Konfigurationsfremgang" + +#. module: account_sequence +#: help:account.sequence.installer,suffix:0 +msgid "Suffix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,company_id:0 +msgid "Company" +msgstr "Firma" + +#. module: account_sequence +#: help:account.journal,internal_sequence_id:0 +msgid "" +"This sequence will be used to maintain the internal number for the journal " +"entries related to this journal." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,padding:0 +msgid "Number padding" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_sequence +#: field:account.move,internal_sequence_number:0 +#: field:account.move.line,internal_sequence_number:0 +msgid "Internal Number" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "Company must be same for its related account and period." +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,padding:0 +msgid "" +"OpenERP will automatically adds some '0' on the left of the 'Next Number' to " +"get the required padding size." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,name:0 +msgid "Name" +msgstr "Navn" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on closed account." +msgstr "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create more than one move per period on centralized journal" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "Forkert kredit eller debet værdi i posteringerne!" + +#. module: account_sequence +#: field:account.journal,internal_sequence_id:0 +msgid "Internal Sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_sequence_installer +msgid "account.sequence.installer" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure" +msgstr "Konfigurer" + +#. module: account_sequence +#: help:account.sequence.installer,prefix:0 +msgid "Prefix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move +msgid "Account Entry" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,suffix:0 +msgid "Suffix" +msgstr "Suffiks" + +#. module: account_sequence +#: field:account.sequence.installer,config_logo:0 +msgid "Image" +msgstr "Billede" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "title" +msgstr "titel" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,prefix:0 +msgid "Prefix" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "" +"You can not create move line on receivable/payable account without partner" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_journal +msgid "Journal" +msgstr "Journal" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "You can enhance the Account Sequence Application by installing ." +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on view account." +msgstr "" diff --git a/addons/analytic_journal_billing_rate/i18n/da.po b/addons/analytic_journal_billing_rate/i18n/da.po new file mode 100644 index 00000000000..3ad40b63e32 --- /dev/null +++ b/addons/analytic_journal_billing_rate/i18n/da.po @@ -0,0 +1,95 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-03 16:56+0000\n" +"PO-Revision-Date: 2011-11-09 21:41+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: analytic_journal_billing_rate +#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information +msgid "" +"\n" +"\n" +" This module allows you to define what is the default invoicing rate for " +"a specific journal on a given account. This is mostly used when a user " +"encodes his timesheet: the values are retrieved and the fields are auto-" +"filled... but the possibility to change these values is still available.\n" +"\n" +" Obviously if no data has been recorded for the current account, the " +"default value is given as usual by the account data so that this module is " +"perfectly compatible with older configurations.\n" +"\n" +" " +msgstr "" + +#. module: analytic_journal_billing_rate +#: field:analytic_journal_rate_grid,journal_id:0 +msgid "Analytic Journal" +msgstr "" + +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice +msgid "Invoice" +msgstr "Faktura" + +#. module: analytic_journal_billing_rate +#: view:analytic_journal_rate_grid:0 +msgid "Billing Rate per Journal for this Analytic Account" +msgstr "" + +#. module: analytic_journal_billing_rate +#: field:analytic_journal_rate_grid,account_id:0 +#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account +msgid "Analytic Account" +msgstr "" + +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid +msgid "Relation table between journals and billing rates" +msgstr "" + +#. module: analytic_journal_billing_rate +#: field:account.analytic.account,journal_rate_ids:0 +msgid "Invoicing Rate per Journal" +msgstr "" + +#. module: analytic_journal_billing_rate +#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information +msgid "" +"Analytic Journal Billing Rate, Define the default invoicing rate for a " +"specific journal" +msgstr "" + +#. module: analytic_journal_billing_rate +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "" + +#. module: analytic_journal_billing_rate +#: field:analytic_journal_rate_grid,rate_id:0 +msgid "Invoicing Rate" +msgstr "" + +#. module: analytic_journal_billing_rate +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "" + +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "" diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index 0251eb68d02..3dc6c03f94e 100644 --- a/addons/association/__openerp__.py +++ b/addons/association/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Association profile', 'version': '0.1', - 'category': 'Vertical Applications', + 'category': 'Specific Industry Applications', 'complexity': "normal", 'description': """ This module is to configure modules related to an association. diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py index 511407e10a2..3f6c6c35e31 100644 --- a/addons/auction/__openerp__.py +++ b/addons/auction/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Auction Management', 'version': '1.0', - 'category': 'Vertical Applications', + 'category': 'Specific Industry Applications', 'complexity': "normal", 'description': """ This module manages the records of artists, auction articles, buyers and sellers. diff --git a/addons/auction/i18n/da.po b/addons/auction/i18n/da.po index 21f42c50265..8ff7a76f6fc 100644 --- a/addons/auction/i18n/da.po +++ b/addons/auction/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-23 14:47+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:27+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:25+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: auction #: model:ir.ui.menu,name:auction.auction_report_menu msgid "Reporting" -msgstr "" +msgstr "Rapportering" #. module: auction #: model:ir.model,name:auction.model_auction_taken diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py index b914dd1c643..f73552aa69f 100644 --- a/addons/auction/wizard/auction_pay_buy.py +++ b/addons/auction/wizard/auction_pay_buy.py @@ -82,12 +82,15 @@ class auction_pay_buy(osv.osv_memory): lots = lot_obj.browse(cr, uid, context.get('active_ids', []), context=context) for lot in lots: if datas['buyer_id']: + if isinstance(datas['buyer_id'], (tuple, list)): + datas['buyer_id'] = datas['buyer_id'][0] lot_obj.write(cr, uid, [lot.id], {'ach_uid': datas['buyer_id']}) if not lot.auction_id: raise osv.except_osv(_('Error!'), _('No auction date for "%s": Please set one.') % (lot.name)) lot_obj.write(cr, uid, [lot.id], {'is_ok':True}) - for st, stamount in [('statement_id1', 'amount'), ('statement_id2', 'amount2'), ('statement_id3', 'amount3')]: + if isinstance(datas[st], tuple): + datas[st] = datas[st][0] if datas[st]: new_id = bank_statement_line_obj.create(cr, uid, { 'name':'Buyer:'+ str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name, diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 805c35e4462..4b3fe0a167d 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -446,15 +446,11 @@ the rule to mark CC(mail to any other person defined in actions)."), scrit = [] for action in self.browse(cr, uid, ids, context=context): - model_obj = self.pool.get(action.model_id.model) for obj in objects: - ok = self.do_check(cr, uid, action, obj, context=context) - if not ok: - continue + if self.do_check(cr, uid, action, obj, context=context): + model_obj = self.pool.get(action.model_id.model) + self.do_action(cr, uid, action, model_obj, obj, context=context) - if ok: - self.do_action(cr, uid, action, model_obj, obj, context) - break context.update({'action': False}) return True diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po index 9424977f407..06244915efc 100644 --- a/addons/base_action_rule/i18n/da.po +++ b/addons/base_action_rule/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-26 15:35+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:29+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:51+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_action_rule #: help:base.action.rule,act_mail_to_user:0 @@ -46,7 +46,7 @@ msgstr "" #. module: base_action_rule #: field:base.action.rule,model_id:0 msgid "Object" -msgstr "" +msgstr "Objekt" #. module: base_action_rule #: field:base.action.rule,act_mail_to_email:0 @@ -66,7 +66,7 @@ msgstr "E-mail fra" #. module: base_action_rule #: view:base.action.rule:0 msgid "Email Body" -msgstr "" +msgstr "Email indhold" #. module: base_action_rule #: selection:base.action.rule,trg_date_range_type:0 diff --git a/addons/base_calendar/i18n/ar.po b/addons/base_calendar/i18n/ar.po new file mode 100644 index 00000000000..bf7e3d0748a --- /dev/null +++ b/addons/base_calendar/i18n/ar.po @@ -0,0 +1,1665 @@ +# Arabic translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-11-10 06:06+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Arabic <ar@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: 2011-11-11 04:53+0000\n" +"X-Generator: Launchpad (build 14277)\n" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_related:0 +#: selection:res.alarm,trigger_related:0 +msgid "The event starts" +msgstr "بداية الحدث" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +msgid "Hourly" +msgstr "كل ساعة" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Required to Join" +msgstr "مطلوب للانضمام" + +#. module: base_calendar +#: help:calendar.event,exdate:0 +#: help:calendar.todo,exdate:0 +msgid "" +"This property defines the list of date/time exceptions for a recurring " +"calendar component." +msgstr "" + +#. module: base_calendar +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" +"الشركة المختارة غير مدرجة ضمن قائمة الشركات المسموح بها لهذا المستخدم" + +#. module: base_calendar +#: field:calendar.event.edit.all,name:0 +msgid "Title" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Monthly" +msgstr "شهرياً" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invited User" +msgstr "مستخدم مدعو" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation" +msgstr "دعوة" + +#. module: base_calendar +#: help:calendar.event,recurrency:0 +#: help:calendar.todo,recurrency:0 +msgid "Recurrent Meeting" +msgstr "اجتماع دوري" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view +#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm +msgid "Alarms" +msgstr "المنبهات" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Sunday" +msgstr "الأحد" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,role:0 +msgid "Role" +msgstr "الدور" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Invitation details" +msgstr "تفاصيل الدعوة" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Fourth" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,show_as:0 +#: field:calendar.todo,show_as:0 +msgid "Show as" +msgstr "عرض كـ" + +#. module: base_calendar +#: field:base.calendar.set.exrule,day:0 +#: selection:base.calendar.set.exrule,select1:0 +#: field:calendar.event,day:0 +#: selection:calendar.event,select1:0 +#: field:calendar.todo,day:0 +#: selection:calendar.todo,select1:0 +msgid "Date of month" +msgstr "اليوم من الشهر" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Public" +msgstr "عام" + +#. module: base_calendar +#: view:calendar.event:0 +msgid " " +msgstr " " + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "March" +msgstr "مارس/آذار" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:414 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90 +#, python-format +msgid "Warning !" +msgstr "تحذير !" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Friday" +msgstr "الجمعة" + +#. module: base_calendar +#: field:calendar.event,allday:0 +#: field:calendar.todo,allday:0 +msgid "All Day" +msgstr "كامل اليوم" + +#. module: base_calendar +#: field:base.calendar.set.exrule,select1:0 +#: field:calendar.event,select1:0 +#: field:calendar.todo,select1:0 +msgid "Option" +msgstr "خيار" + +#. module: base_calendar +#: selection:calendar.attendee,availability:0 +#: selection:calendar.event,show_as:0 +#: selection:calendar.todo,show_as:0 +#: selection:res.users,availability:0 +msgid "Free" +msgstr "حرّ" + +#. module: base_calendar +#: help:calendar.attendee,rsvp:0 +msgid "Indicats whether the favor of a reply is requested" +msgstr "يشير إلى استحسان الرد" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_attachment +msgid "ir.attachment" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,delegated_to:0 +msgid "The users that the original request was delegated to" +msgstr "المستخدمون الذين فُوِّض إليهم الطلب الأصلي" + +#. module: base_calendar +#: field:calendar.attendee,ref:0 +msgid "Event Ref" +msgstr "مرجع الحدث" + +#. module: base_calendar +#: field:base.calendar.set.exrule,we:0 +#: field:calendar.event,we:0 +#: field:calendar.todo,we:0 +msgid "Wed" +msgstr "الأربعاء" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Show time as" +msgstr "اعرض الوقت كـ" + +#. module: base_calendar +#: field:base.calendar.set.exrule,tu:0 +#: field:calendar.event,tu:0 +#: field:calendar.todo,tu:0 +msgid "Tue" +msgstr "الثلاثاء" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Yearly" +msgstr "سنوياً" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_related:0 +#: selection:res.alarm,trigger_related:0 +msgid "The event ends" +msgstr "نهاية الحدث" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Last" +msgstr "الأخير" + +#. module: base_calendar +#: help:calendar.attendee,state:0 +msgid "Status of the attendee's participation" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Room" +msgstr "غرفة" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Days" +msgstr "الأيام" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Invitation Detail" +msgstr "تفاصيل الدعوة" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:1355 +#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96 +#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136 +#, python-format +msgid "Error!" +msgstr "خطأ!" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Chair Person" +msgstr "الرئيس" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Procedure" +msgstr "الإجراءات" + +#. module: base_calendar +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Cancelled" +msgstr "ملغي" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Minutes" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Display" +msgstr "عرض" + +#. module: base_calendar +#: view:calendar.event.edit.all:0 +msgid "Edit all Occurrences" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation type" +msgstr "نوع الدعوة" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +msgid "Secondly" +msgstr "ثانياً" + +#. module: base_calendar +#: field:calendar.alarm,event_date:0 +#: field:calendar.attendee,event_date:0 +#: view:calendar.event:0 +msgid "Event Date" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Group By..." +msgstr "تجميع حسب ..." + +#. module: base_calendar +#: help:base_calendar.invite.attendee,email:0 +msgid "Provide external email address who will receive this invitation." +msgstr "أضف عنوان بريد إلكتروني خارجي لتلقي هذه الدعوة." + +#. module: base_calendar +#: model:ir.module.module,description:base_calendar.module_meta_information +msgid "" +"Full featured calendar system that supports:\n" +" - Calendar of events\n" +" - Alerts (create requests)\n" +" - Recurring events\n" +" - Invitations to people" +msgstr "" +"نظام تقويم متميز يوفر ويدعم:\n" +" - جدولاً زمنياً للأحداث\n" +" - منبهات (إنشاء طلبات)\n" +" - الأحداث الدورية\n" +" - توجيه الدعوات" + +#. module: base_calendar +#: help:calendar.attendee,cutype:0 +msgid "Specify the type of Invitation" +msgstr "حدد نوع الدعوة" + +#. module: base_calendar +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Years" +msgstr "سنوات" + +#. module: base_calendar +#: field:calendar.alarm,event_end_date:0 +#: field:calendar.attendee,event_end_date:0 +msgid "Event End Date" +msgstr "الحدث والتاريخ" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Optional Participation" +msgstr "مشاركة اختيارية" + +#. module: base_calendar +#: field:calendar.event,date_deadline:0 +#: field:calendar.todo,date_deadline:0 +msgid "Deadline" +msgstr "الموعد النهائي" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:385 +#: code:addons/base_calendar/base_calendar.py:1088 +#: code:addons/base_calendar/base_calendar.py:1090 +#, python-format +msgid "Warning!" +msgstr "تحذير!" + +#. module: base_calendar +#: help:calendar.event,active:0 +#: help:calendar.todo,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the " +"event alarm information without removing it." +msgstr "" +"في حالة اختيار الحقل \"نشط\"، يمكنك إخفاء معلومات المنبه للحدث دون حذفه." + +#. module: base_calendar +#: model:ir.module.module,shortdesc:base_calendar.module_meta_information +msgid "Basic Calendar Functionality" +msgstr "تقويم بسيط" + +#. module: base_calendar +#: field:calendar.event,organizer:0 +#: field:calendar.event,organizer_id:0 +#: field:calendar.todo,organizer:0 +#: field:calendar.todo,organizer_id:0 +msgid "Organizer" +msgstr "المنظِّم" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +#: field:calendar.event,user_id:0 +#: field:calendar.todo,user_id:0 +msgid "Responsible" +msgstr "مسئول" + +#. module: base_calendar +#: view:calendar.event:0 +#: model:res.request.link,name:base_calendar.request_link_meeting +msgid "Event" +msgstr "الحدث" + +#. module: base_calendar +#: help:calendar.event,edit_all:0 +#: help:calendar.todo,edit_all:0 +msgid "Edit all Occurrences of recurrent Meeting." +msgstr "تعديل جميع مرات الاجتماع الدوري" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_occurs:0 +#: selection:res.alarm,trigger_occurs:0 +msgid "Before" +msgstr "قبل" + +#. module: base_calendar +#: view:calendar.event:0 +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Confirmed" +msgstr "مؤكد" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all +msgid "Edit all events" +msgstr "تعديل جميع الأحداث" + +#. module: base_calendar +#: field:calendar.alarm,attendee_ids:0 +#: field:calendar.event,attendee_ids:0 +#: field:calendar.todo,attendee_ids:0 +msgid "Attendees" +msgstr "الحضور" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Confirm" +msgstr "تأكيد" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_todo +msgid "Calendar Task" +msgstr "مهمة تقويم" + +#. module: base_calendar +#: field:base.calendar.set.exrule,su:0 +#: field:calendar.event,su:0 +#: field:calendar.todo,su:0 +msgid "Sun" +msgstr "الأحد" + +#. module: base_calendar +#: field:calendar.attendee,cutype:0 +msgid "Invite Type" +msgstr "نوع الدعوة" + +#. module: base_calendar +#: help:calendar.attendee,partner_id:0 +msgid "Partner related to contact" +msgstr "" + +#. module: base_calendar +#: view:res.alarm:0 +msgid "Reminder details" +msgstr "تفاصيل التذكير" + +#. module: base_calendar +#: field:calendar.attendee,parent_ids:0 +msgid "Delegrated From" +msgstr "مفوّض من" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,select1:0 +#: selection:calendar.event,select1:0 +#: selection:calendar.todo,select1:0 +msgid "Day of month" +msgstr "اليوم من الشهر" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event,location:0 +#: field:calendar.event.edit.all,location:0 +#: field:calendar.todo,location:0 +msgid "Location" +msgstr "المكان" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,send_mail:0 +msgid "Send mail?" +msgstr "إرسال رسالة؟" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,email:0 +#: selection:calendar.alarm,action:0 +#: field:calendar.attendee,email:0 +msgid "Email" +msgstr "البريد الإلكتروني" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Event Detail" +msgstr "تفاصيل الحدث" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Run" +msgstr "تنفيذ" + +#. module: base_calendar +#: field:calendar.event,exdate:0 +#: field:calendar.todo,exdate:0 +msgid "Exception Date/Times" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Confidential" +msgstr "سرّي" + +#. module: base_calendar +#: field:base.calendar.set.exrule,end_date:0 +#: field:calendar.event,end_date:0 +#: field:calendar.todo,end_date:0 +msgid "Repeat Until" +msgstr "كرر حتى" + +#. module: base_calendar +#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view +msgid "" +"Create specific calendar alarms that may be assigned to calendar events or " +"meetings." +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Visibility" +msgstr "الظهور" + +#. module: base_calendar +#: field:calendar.attendee,rsvp:0 +msgid "Required Reply?" +msgstr "الرد مطلوب؟" + +#. module: base_calendar +#: field:calendar.event,base_calendar_url:0 +#: field:calendar.todo,base_calendar_url:0 +msgid "Caldav URL" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "Select range to Exclude" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,recurrent_uid:0 +#: field:calendar.todo,recurrent_uid:0 +msgid "Recurrent ID" +msgstr "معرّف التكرار" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "July" +msgstr "يوليو/تموز" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Accepted" +msgstr "تم القبول" + +#. module: base_calendar +#: field:base.calendar.set.exrule,th:0 +#: field:calendar.event,th:0 +#: field:calendar.todo,th:0 +msgid "Thu" +msgstr "الخميس" + +#. module: base_calendar +#: field:calendar.attendee,child_ids:0 +msgid "Delegrated To" +msgstr "مفوّض إلى" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Required Reply" +msgstr "الرد مطلوب" + +#. module: base_calendar +#: selection:calendar.event,end_type:0 +#: selection:calendar.todo,end_type:0 +msgid "Forever" +msgstr "إلى الأبد" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Participation required" +msgstr "المشاركة مطلوبة" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "_Cancel" +msgstr "ال_غاء" + +#. module: base_calendar +#: field:calendar.event,create_date:0 +#: field:calendar.todo,create_date:0 +msgid "Created" +msgstr "تمّ الإنشاء" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Private" +msgstr "خاص" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Daily" +msgstr "يومياً" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:385 +#, python-format +msgid "Can not Duplicate" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,class:0 +#: field:calendar.todo,class:0 +msgid "Mark as" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,partner_address_id:0 +msgid "Contact" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,rrule_type:0 +#: help:calendar.todo,rrule_type:0 +msgid "Let the event automatically repeat at that interval" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Delegate" +msgstr "" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,partner_id:0 +#: view:calendar.attendee:0 +#: field:calendar.attendee,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: selection:base_calendar.invite.attendee,type:0 +msgid "Partner Contacts" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "_Ok" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "First" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Privacy" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,vtimezone:0 +#: field:calendar.todo,vtimezone:0 +msgid "Timezone" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Subject" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "September" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "December" +msgstr "" + +#. module: base_calendar +#: help:base_calendar.invite.attendee,send_mail:0 +msgid "Check this if you want to send an Email to Invited Person" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Availability" +msgstr "" + +#. module: base_calendar +#: view:calendar.event.edit.all:0 +msgid "_Save" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Individual" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,count:0 +#: help:calendar.todo,count:0 +msgid "Repeat x times" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,user_id:0 +msgid "Owner" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Delegation Info" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,date:0 +msgid "Start Date" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,cn:0 +msgid "Common name" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Declined" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "My Role" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "My Events" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Decline" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Weeks" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Group" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,edit_all:0 +#: field:calendar.todo,edit_all:0 +msgid "Edit All" +msgstr "" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,contact_ids:0 +msgid "Contacts" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_res_alarm +msgid "Basic Alarm Information" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,fr:0 +#: field:calendar.event,fr:0 +#: field:calendar.todo,fr:0 +msgid "Fri" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Hours" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:1090 +#, python-format +msgid "Count can not be Negative" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,member:0 +msgid "Member" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,location:0 +#: help:calendar.todo,location:0 +msgid "Location of Event" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,rrule:0 +#: field:calendar.todo,rrule:0 +msgid "Recurrent Rule" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Draft" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,attach:0 +msgid "Attachment" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation From" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "End of recurrency" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,alarm_id:0 +msgid "Reminder" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule +msgid "Set Exrule" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: model:ir.actions.act_window,name:base_calendar.action_view_event +#: model:ir.ui.menu,name:base_calendar.menu_events +msgid "Events" +msgstr "" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard +#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee +msgid "Invite Attendees" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,email:0 +msgid "Email of Invited Person" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,repeat:0 +#: field:calendar.event,count:0 +#: field:calendar.todo,count:0 +#: field:res.alarm,repeat:0 +msgid "Repeat" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,dir:0 +msgid "" +"Reference to the URIthat points to the directory information corresponding " +"to the attendee." +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "August" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Monday" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Third" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "June" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,alarm_id:0 +msgid "Basic Alarm" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +#: view:calendar.event:0 +msgid "The" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,delegated_from:0 +msgid "Delegated From" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,user_id:0 +msgid "User" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event,date:0 +msgid "Date" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "November" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,member:0 +msgid "Indicate the groups that the attendee belongs to" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +msgid "Data" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,mo:0 +#: field:calendar.event,mo:0 +#: field:calendar.todo,mo:0 +msgid "Mon" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,count:0 +msgid "Count" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "No Repeat" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "October" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Uncertain" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,language:0 +msgid "Language" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,trigger_occurs:0 +#: field:res.alarm,trigger_occurs:0 +msgid "Triggers" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "January" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,trigger_related:0 +#: field:res.alarm,trigger_related:0 +msgid "Related to" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,interval:0 +#: field:calendar.alarm,trigger_interval:0 +#: field:res.alarm,trigger_interval:0 +msgid "Interval" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Wednesday" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:1088 +#, python-format +msgid "Interval can not be Negative" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,name:0 +#: view:calendar.event:0 +msgid "Summary" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,active:0 +#: field:calendar.event,active:0 +#: field:calendar.todo,active:0 +#: field:res.alarm,active:0 +msgid "Active" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Choose day in the month where repeat the meeting" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,action:0 +msgid "Action" +msgstr "" + +#. module: base_calendar +#: help:base_calendar.invite.attendee,type:0 +msgid "Select whom you want to Invite" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,duration:0 +#: help:res.alarm,duration:0 +msgid "" +"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the " +"other" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_event_edit_all +msgid "Calendar Edit all event" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,role:0 +msgid "Participation role for the calendar user" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,delegated_to:0 +msgid "Delegated To" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,action:0 +msgid "Defines the action to be invoked when an alarm is triggered" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,end_type:0 +#: selection:calendar.todo,end_type:0 +msgid "End date" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Search Events" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Recurrency Option" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Weekly" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,active:0 +#: help:res.alarm,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the event " +"alarm information without removing it." +msgstr "" + +#. module: base_calendar +#: field:calendar.event,recurrent_id:0 +#: field:calendar.todo,recurrent_id:0 +msgid "Recurrent ID date" +msgstr "" + +#. module: base_calendar +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,state:0 +#: view:calendar.attendee:0 +#: field:calendar.attendee,state:0 +#: view:calendar.event:0 +#: field:calendar.event,state:0 +#: field:calendar.todo,state:0 +msgid "State" +msgstr "" + +#. module: base_calendar +#: view:res.alarm:0 +msgid "Reminder Details" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "To Review" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,freq:0 +#: field:calendar.event,freq:0 +#: field:calendar.todo,freq:0 +msgid "Frequency" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Done" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,interval:0 +#: help:calendar.todo,interval:0 +msgid "Repeat every (Days/Week/Month/Year)" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: field:base_calendar.invite.attendee,user_ids:0 +msgid "Users" +msgstr "" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "of" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: view:calendar.event:0 +#: view:calendar.event.edit.all:0 +msgid "Cancel" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_res_users +msgid "res.users" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Tuesday" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,description:0 +msgid "" +"Provides a more complete description of the " +"calendar component, than that provided by the " +"\"SUMMARY\" property" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Responsible User" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,availability:0 +#: selection:calendar.event,show_as:0 +#: selection:calendar.todo,show_as:0 +#: selection:res.users,availability:0 +msgid "Busy" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_event +msgid "Calendar Event" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,state:0 +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Tentative" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,interval:0 +#: field:calendar.todo,interval:0 +msgid "Repeat every" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,end_type:0 +#: selection:calendar.todo,end_type:0 +msgid "Fix amout of times" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,recurrency:0 +#: field:calendar.todo,recurrency:0 +msgid "Recurrent" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,rrule_type:0 +#: field:calendar.todo,rrule_type:0 +msgid "Recurrency" +msgstr "" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form +#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations +msgid "Event Invitations" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Thursday" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,exrule:0 +#: field:calendar.todo,exrule:0 +msgid "Exception Rule" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,language:0 +msgid "" +"To specify the language for text values in aproperty or property parameter." +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Details" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,exrule:0 +#: help:calendar.todo,exrule:0 +msgid "" +"Defines a rule or repeating pattern of time to exclude from the recurring " +"rule." +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,month_list:0 +#: field:calendar.event,month_list:0 +#: field:calendar.todo,month_list:0 +msgid "Month" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: view:calendar.event:0 +msgid "Invite People" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,rrule:0 +#: help:calendar.todo,rrule:0 +msgid "" +"Defines a rule or repeating pattern for recurring events\n" +"e.g.: Every other month on the last Sunday of the month for 10 occurrences: " +" FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,dir:0 +msgid "URI Reference" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,description:0 +#: view:calendar.event:0 +#: field:calendar.event,description:0 +#: field:calendar.event,name:0 +#: field:calendar.todo,description:0 +#: field:calendar.todo,name:0 +msgid "Description" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "May" +msgstr "" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,type:0 +#: view:calendar.attendee:0 +msgid "Type" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Search Invitations" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_occurs:0 +#: selection:res.alarm,trigger_occurs:0 +msgid "After" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Stop" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_values +msgid "ir.values" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_model +msgid "Objects" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Delegated" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,sa:0 +#: field:calendar.event,sa:0 +#: field:calendar.todo,sa:0 +msgid "Sat" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Choose day where repeat the meeting" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +msgid "Minutely" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,sent_by:0 +msgid "Specify the user that is acting on behalf of the calendar user" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,date_deadline:0 +msgid "End Date" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "February" +msgstr "" + +#. module: base_calendar +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Months" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Resource" +msgstr "" + +#. module: base_calendar +#: field:res.alarm,name:0 +msgid "Name" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_alarm +msgid "Event alarm information" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,name:0 +msgid "" +"Contains the text to be used as the message subject for " +"email or contains the text to be used for display" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,alarm_id:0 +#: field:calendar.event,base_calendar_alarm_id:0 +#: field:calendar.todo,alarm_id:0 +#: field:calendar.todo,base_calendar_alarm_id:0 +msgid "Alarm" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90 +#, python-format +msgid "Please Apply Recurrency before applying Exception Rule." +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,sent_by_uid:0 +msgid "Sent By User" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "April" +msgstr "" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Recurrency period" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,week_list:0 +#: field:calendar.event,week_list:0 +#: field:calendar.todo,week_list:0 +msgid "Weekday" +msgstr "" + +#. module: base_calendar +#: field:base.calendar.set.exrule,byday:0 +#: field:calendar.event,byday:0 +#: field:calendar.todo,byday:0 +msgid "By day" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,model_id:0 +msgid "Model" +msgstr "" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Audio" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,id:0 +#: field:calendar.todo,id:0 +msgid "ID" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "For information Purpose" +msgstr "" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +msgid "Invite" +msgstr "" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_attendee +msgid "Attendee information" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,res_id:0 +msgid "Resource ID" +msgstr "" + +#. module: base_calendar +#: selection:calendar.attendee,state:0 +msgid "Needs Action" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,sent_by:0 +msgid "Sent By" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,sequence:0 +#: field:calendar.todo,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,alarm_id:0 +#: help:calendar.todo,alarm_id:0 +msgid "Set an alarm at this time, before the event occurs" +msgstr "" + +#. module: base_calendar +#: selection:base_calendar.invite.attendee,type:0 +msgid "Internal User" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Accept" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,week_list:0 +#: selection:calendar.event,week_list:0 +#: selection:calendar.todo,week_list:0 +msgid "Saturday" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation To" +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Second" +msgstr "" + +#. module: base_calendar +#: field:calendar.attendee,availability:0 +#: field:res.users,availability:0 +msgid "Free/Busy" +msgstr "" + +#. module: base_calendar +#: field:calendar.event,end_type:0 +#: field:calendar.todo,end_type:0 +msgid "Way to end reccurency" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,duration:0 +#: field:calendar.alarm,trigger_duration:0 +#: field:calendar.event,duration:0 +#: field:calendar.todo,date:0 +#: field:calendar.todo,duration:0 +#: field:res.alarm,duration:0 +#: field:res.alarm,trigger_duration:0 +msgid "Duration" +msgstr "" + +#. module: base_calendar +#: selection:base_calendar.invite.attendee,type:0 +msgid "External Email" +msgstr "" + +#. module: base_calendar +#: field:calendar.alarm,trigger_date:0 +msgid "Trigger Date" +msgstr "" + +#. module: base_calendar +#: help:calendar.alarm,attach:0 +msgid "" +"* Points to a sound resource, which is rendered when the " +"alarm is triggered for audio,\n" +" * File which is intended to be sent as message " +"attachments for email,\n" +" * Points to a procedure resource, which is invoked when " +" the alarm is triggered for procedure." +msgstr "" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Fifth" +msgstr "" diff --git a/addons/base_contact/i18n/da.po b/addons/base_contact/i18n/da.po index fb1ca893595..da5f890c185 100644 --- a/addons/base_contact/i18n/da.po +++ b/addons/base_contact/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-29 12:07+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:31+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:04+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_contact #: field:res.partner.contact,title:0 @@ -25,7 +25,7 @@ msgstr "Titel" #. module: base_contact #: view:res.partner.address:0 msgid "# of Contacts" -msgstr "" +msgstr "# kontakter" #. module: base_contact #: field:res.partner.job,fax:0 diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 0208e6cdc37..af63a0cf369 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -104,7 +104,8 @@ class base_module_record(osv.osv): for key,val in data.items(): if not (val or (fields[key]['type']=='boolean')): continue - if fields[key]['type'] in ('integer','float'): + if (fields[key]['type'] in ('integer','float') or + fields[key]['type'] == 'selection' and isinstance(val, int)): field = doc.createElement('field') field.setAttribute("name", key) field.setAttribute("eval", val and str(val) or 'False' ) diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py index dd2a69dc9c1..75bd149186a 100644 --- a/addons/base_report_creator/base_report_creator.py +++ b/addons/base_report_creator/base_report_creator.py @@ -247,7 +247,10 @@ class report_creator(osv.osv): #End Loop return {'datas': final_datas} - + def unlink(self, cr, uid, ids, context=None): + menu_ids = [report.menu_id.id for report in self.browse(cr, uid, ids, context) if report.menu_id] + self.pool.get('ir.ui.menu').unlink(cr, uid, menu_ids, context=context) + return super(report_creator, self).unlink(cr, uid, ids, context=context) def _path_get(self, cr, uid, models, filter_ids=[]): """ @param cr: the current row, from the database cursor, diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po index 0eba5a122fe..0e658ca1d41 100644 --- a/addons/base_setup/i18n/ar.po +++ b/addons/base_setup/i18n/ar.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-02-03 06:25+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2011-11-07 12:48+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "تمت إضافة المستخدمين التالين: \n" @@ -488,3 +488,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "" + +#~ msgid "Point of Sales" +#~ msgstr "نقاط البيع" diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po index d343f9a51f9..e00d8c838da 100644 --- a/addons/base_setup/i18n/bg.po +++ b/addons/base_setup/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-09-08 14:09+0000\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" "Last-Translator: lem0na <nickyk@gmx.net>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "препоръчваме да инсталирате само фактуриране " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Следните потребители са инсталирани: \n" @@ -601,3 +601,6 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Предишен" + +#~ msgid "Point of Sales" +#~ msgstr "POS продажби" diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po index 956b67a8130..d16261f722b 100644 --- a/addons/base_setup/i18n/bs.po +++ b/addons/base_setup/i18n/bs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po index 546dba26848..fec53e21170 100644 --- a/addons/base_setup/i18n/ca.po +++ b/addons/base_setup/i18n/ca.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-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-09-30 08:29+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: Raimon Esteve (www.zikzakmedia.com) " "<resteve@zikzakmedia.com>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "suggerim instal·lar només la facturació. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Els següents usuaris han estat instal·lats : \n" @@ -627,3 +627,6 @@ msgstr "base.setup.config" #~ msgstr "" #~ "Podeu iniciar la configuració del sistema o connectar-vos directament a la " #~ "base de dades utilitzant la instal·lació per defecte." + +#~ msgid "Point of Sales" +#~ msgstr "Terminal punt de venda" diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po index 02700ef5ef0..595a3cd5c33 100644 --- a/addons/base_setup/i18n/cs.po +++ b/addons/base_setup/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-11-17 08:51+0000\n" -"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" @@ -96,7 +96,7 @@ msgstr "" "vám instalovat pouze Fakturaci. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Byli instalováni následující uživatelů : \n" @@ -577,3 +577,6 @@ msgstr "base.setup.config" #~ msgid "Installation Done" #~ msgstr "Instalace dokončena" + +#~ msgid "Point of Sales" +#~ msgstr "Prodejní místo" diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po index 38b28307c96..e6c165e4cf3 100644 --- a/addons/base_setup/i18n/da.po +++ b/addons/base_setup/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-11-02 16:15+0000\n" +"PO-Revision-Date: 2011-11-08 10:30+0000\n" "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:06+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_setup #: field:base.setup.company,city:0 @@ -35,7 +35,7 @@ msgstr "Fakturering" #. module: base_setup #: field:base.setup.installer,hr:0 msgid "Human Resources" -msgstr "Human Resources" +msgstr "Personale (HR)" #. module: base_setup #: field:base.setup.company,email:0 @@ -45,7 +45,7 @@ msgstr "E-mail" #. module: base_setup #: field:base.setup.company,account_no:0 msgid "Bank Account No" -msgstr "Bank konto nr." +msgstr "Bankkonto nr." #. module: base_setup #: field:base.setup.installer,profile_tools:0 @@ -55,7 +55,7 @@ msgstr "Ekstra værktøjer" #. module: base_setup #: field:base.setup.company,rml_footer1:0 msgid "Report Footer 1" -msgstr "Rapport fod 1" +msgstr "Rapport sidefod 1" #. module: base_setup #: help:base.setup.installer,mrp:0 @@ -63,6 +63,7 @@ msgid "" "Helps you manage your manufacturing processes and generate reports on those " "processes." msgstr "" +"Hjælper med at styre produktionsprocesser og lave rapporter over disse." #. module: base_setup #: help:base.setup.installer,marketing:0 @@ -72,17 +73,17 @@ msgstr "Hjælper dig med din maketingskampagne skridt for skridt" #. module: base_setup #: view:base.setup.config:0 msgid "Your database is now created." -msgstr "Din database er ny oprettet" +msgstr "Din database er nu oprettet" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" -msgstr "Point of sales" +msgid "Point of Sale" +msgstr "Salgssted" #. module: base_setup #: field:base.setup.installer,association:0 msgid "Associations" -msgstr "Foreninger" +msgstr "Organisationer" #. module: base_setup #: help:base.setup.installer,account_accountant:0 @@ -90,23 +91,25 @@ msgid "" "Helps you handle your accounting needs, if you are not an accountant, we " "suggest you to install only the Invoicing " msgstr "" +"Hjælper dig med at håndtere dine regnskabsmæssige behov. Hvis du ikke er " +"revisor, foreslår vi dig kun at installere faktureringsmodulet " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" -msgstr "Følgende brugere er installeret \n" +msgstr "Følgende brugere er installeret: \n" #. module: base_setup #: field:base.setup.company,progress:0 #: field:base.setup.installer,progress:0 msgid "Configuration Progress" -msgstr "Konfigurations fremskridt" +msgstr "Konfigurationsfremgang" #. module: base_setup #: field:base.setup.company,rml_footer2:0 msgid "Report Footer 2" -msgstr "Rapport sidefod" +msgstr "Rapport sidefod 2" #. module: base_setup #: field:base.setup.company,currency:0 @@ -117,7 +120,7 @@ msgstr "Valuta" #. module: base_setup #: field:base.setup.company,state_id:0 msgid "Fed. State" -msgstr "" +msgstr "Delstat" #. module: base_setup #: field:base.setup.installer,marketing:0 @@ -127,12 +130,12 @@ msgstr "Markedsføring" #. module: base_setup #: field:base.setup.company,company_id:0 msgid "Company" -msgstr "Virksomhed" +msgstr "Firma" #. module: base_setup #: field:base.setup.installer,sale:0 msgid "Sales Management" -msgstr "Salgsledelse" +msgstr "Salgsstyring" #. module: base_setup #: help:base.setup.installer,profile_tools:0 @@ -140,8 +143,8 @@ msgid "" "Lets you install various interesting but non-essential tools like Survey, " "Lunch and Ideas box." msgstr "" -"Lader dig installere forskellige interessante, men ikke-væsentlige værktøjer " -"som f.eks. idé boks." +"Du kan installere forskellige interessante, men ikke afgørende værktøjer som " +"meningsmåling, frokost og idéer." #. module: base_setup #: view:base.setup.config:0 @@ -150,7 +153,7 @@ msgid "" "an administrator." msgstr "" "Du kan starte med at konfigurere systemet eller tilslutte dig direkte til " -"databasen som en administrator." +"databasen som administrator." #. module: base_setup #: field:base.setup.installer,report_designer:0 @@ -160,12 +163,12 @@ msgstr "Avanceret rapportering" #. module: base_setup #: field:base.setup.company,phone:0 msgid "Phone" -msgstr "Tlf. nr." +msgstr "Telefon" #. module: base_setup #: view:base.setup.company:0 msgid "res_config_contents" -msgstr "" +msgstr "res_config_contents" #. module: base_setup #: view:base.setup.company:0 @@ -173,8 +176,8 @@ msgid "" "Your company information will be used to personalize documents issued with " "OpenERP such as invoices, sales orders and much more." msgstr "" -"Dine virksomheds oplysninger vil blive brugt til at personliggøre dokumenter " -"udstedt med OpenERP såsom fakturaer, salgsordrer og meget mere." +"Dine virksomhedsoplysninger vil blive brugt til at individualisere " +"dokumenter fra OpenERP som fakturaer, salgsordrer m.m." #. module: base_setup #: view:base.setup.installer:0 @@ -184,7 +187,7 @@ msgstr "titel" #. module: base_setup #: field:base.setup.installer,knowledge:0 msgid "Knowledge Management" -msgstr "Knowledge Management" +msgstr "Videnstyring" #. module: base_setup #: model:ir.module.module,description:base_setup.module_meta_information @@ -205,18 +208,17 @@ msgid "" " " msgstr "" "\n" -" Dette modul implementerer en konfiguration, der hjælper brugeren\n" -" til at konfigurere en ny database på systemet.\n" +" Dette modul implementerer et konfigurationssystem, der hjælper brugeren\n" +" med at konfigurere systemet ved installation af en ny database.\n" "\n" -" Det giver dig mulighed for at vælge mellem en liste af profiler for at " -"installere:\n" +" Det giver dig mulighed for at installere forskellige profiler:\n" " * Minimal profil\n" " * Kun regnskab\n" " * Servicevirksomhed\n" " * Produktionsvirksomhed\n" "\n" -" Det stiller også spørgsmål som hjælper med at oprette sidehoved,\n" -" sidefod, kontokort og sprog\n" +" Modulet hjælper dig også med at oprette dit firma, sidehoved,\n" +" sidefod, kontoplan og sprog.\n" " " #. module: base_setup @@ -225,8 +227,8 @@ msgid "" "Installs a preselected set of OpenERP applications which will help you " "manage your industry." msgstr "" -"Installerer en forudvalgt sæt OpenERP applikationer, der vil hjælpe dig med " -"at administrere din branche." +"Installerer en sæt OpenERP moduler, der vil hjælpe dig med at administrere " +"din branche." #. module: base_setup #: help:base.setup.installer,project:0 @@ -234,8 +236,8 @@ msgid "" "Helps you manage your projects and tasks by tracking them, generating " "plannings, etc..." msgstr "" -"Hjælper dig med at administrere dine projekter og opgaver ved at spore dem, " -"generere planlægning, osv. .." +"Hjælper dig med at styre dine projekter og opgaver ved at spore dem, lave " +"planlægning, osv. .." #. module: base_setup #: field:base.setup.company,name:0 @@ -245,7 +247,7 @@ msgstr "Firmanavn" #. module: base_setup #: view:base.setup.config:0 msgid "Skip Configuration Wizards" -msgstr "Spring over konfigurations wizard" +msgstr "Spring konfigurationsguide over" #. module: base_setup #: help:base.setup.installer,hr:0 @@ -253,6 +255,8 @@ msgid "" "Helps you manage your human resources by encoding your employees structure, " "generating work sheets, tracking attendance and more." msgstr "" +"Hjælper dig med at styre dit personale ved at indkode dine medarbejderes " +"struktur, opret arbejdsplaner, checke fremmøde og m.m." #. module: base_setup #: help:base.setup.installer,account_voucher:0 @@ -260,6 +264,8 @@ msgid "" "Allows you to create your invoices and track the payments. It is an easier " "version of the accounting module for managers who are not accountants." msgstr "" +"Lader dig oprette fakturaer og spore betalinger. Det er en lettere udgave af " +"regnskabsmodulet for ledere, der ikke er regnskabskyndige.." #. module: base_setup #: model:ir.model,name:base_setup.model_base_setup_company @@ -272,7 +278,7 @@ msgid "" "Helps you manage your purchase-related processes such as requests for " "quotations, supplier invoices, etc..." msgstr "" -"Hjælper dig med at styre dit køb-relaterede processer såsom anmodninger om " +"Hjælper dig med at styre dine indkøbsrelaterede processer som anmodninger om " "tilbud, leverandørfakturaer, osv. .." #. module: base_setup @@ -282,6 +288,9 @@ msgid "" "We suggest you to put bank information here:\n" "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701" msgstr "" +"Denne sætning vises nederst i dine rapporter.\n" +"Vi forslår at vise bankoplysninger her:\n" +"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - Moms: BE0477.472.701" #. module: base_setup #: field:base.setup.company,street2:0 @@ -301,12 +310,12 @@ msgstr "Land" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_base_setup msgid "Setup" -msgstr "Setup" +msgstr "Opsætning" #. module: base_setup #: field:base.setup.installer,account_accountant:0 msgid "Accounting & Finance" -msgstr "Regnskab & Finans" +msgstr "Regnskab & finans" #. module: base_setup #: field:base.setup.installer,auction:0 @@ -321,7 +330,7 @@ msgstr "Postnr" #. module: base_setup #: view:base.setup.config:0 msgid "Start Configuration" -msgstr "Start konfiguration" +msgstr "Startkonfiguration" #. module: base_setup #: help:base.setup.installer,knowledge:0 @@ -329,8 +338,8 @@ msgid "" "Lets you install addons geared towards sharing knowledge with and between " "your employees." msgstr "" -"Lader dig installere addons rettet mod at dele viden med og mellem dine " -"medarbejdere." +"Lader dig installere tillægsmodul beregnet til at dele viden med og mellem " +"dine medarbejdere." #. module: base_setup #: view:base.setup.installer:0 @@ -338,15 +347,14 @@ msgid "" "Select the Applications you want your system to cover. If you are not sure " "about your exact needs at this stage, you can easily install them later." msgstr "" -"Vælg de programmer, du ønsker dit system skal indeholde. Hvis du ikke er " -"sikker på netop dine behov på nuvræendetidspunkt, kan du nemt installere dem " -"senere." +"Vælg de moduler, som dit system skal indeholde. Hvis du ikke er sikker dine " +"præcise behov på nuværende tidspunkt, kan du nemt installere dem senere." #. module: base_setup #: view:base.setup.company:0 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company msgid "Company Configuration" -msgstr "Firma opsætning" +msgstr "Firmaopsætning" #. module: base_setup #: field:base.setup.company,logo:0 @@ -360,31 +368,33 @@ msgid "" "simplified payment mode encoding, automatic picking lists generation and " "more." msgstr "" +"Hjælper dig med at få det bedste ud af dit detailhandelssystem med hurtigt " +"salg, enkel betaling, automatisk plukliste m.m." #. module: base_setup #: field:base.setup.installer,purchase:0 msgid "Purchase Management" -msgstr "Indkøbs administration" +msgstr "Indkøbsstyring" #. module: base_setup #: help:base.setup.installer,sale:0 msgid "Helps you handle your quotations, sale orders and invoicing." -msgstr "" +msgstr "Hjælper dig med dina tilbud, salgsordre och fakturer." #. module: base_setup #: field:base.setup.installer,stock:0 msgid "Warehouse Management" -msgstr "Lager administration" +msgstr "Lagerstyrning" #. module: base_setup #: field:base.setup.installer,project:0 msgid "Project Management" -msgstr "Projekt administration" +msgstr "Projektstyring" #. module: base_setup #: field:base.setup.config,installed_users:0 msgid "Installed Users" -msgstr "" +msgstr "Installerede brugere" #. module: base_setup #: view:base.setup.config:0 @@ -394,7 +404,7 @@ msgstr "Ny database" #. module: base_setup #: field:base.setup.installer,crm:0 msgid "Customer Relationship Management" -msgstr "" +msgstr "Kundestyring (CRM)" #. module: base_setup #: help:base.setup.installer,auction:0 @@ -402,6 +412,8 @@ msgid "" "Installs a preselected set of OpenERP applications selected to help you " "manage your auctions as well as the business processes around them." msgstr "" +"Installerer et sæt OpenERP moduler, som hjælper med at styre auktioner og " +"tilhørende forretningsprocesserne." #. module: base_setup #: help:base.setup.company,rml_header1:0 @@ -410,6 +422,9 @@ msgid "" "We suggest you to put a slogan here:\n" "\"Open Source Business Solutions\"." msgstr "" +"Denne sætning vises i øverste højre hjørne af dine rapporter.\n" +"Vi foreslår at indsætte et slogan her:\n" +"\"Open Source fimaløsninger\"." #. module: base_setup #: help:base.setup.installer,report_designer:0 @@ -417,28 +432,30 @@ msgid "" "Lets you install various tools to simplify and enhance OpenERP's report " "creation." msgstr "" +"Lader dig installere diverse værktøjer til forenkle og forbedre udvikling af " +"rapporter i OpenERP." #. module: base_setup #: field:base.setup.company,rml_header1:0 msgid "Report Header" -msgstr "" +msgstr "Rapporthoved" #. module: base_setup #: view:base.setup.config:0 msgid "Information about your new database" -msgstr "" +msgstr "Information om din nye database" #. module: base_setup #: field:base.setup.company,config_logo:0 #: field:base.setup.config,config_logo:0 #: field:base.setup.installer,config_logo:0 msgid "Image" -msgstr "" +msgstr "Billede" #. module: base_setup #: field:base.setup.installer,product_expiry:0 msgid "Food Industry" -msgstr "" +msgstr "Fødevareindustri" #. module: base_setup #: field:base.setup.installer,mrp:0 @@ -448,7 +465,7 @@ msgstr "Produktion" #. module: base_setup #: view:base.setup.company:0 msgid "Your Logo - Use a size of about 450x150 pixels." -msgstr "" +msgstr "Dit Logo - Brug en størrelse på ca. 450x150 pixels." #. module: base_setup #: help:base.setup.company,rml_footer1:0 @@ -457,16 +474,19 @@ msgid "" "We suggest you to write legal sentences here:\n" "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" msgstr "" +"Denne sætning vises nederst i dine rapporter.\n" +"Vi forslår at vise kontaktoplysninger her:\n" +"Web: http://openerp.com - Fax: +32 81 733 501 - Fortis Bank: 126-2013269-07" #. module: base_setup #: field:base.setup.company,website:0 msgid "Company Website" -msgstr "Virksomhedens hjemmeside" +msgstr "Firmaets hjemmeside" #. module: base_setup #: view:base.setup.installer:0 msgid "Install Specific Industry Applications" -msgstr "" +msgstr "Installerer specifikke branchemoduler" #. module: base_setup #: field:base.setup.company,street:0 @@ -476,18 +496,18 @@ msgstr "Gade" #. module: base_setup #: view:base.setup.company:0 msgid "Configure Your Company Information" -msgstr "" +msgstr "Opsætter dit firmaoplysninger" #. module: base_setup #: help:base.setup.company,website:0 msgid "Example: http://openerp.com" -msgstr "" +msgstr "Eksempel: http://openerp.com" #. module: base_setup #: view:base.setup.installer:0 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer msgid "Install Applications" -msgstr "" +msgstr "Installer moduler" #. module: base_setup #: help:base.setup.installer,crm:0 @@ -496,18 +516,21 @@ msgid "" "or issues. Can automatically send reminders, escalate requests or trigger " "business-specific actions based on standard events." msgstr "" +"Hjælper med at spore og styre kunderelationer, som potentielle kunder, " +"forespørgsler eller emner. Kan automatisk sende rykkere, fremme tilbud eller " +"udløse forretningsspecifikke handlinger baseret på standard begivenheder." #. module: base_setup #: help:base.setup.installer,stock:0 msgid "" "Helps you manage your inventory and main stock operations: delivery orders, " "receptions, etc." -msgstr "" +msgstr "Hjælper med lageroperationer: Levering, modtagelse osv." #. module: base_setup #: model:ir.module.module,shortdesc:base_setup.module_meta_information msgid "Base Setup" -msgstr "" +msgstr "Basal opsætning" #. module: base_setup #: help:base.setup.installer,association:0 @@ -515,8 +538,13 @@ msgid "" "Installs a preselected set of OpenERP applications which will help you " "manage your association more efficiently." msgstr "" +"Installerer OpwnERP moduler, som hjælper med styring af forbindelser mere " +"effektivt." #. module: base_setup #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" -msgstr "" +msgstr "base.setup.config" + +#~ msgid "Point of Sales" +#~ msgstr "Point of sales" diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po index d5f99a0260a..942bc9a5dd6 100644 --- a/addons/base_setup/i18n/de.po +++ b/addons/base_setup/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-13 12:54+0000\n" -"Last-Translator: silas <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "Buchhaltung. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Folgende Benutzer wurden installiert : \n" @@ -623,5 +623,8 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Vorherig" +#~ msgid "Point of Sales" +#~ msgstr "POS & Kasse" + #~ msgid "Use Directly" #~ msgstr "Sofort beginnen" diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po index 4430616a917..8837d6d223e 100644 --- a/addons/base_setup/i18n/el.po +++ b/addons/base_setup/i18n/el.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-15 03:01+0000\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Greek <el@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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "λογιστής, σας προτείνουμε να εγκαταστήσετε μόνο την Τιμολόγηση " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Οι ακόλουθοι χρήστες έχουν εγκατασταθεί: \n" @@ -626,3 +626,6 @@ msgstr "base.setup.config" #~ msgid "Cancel" #~ msgstr "Άκυρο" + +#~ msgid "Point of Sales" +#~ msgstr "Σημείο πώλησης" diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po index a44fb2f89a5..a71e2900e12 100644 --- a/addons/base_setup/i18n/es.po +++ b/addons/base_setup/i18n/es.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-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-27 08:23+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " "<jesteve@zikzakmedia.com>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "sugerimos instalar sólo la facturación. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Los siguientes usuarios han sido instalados : \n" @@ -627,3 +627,6 @@ msgstr "base.setup.config" #~ msgid "Define Main Company" #~ msgstr "Defina la compañia principal" + +#~ msgid "Point of Sales" +#~ msgstr "Terminal punto de venta" diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po index 4213f2dac5d..c646a7145ac 100644 --- a/addons/base_setup/i18n/es_AR.po +++ b/addons/base_setup/i18n/es_AR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po index eb6e9daf76f..011ed071d89 100644 --- a/addons/base_setup/i18n/es_CL.po +++ b/addons/base_setup/i18n/es_CL.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -79,7 +79,7 @@ msgstr "Su base de datos ya está creada." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 msgid "Point of Sale" -msgstr "Terminal punto de venta" +msgstr "" #. module: base_setup #: field:base.setup.installer,association:0 @@ -96,7 +96,7 @@ msgstr "" "sugerimos instalar sólo la facturación. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Los siguientes usuarios han sido instalados : \n" @@ -558,6 +558,9 @@ msgstr "" msgid "base.setup.config" msgstr "base.setup.config" +#~ msgid "Point of Sales" +#~ msgstr "Terminal punto de venta" + #~ msgid "Select a Profile" #~ msgstr "Seleccione un perfil" diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po index 7ac9c8363f2..9c4a446168b 100644 --- a/addons/base_setup/i18n/es_EC.po +++ b/addons/base_setup/i18n/es_EC.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -79,7 +79,7 @@ msgstr "Su base de datos ya está creada." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 msgid "Point of Sale" -msgstr "Terminal punto de venta" +msgstr "" #. module: base_setup #: field:base.setup.installer,association:0 @@ -96,7 +96,7 @@ msgstr "" "sugerimos instalar sólo la facturación. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Los siguientes usuarios han sido instalados : \n" @@ -627,3 +627,6 @@ msgstr "Configuración" #~ msgid "Your new database is now fully installed." #~ msgstr "Su nueva base de datos ha sido instalada completamente." + +#~ msgid "Point of Sales" +#~ msgstr "Terminal punto de venta" diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po index 91ffeb25705..2db06e83fb4 100644 --- a/addons/base_setup/i18n/es_PY.po +++ b/addons/base_setup/i18n/es_PY.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,8 +78,8 @@ msgstr "Su base de datos ya está creada." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" -msgstr "Terminal punto de venta" +msgid "Point of Sale" +msgstr "" #. module: base_setup #: field:base.setup.installer,association:0 @@ -96,7 +96,7 @@ msgstr "" "sugerimos instalar sólo la facturación. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Los siguientes usuarios han sido instalados : \n" @@ -557,3 +557,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "base.setup.config" + +#~ msgid "Point of Sales" +#~ msgstr "Terminal punto de venta" diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po index 40937db63e6..178eceacde7 100644 --- a/addons/base_setup/i18n/et.po +++ b/addons/base_setup/i18n/et.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po index 3396dc6c1f8..9f902b1a90e 100644 --- a/addons/base_setup/i18n/fa.po +++ b/addons/base_setup/i18n/fa.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po index 09308932262..967797046a5 100644 --- a/addons/base_setup/i18n/fi.po +++ b/addons/base_setup/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-08-03 03:47+0000\n" -"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:49+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Finnish <fi@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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "suosittelemme että asennat vain laskutuksen " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Seuraavat käyttäjät on asennettu: \n" @@ -605,3 +605,6 @@ msgstr "" #~ msgid "Your new database is now fully installed." #~ msgstr "Uusi tietokanta on nyt kokonaan asennettu." + +#~ msgid "Point of Sales" +#~ msgstr "Myyntipiste" diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po index accf5d834a0..92e683590f3 100644 --- a/addons/base_setup/i18n/fr.po +++ b/addons/base_setup/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-18 16:45+0000\n" -"Last-Translator: Quentin THEURET <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:49+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "vous suggérons d'installer uniquement la facturation. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Les utilisateurs suivants ont été installés : \n" @@ -625,3 +625,6 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Précédent" + +#~ msgid "Point of Sales" +#~ msgstr "Point de vente" diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po index 8cc928564b8..a92e4b42916 100644 --- a/addons/base_setup/i18n/gl.po +++ b/addons/base_setup/i18n/gl.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po index 922d9e65c60..e65d8d9141c 100644 --- a/addons/base_setup/i18n/hr.po +++ b/addons/base_setup/i18n/hr.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" "Language: hr\n" @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po index 55ffd133497..de41cc5a5b4 100644 --- a/addons/base_setup/i18n/hu.po +++ b/addons/base_setup/i18n/hu.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-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-02-02 16:23+0000\n" +"PO-Revision-Date: 2011-11-07 12:54+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " "<openerp@novotrade.hu>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "a Számlázást telepítse. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "A következő felhasználók lettek létrehozva : \n" @@ -555,3 +555,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "base.setup.config" + +#~ msgid "Point of Sales" +#~ msgstr "Pénztárgép működés" diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po index 9100d8d7321..660100f151c 100644 --- a/addons/base_setup/i18n/id.po +++ b/addons/base_setup/i18n/id.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -93,7 +93,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po index 997f80e6e42..61b01d6a487 100644 --- a/addons/base_setup/i18n/it.po +++ b/addons/base_setup/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-16 09:42+0000\n" -"Last-Translator: Loris Turchetti <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:49+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "di installare solo la fatturazione " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "I seguenti utenti sono stati installati: \n" @@ -626,3 +626,6 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Indietro" + +#~ msgid "Point of Sales" +#~ msgstr "Punto vendita" diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po index f3a0151f944..f708a4785e8 100644 --- a/addons/base_setup/i18n/ko.po +++ b/addons/base_setup/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po index fe6c72e94be..73e3011abea 100644 --- a/addons/base_setup/i18n/lt.po +++ b/addons/base_setup/i18n/lt.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po index deecb270088..003c661d82a 100644 --- a/addons/base_setup/i18n/lv.po +++ b/addons/base_setup/i18n/lv.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po index 4727caa5055..3c15f553bf2 100644 --- a/addons/base_setup/i18n/mn.po +++ b/addons/base_setup/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-20 16:18+0000\n" -"Last-Translator: badralb <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:43+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Mongolian <mn@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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -94,7 +94,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Дараагийн хэрэглэгчийн суулгасан байх : \n" @@ -571,5 +571,8 @@ msgstr "base.setup.config" #~ "байрлуулдаг. Эдгээр хувийн тохиргоонууд нь OpenERP-н ялгаатай байдлуудыг олж " #~ "нээхэд тохируулагдсан. Энэ зөвхөн тойм төдий, өшөө 300+ бэлэн модулиуд бий." +#~ msgid "Point of Sales" +#~ msgstr "Борлуулалтын цэг" + #~ msgid "Use Directly" #~ msgstr "Хэрэглэх заавар" diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po index 3b48933b4e3..550fb9d10c3 100644 --- a/addons/base_setup/i18n/nb.po +++ b/addons/base_setup/i18n/nb.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-30 19:56+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-07 12:48+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Norwegian Bokmal <nb@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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -97,7 +97,7 @@ msgstr "" "regnskapsfører, anbefaler vi at du kun installerer Fakturering " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Følgende brukere er blitt installert: \n" @@ -552,3 +552,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "base.oppsett.konfig" + +#~ msgid "Point of Sales" +#~ msgstr "Utsalgssted" diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po index 2a8473b23e9..3fefd2f2fb5 100644 --- a/addons/base_setup/i18n/nl.po +++ b/addons/base_setup/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-16 17:03+0000\n" -"Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:48+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "om alleen de facturatie te installeren " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "De volgende gebruikers zijn geïnstalleerd: \n" @@ -620,3 +620,6 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Vorige" + +#~ msgid "Point of Sales" +#~ msgstr "Kassa's" diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po index cc859010b14..301a65a5673 100644 --- a/addons/base_setup/i18n/nl_BE.po +++ b/addons/base_setup/i18n/nl_BE.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -93,7 +93,7 @@ msgstr "" "aan om enkel Facturatie te installeren. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po index 033b114cf29..18c0f19159f 100644 --- a/addons/base_setup/i18n/pl.po +++ b/addons/base_setup/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-14 13:45+0000\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -93,7 +93,7 @@ msgstr "" "instalowanie tylko fakturowania. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Następujący użytkownicy zostali utworzeni : \n" @@ -608,3 +608,6 @@ msgstr "" #~ msgid "Use Directly" #~ msgstr "Użyj bezpośrednio" + +#~ msgid "Point of Sales" +#~ msgstr "Punkt sprzedaży" diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po index da612b6b5aa..0f7395bc92b 100644 --- a/addons/base_setup/i18n/pt.po +++ b/addons/base_setup/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-13 10:06+0000\n" -"Last-Translator: Tiago Baptista <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:42+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "instale apenas o módulo Facturação " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Foram instalados os seguintes utilizadores: \n" @@ -600,3 +600,6 @@ msgstr "base.setup.config" #~ msgid "Use Directly" #~ msgstr "Usar Directamente" + +#~ msgid "Point of Sales" +#~ msgstr "Ponto de Venda" diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po index 69f952a76a7..0c0e036c6f5 100644 --- a/addons/base_setup/i18n/pt_BR.po +++ b/addons/base_setup/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-13 09:49+0000\n" -"Last-Translator: Guilherme Santos <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "instalação apenas do Faturamento " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Os seguintes usuário foram instalados: \n" @@ -621,3 +621,6 @@ msgstr "base.setup.config" #~ msgid "Summary" #~ msgstr "Resumo" + +#~ msgid "Point of Sales" +#~ msgstr "Ponto de Vendas" diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po index 542cbcee618..015eb620e8e 100644 --- a/addons/base_setup/i18n/ro.po +++ b/addons/base_setup/i18n/ro.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-12 01:45+0000\n" +"PO-Revision-Date: 2011-11-07 12:48+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "doar modulul de Facturare. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Utilizatorii din lista de mai jos nu au fost instalați : \n" @@ -599,3 +599,6 @@ msgstr "base.setup.config" #~ msgid "Use Directly" #~ msgstr "Folosire directă" + +#~ msgid "Point of Sales" +#~ msgstr "Punct de vînzare" diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po index d61f8e1707d..0080ba636f1 100644 --- a/addons/base_setup/i18n/ru.po +++ b/addons/base_setup/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-25 11:19+0000\n" -"Last-Translator: Treefeed Xavier <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "— советуем установить только модуль выставления счетов. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Были введены следующие пользователи: \n" @@ -624,3 +624,6 @@ msgstr "base.setup.config" #~ msgid "State" #~ msgstr "Область/штат" + +#~ msgid "Point of Sales" +#~ msgstr "Кассовый терминал" diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po index 0619a4d354d..cd4ffd266ae 100644 --- a/addons/base_setup/i18n/sk.po +++ b/addons/base_setup/i18n/sk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po index 00214917314..42c245534a7 100644 --- a/addons/base_setup/i18n/sl.po +++ b/addons/base_setup/i18n/sl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -93,7 +93,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Naslednji uporabniki so bili nameščeni: \n" diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po index 560edfd4218..9e3df647985 100644 --- a/addons/base_setup/i18n/sq.po +++ b/addons/base_setup/i18n/sq.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po index bc08110fca2..a95a53dfc00 100644 --- a/addons/base_setup/i18n/sr.po +++ b/addons/base_setup/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-10-30 12:59+0000\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -97,7 +97,7 @@ msgstr "" "knjigovodja, predlazemo ti da instaliras samo Fakturisanje " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Sledeci korisnici su instalirani: \n" @@ -602,3 +602,6 @@ msgstr "base.setup.config" #~ msgid "Cancel" #~ msgstr "Otkaži" + +#~ msgid "Point of Sales" +#~ msgstr "POS" diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po index 11432a11e0f..25fa7984891 100644 --- a/addons/base_setup/i18n/sr@latin.po +++ b/addons/base_setup/i18n/sr@latin.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-23 15:28+0000\n" -"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:59+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian latin <sr@latin@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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -97,7 +97,7 @@ msgstr "" "knjigovodja, predlazemo ti da instaliras samo Fakturisanje " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Sledeci korisnici su instalirani: \n" @@ -535,6 +535,9 @@ msgstr "" msgid "base.setup.config" msgstr "base.setup.config" +#~ msgid "Point of Sales" +#~ msgstr "POS" + #~ msgid "Use Directly" #~ msgstr "Koristi Direktno" diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po index 43a7eb3f26a..0dfabca49da 100644 --- a/addons/base_setup/i18n/sv.po +++ b/addons/base_setup/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.14\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-13 07:19+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "redovisning rekommenderar vi dig att enbart installera faktureringsmodulen " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Följande användere har nu blivit installerade \n" @@ -598,5 +598,8 @@ msgstr "base.setup.config" #~ msgid "General Information" #~ msgstr "Allmän information" +#~ msgid "Point of Sales" +#~ msgstr "Kassa" + #~ msgid "State" #~ msgstr "Län" diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po index 3048827b0f8..eacc77db53d 100644 --- a/addons/base_setup/i18n/th.po +++ b/addons/base_setup/i18n/th.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po index 90ba96adacc..6f8b89d6cd8 100644 --- a/addons/base_setup/i18n/tlh.po +++ b/addons/base_setup/i18n/tlh.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po index 4312065994f..0f279bc80c0 100644 --- a/addons/base_setup/i18n/tr.po +++ b/addons/base_setup/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-10 18:46+0000\n" -"Last-Translator: Ayhan KIZILTAN <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -94,7 +94,7 @@ msgstr "" "sadece Faturalama modülünü kurmanızı tavsiye ederiz. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Aşağıdaki kullanıcılar kuruldu: \n" @@ -571,3 +571,6 @@ msgstr "temel.kurulum.ayar" #~ msgid "Previous" #~ msgstr "Önceki" + +#~ msgid "Point of Sales" +#~ msgstr "Hızlı Satış Noktası" diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po index dec96cbb84b..ae7cb912e4e 100644 --- a/addons/base_setup/i18n/uk.po +++ b/addons/base_setup/i18n/uk.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po index 24d263a4693..2d63ca2d0fc 100644 --- a/addons/base_setup/i18n/vi.po +++ b/addons/base_setup/i18n/vi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-04 16:45+0000\n" -"Last-Translator: OpenBMS JSC <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:42+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Vietnamese <vi@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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Những người sử dụng sau đã được cài đặt: \n" @@ -489,3 +489,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "base.setup.config" + +#~ msgid "Point of Sales" +#~ msgstr "Điểm bán hàng" diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po index a42ebb47270..670a9f6ed58 100644 --- a/addons/base_setup/i18n/zh_CN.po +++ b/addons/base_setup/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-31 10:59+0000\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "帮助您掌控您的会计需求，如果您不是一个会计人员，我们建议您仅仅安装发票模块。 " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "下列用户已经安装 \n" @@ -566,3 +566,6 @@ msgstr "base.setup.config" #~ msgid "Your new database is now fully installed." #~ msgstr "新帐套已安装完毕." + +#~ msgid "Point of Sales" +#~ msgstr "销售点" diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po index f96c9ef7a89..e56ace16d84 100644 --- a/addons/base_setup/i18n/zh_TW.po +++ b/addons/base_setup/i18n/zh_TW.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-26 04:32+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "助您處理會計事情；如閣下非會計師，建議只安裝發票 " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "已安裝以下用戶： \n" @@ -566,3 +566,6 @@ msgstr "基礎.設置.配置" #~ msgid "Previous" #~ msgstr "上一個" + +#~ msgid "Point of Sales" +#~ msgstr "鎖售點 (POS)" diff --git a/addons/base_tools/i18n/da.po b/addons/base_tools/i18n/da.po index c4865608d95..017d4b51952 100644 --- a/addons/base_tools/i18n/da.po +++ b/addons/base_tools/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-23 15:37+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 10:44+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:56+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_tools #: model:ir.module.module,shortdesc:base_tools.module_meta_information msgid "Common base for tools modules" -msgstr "" +msgstr "Fælles grundlag for værktøjsmoduler" #. module: base_tools #: model:ir.module.module,description:base_tools.module_meta_information diff --git a/addons/base_tools/i18n/sv.po b/addons/base_tools/i18n/sv.po new file mode 100644 index 00000000000..135f6134c11 --- /dev/null +++ b/addons/base_tools/i18n/sv.po @@ -0,0 +1,30 @@ +# Swedish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-11-10 15:12+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Swedish <sv@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: 2011-11-11 04:53+0000\n" +"X-Generator: Launchpad (build 14277)\n" + +#. module: base_tools +#: model:ir.module.module,shortdesc:base_tools.module_meta_information +msgid "Common base for tools modules" +msgstr "" + +#. module: base_tools +#: model:ir.module.module,description:base_tools.module_meta_information +msgid "" +"\n" +" " +msgstr "" diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po index 9a22ae44fcc..4941d1a3065 100644 --- a/addons/base_vat/i18n/da.po +++ b/addons/base_vat/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-11-17 08:50+0000\n" -"Last-Translator: SmartWi <kurt@smartwi.net>\n" +"PO-Revision-Date: 2011-11-08 10:58+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:05+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: base_vat #: code:addons/base_vat/base_vat.py:87 @@ -24,6 +24,8 @@ msgid "" "The Vat does not seems to be correct. You should have entered something like " "this %s" msgstr "" +"Momsen ser ikke ud til at være korrekt. Der skulle være indtastet noget " +"svarende til dette %s" #. module: base_vat #: model:ir.module.module,description:base_vat.module_meta_information @@ -38,22 +40,31 @@ msgid "" "countries.\n" " " msgstr "" +"\n" +" Aktiverer CVR-nr. (momsnr.) for kontakten. Checker gyldigheden af CVR-" +"nr. (momsnr.)\n" +"\n" +" Dette modul bruger metoder beskrevet på http://sima-pc.com/nif.php for " +"at\n" +" checke gyldigheden af CVR-nr. (momsnr.) tilknyttet kontakter i EU-" +"landene.\n" +" " #. module: base_vat #: model:ir.module.module,shortdesc:base_vat.module_meta_information msgid "Base VAT - To check VAT number validity" -msgstr "" +msgstr "Moms grundlag - Til at checke CVR-nr. (momsnr.) gyldighed" #. module: base_vat #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "Fejl! Man kan ikke oprette rekursuve associerede medlemmer." #. module: base_vat #: code:addons/base_vat/base_vat.py:88 #, python-format msgid "The VAT is invalid, It should begin with the country code" -msgstr "" +msgstr "CVR-nr. (momsnr.) er ugyldigt. Det skal starte med landekode." #. module: base_vat #: help:res.partner,vat_subjected:0 @@ -61,16 +72,18 @@ msgid "" "Check this box if the partner is subjected to the VAT. It will be used for " "the VAT legal statement." msgstr "" +"Afkryds dette felt, hvis kontakten er momsregistreret. Det bruges til " +"momsbestemmelser." #. module: base_vat #: model:ir.model,name:base_vat.model_res_partner msgid "Partner" -msgstr "" +msgstr "Kontakt" #. module: base_vat #: field:res.partner,vat_subjected:0 msgid "VAT Legal Statement" -msgstr "Moms bestemmelser" +msgstr "Momsbestemmelser" #~ msgid "VAT" #~ msgstr "Moms" diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml index 1f45a6f5a72..0a65d816d8f 100644 --- a/addons/board/board_data_admin.xml +++ b/addons/board/board_data_admin.xml @@ -136,15 +136,15 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Administration Dashboard"> - <hpaned position="100"> - <child1> + <board style="2-1"> + <column> <action name="%(board_config_overview)d" string="Configuration Overview"/> <action name="%(action_latest_activities_tree)d" string="Latest Activities" /> - </child1> - <child2> + </column> + <column> <action name="%(action_user_connection_tree)d" string="Users" /> - </child2> - </hpaned> + </column> + </board> </form> </field> </record> diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml index 0c360589a92..accb112673b 100644 --- a/addons/board/board_data_home.xml +++ b/addons/board/board_data_home.xml @@ -44,25 +44,15 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string=""> - <hpaned> - <child1> + <board style="2-1"> + <column> <action name="%(action_application_tiles)d"/> - </child1> - <child2> + </column> + <column> <action name="%(action_res_widgets_tweets)d"/> <action name="%(action_res_widgets_events)d"/> - </child2> - </hpaned> - <!-- - The new version should this, kept as comment until rng grammar is updated. - <board style="1"> - <column> - <action name="100"/> - </column> - <column/> - <column/> - </board> - --> + </column> + </board> </form> </field> </record> diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index a6f5f1630f7..54dfc335a2b 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -55,7 +55,6 @@ Creates a dashboard for CRM that includes: 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': [ - 'base', 'base_action_rule', 'base_setup', 'process', @@ -108,8 +107,8 @@ Creates a dashboard for CRM that includes: 'crm_installer_view.xml', 'res_partner_view.xml', - 'board_crm_view.xml', 'board_crm_statistical_view.xml', + 'board_crm_view.xml', ], 'demo_xml': [ diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 53e0207fc5a..3eacb9e7755 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -117,32 +117,32 @@ <field name="arch" type="xml"> <form string="Sales Dashboard"> <hpaned> - <child1> - <action - string="My Open Opportunities" - name="%(act_my_oppor)d" - colspan="4" - height="150" - groups="base.group_sale_salesman,base.group_sale_manager" - width="510"/> - <action - string="My Meetings" - name="%(act_my_meetings)d" - height="150" - colspan="4"/> - </child1> - <child2> - <action - string="My Planned Revenues by Stage" - name="%(act_my_oppor_stage)d" - groups="base.group_sale_salesman,base.group_sale_manager" - colspan="4"/> - <action - string="My Win/Lost Ratio for the Last Year" - name="%(act_sales_pipeline)d" - groups="base.group_sale_salesman,base.group_sale_manager" - colspan="4"/> - </child2> + <child1> + <action + string="My Open Opportunities" + name="%(act_my_oppor)d" + colspan="4" + height="150" + groups="base.group_sale_salesman,base.group_sale_manager" + width="510"/> + <action + string="My Meetings" + name="%(act_my_meetings)d" + height="150" + colspan="4"/> + </child1> + <child2> + <action + string="My Planned Revenues by Stage" + name="%(act_my_oppor_stage)d" + groups="base.group_sale_salesman,base.group_sale_manager" + colspan="4"/> + <action + string="My Win/Lost Ratio" + name="%(act_sales_pipeline)d" + groups="base.group_sale_salesman,base.group_sale_manager" + colspan="4"/> + </child2> </hpaned> </form> </field> @@ -155,14 +155,7 @@ <field name="usage">menu</field> <field name="view_id" ref="board_crm_form"/> </record> - <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/> - <menuitem - name="Sales Dashboard" parent="board.menu_dasboard" - action="open_board_crm" - sequence="1" - id="menu_board_crm" icon="terp-graph" - groups="base.group_sale_salesman"/> - - <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_crm"/> + <menuitem id="base.menu_base_partner" + action="open_board_crm"/> </data> </openerp> diff --git a/addons/crm/crm.py b/addons/crm/crm.py index ac0874a6037..d12860b5ea5 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -486,8 +486,11 @@ class crm_case(crm_base): src = case_email dest = case.user_id.user_email or "" body = case.description or "" - if case.message_ids: - body = case.message_ids[0].body_text or "" + for message in case.message_ids: + if message.email_from: + body = message.description + break + if not destination: src, dest = dest, case.email_from if body and case.user_id.signature: diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 559d257820a..3947eb58156 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -92,7 +92,6 @@ class base_action_rule(osv.osv): def do_action(self, cr, uid, action, model_obj, obj, context=None): res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context) write = {} - if hasattr(action, 'act_section_id') and action.act_section_id: obj.section_id = action.act_section_id write['section_id'] = action.act_section_id.id @@ -110,6 +109,7 @@ class base_action_rule(osv.osv): model_obj.message_append(cr, uid, [obj], _(action.act_state)) model_obj.write(cr, uid, [obj.id], write, context) + super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context) emails = [] if hasattr(obj, 'email_from') and action.act_mail_to_partner: diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index b53028c952a..0e479d33737 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -204,7 +204,6 @@ class crm_lead(crm_case, osv.osv): 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 'color': 0, - #'stage_id': _get_stage_id, } def onchange_partner_address_id(self, cr, uid, ids, add, email=False): diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index 7b2e696e181..576f258facc 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -270,7 +270,9 @@ <field name="categ_id" ref="crm.categ_oppor3"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Pricing Information of Onsite Intervention'" name="name"/> - <field eval="'Send price list regarding our interventions'" name="title_action"/> + <field eval="'Send price list regarding our interventions'" name="title_action"/> + <field eval="time.strftime('%Y-%m-03')" name="date_action"/> + <field eval="time.strftime('%Y-%m-08')" name="date_deadline"/> <field name="partner_name">BalmerInc S.A.</field> <field name="street">Rue des Palais 51, bte 33</field> <field name="city">Bruxelles</field> @@ -291,7 +293,9 @@ <field name="categ_id" ref="crm.categ_oppor3"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Interest in your Kitchen Design Project'" name="name"/> - <field eval="'Send Catalogue by E-Mail'" name="title_action"/> + <field eval="'Send Catalogue by E-Mail'" name="title_action"/> + <field eval="time.strftime('%Y-01-10')" name="date_action"/> + <field eval="time.strftime('%Y-02-23')" name="date_deadline"/> <field name="partner_name">Lucie Vonck</field> <field name="street">Chaussée de Namur</field> <field name="city">Grand-Rosière</field> @@ -313,7 +317,9 @@ <field name="categ_id" ref="crm.categ_oppor6"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Plan train our students on your product'" name="name"/> - <field eval="'Call to define real needs about training'" name="title_action"/> + <field eval="'Call to define real needs about training'" name="title_action"/> + <field eval="time.strftime('%Y-%m-04')" name="date_action"/> + <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/> <field eval="4000" name="zip"/> <field name="partner_name">Université de Liège</field> <field name="street">Place du 20Août</field> @@ -336,7 +342,9 @@ <field name="categ_id" ref="crm.categ_oppor2"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Plan to buy 66 keyboards and 66 mouses'" name="name"/> - <field eval="'Propose the kit keyboard+mouse'" name="title_action"/> + <field eval="'Propose the kit keyboard+mouse'" name="title_action"/> + <field eval="time.strftime('%Y-04-12')" name="date_action"/> + <field eval="time.strftime('%Y-04-25')" name="date_deadline"/> <field name="partner_name">Bank Wealthy and sons</field> <field name="street">1 rue Rockfeller</field> <field name="city">Paris</field> @@ -359,6 +367,7 @@ <field name="categ_id" ref="crm.categ_oppor7"/> <field name="stage_id" ref="crm.stage_lead5"/> <field eval="'Need 20 Days of Consultancy'" name="name"/> + <field eval="time.strftime('%Y-%m-%d')" name="date_deadline"/> <field eval="'info@mycompany.net'" name="email_from"/> </record> <record id="crm_case_abcfuelcounits0" model="crm.lead"> @@ -376,8 +385,10 @@ <field name="categ_id" ref="crm.categ_oppor5"/> <field name="stage_id" ref="crm.stage_lead4"/> <field eval="'Need new design for my website'" name="name"/> + <field eval="time.strftime('%Y-05-01')" name="date_action"/> + <field eval="time.strftime('%Y-06-30')" name="date_deadline"/> <field eval="'info@opensides.be'" name="email_from"/> - <field eval="'Convert to quote'" name="title_action"/> + <field eval="'Convert to quote'" name="title_action"/> <field name="partner_name">Dubois sprl</field> <field name="street">Avenue de la Liberté 56</field> <field name="city">Brussels</field> @@ -428,7 +439,9 @@ <field name="categ_id" ref="crm.categ_oppor2"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Plan to attend a training'" name="name"/> - <field eval="'Call to give info about next training session'" name="title_action"/> + <field eval="time.strftime('%Y-04-10')" name="date_action"/> + <field eval="time.strftime('%Y-06-12')" name="date_deadline"/> + <field eval="'Call to give info about next training session'" name="title_action"/> <field name="partner_name">Axelor</field> <field name="street">12 rue Albert Einstein</field> <field name="city">Champs sur Marne</field> @@ -473,6 +486,8 @@ <field name="categ_id" ref="crm.categ_oppor1"/> <field name="stage_id" ref="crm.stage_lead3"/> <field eval="'Interest in your customizable PC'" name="name"/> + <field eval="time.strftime('%Y-08-05')" name="date_action"/> + <field eval="time.strftime('%Y-10-10')" name="date_deadline"/> <field eval="'Ask for the good receprion of the proposition'" name="title_action"/> <field name="partner_name">Eric Dubois</field> <field name="street">Chaussée de Binche, 27</field> diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 42587eea2b0..b37f1db6d55 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -284,7 +284,7 @@ <field name="priority" eval="2"/> <field name="arch" type="xml"> <calendar string="Leads Generation" - date_start="create_date" color="user_id"> + date_start="date_action" color="user_id"> <field name="name" /> <field name="partner_name" /> <field name="partner_address_id" /> @@ -345,7 +345,7 @@ <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/> <a string="Schedule/Log Call" name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/> <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/> - <a name="action_makeMeeting" type="object" string="Schedule Meeting" icon="gtk-redo" /> + <a string="Schedule Meeting" name="action_makeMeeting" type="object" icon="stock_calendar"/> </div> <div class="oe_kanban_right"> <a name="case_pending" string="Pending" states="draft,open" type="object" icon="lead-stage-pending" /> @@ -462,7 +462,7 @@ <field name="user_id"/> <button string="Schedule/Log Call" - name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/> + name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/> <field name="planned_revenue"/> <field name="probability"/> @@ -688,8 +688,7 @@ name="pending" domain="[('state','=','pending')]"/> <separator orientation="vertical"/> - <field name="name" string="Opportunity"/> - <field name="partner_id" string="Customer / Email" filter_domain="['|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]"/> + <field name="name" string="Opportunity / Customer" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/> <field name="user_id"> <filter icon="terp-personal-" domain="[('user_id','=', False)]" diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 748f85ad063..9cfdddf159c 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -35,7 +35,7 @@ class crm_phonecall(crm_base, osv.osv): _columns = { # From crm.case 'id': fields.integer('ID', readonly=True), - 'name': fields.char('Call Summary', size=64), + 'name': fields.char('Call Summary', size=64, required=True), 'active': fields.boolean('Active', required=False), 'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1), diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po index aae44c7b084..f7b7feadb2a 100644 --- a/addons/crm/i18n/da.po +++ b/addons/crm/i18n/da.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-10-26 14:18+0000\n" -"Last-Translator: Nicholas Christian Langkjær Ipsen " -"<sephiroth7vii@gmail.com>\n" +"PO-Revision-Date: 2011-11-08 21:47+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:01+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: crm #: view:crm.lead.report:0 @@ -43,7 +42,7 @@ msgstr "Månedligt" #. module: crm #: view:crm.opportunity2phonecall:0 msgid "Schedule a PhoneCall" -msgstr "" +msgstr "Planlæg et telefon kald" #. module: crm #: model:ir.model,name:crm.model_crm_case_stage diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index bf3917863cd..623f9a4c5e3 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -267,7 +267,6 @@ parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/> <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree" - groups="base.group_extended" parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/> </data> diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index 6b0a3ac15a9..4ea07252276 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -43,6 +43,6 @@ "access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1 "access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0 "access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0 -"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,1,1,1 +"access_crm_lead_partner_manager","crm.lead.partner.manager","model_crm_lead","base.group_partner_manager",1,0,0,0 "access_crm_phonecall_partner_manager","crm.phonecall.partner.manager","model_crm_phonecall","base.group_partner_manager",1,1,1,1 "access_crm_meeting_partner_manager","crm.meeting.partner.manager","model_crm_meeting","base.group_partner_manager",1,1,1,1 diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py index 88ccacffef5..861472949e2 100644 --- a/addons/crm/wizard/crm_lead_to_partner.py +++ b/addons/crm/wizard/crm_lead_to_partner.py @@ -78,21 +78,16 @@ class crm_lead2partner(osv.osv_memory): email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '') email = map(lambda x: "'" + x + "'", email) if email: - cr.execute("""select id from res_partner_address + cr.execute("""select partner_id from res_partner_address where substring(email from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email))) - address_ids = map(lambda x: x[0], cr.fetchall()) - if address_ids: - partner_ids = partner_obj.search(cr, uid, [('address', 'in', address_ids)], context=context) - + partner_ids = map(lambda x: x[0], cr.fetchall()) + # Find partner name that matches the name of the lead if not partner_ids and lead.partner_name: - partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context) - - partner_id = partner_ids and partner_ids[0] or False - - + partner_ids = partner_obj.search(cr, uid, [('name', '=ilike', lead.partner_name)], context=context) + partner_id = partner_ids and partner_ids[0] or False if 'partner_id' in fields: res.update({'partner_id': partner_id}) if 'action' in fields: diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py index 714376766f6..b0bfbf3b817 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall.py +++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py @@ -35,13 +35,16 @@ class crm_opportunity2phonecall(osv.osv_memory): _columns = { 'name' : fields.char('Call summary', size=64, required=True, select=1), 'user_id' : fields.many2one('res.users', "Assign To"), + 'contact_name':fields.char('Contact', size=64), + 'phone':fields.char('Phone', size=64), 'partner_id' : fields.many2one('res.partner', "Partner"), 'date': fields.datetime('Date'), 'section_id': fields.many2one('crm.case.section', 'Sales Team'), 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="['|',('section_id','=',False),('section_id','=',section_id),\ ('object_id.model', '=', 'crm.phonecall')]"), - 'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True), + 'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True), + 'note':fields.text('Note'), } def default_get(self, cr, uid, fields, context=None): @@ -64,7 +67,7 @@ class crm_opportunity2phonecall(osv.osv_memory): record_ids = context and context.get('active_ids', []) or [] res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context) - res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}) + res.update({'action': 'log', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}) for opp in opp_obj.browse(cr, uid, record_ids, context=context): if 'name' in fields: res.update({'name': opp.name}) @@ -76,6 +79,12 @@ class crm_opportunity2phonecall(osv.osv_memory): res.update({'categ_id': categ_id}) if 'partner_id' in fields: res.update({'partner_id': opp.partner_id and opp.partner_id.id or False}) + if 'note' in fields: + res.update({'note': opp.description}) + if 'contact_name' in fields: + res.update({'contact_name': opp.partner_address_id and opp.partner_address_id.name or False}) + if 'phone' in fields: + res.update({'phone': opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False)}) return res def action_cancel(self, cr, uid, ids, context=None): @@ -142,6 +151,7 @@ class crm_opportunity2phonecall(osv.osv_memory): if this.action == 'log': phonecall_obj.case_close(cr, uid, [new_case]) + return {'type': 'ir.actions.act_window_close'} value = { 'name': _('Phone Call'), diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml index 764648a877b..980b93500d2 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml +++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml @@ -16,10 +16,19 @@ <field name="name"/> <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/> <newline/> - <field name="partner_id" readonly="True"/> - <field name="user_id" /> - <field name="section_id" widget="selection" /> - <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/> + <group colspan="4"> + <field name="partner_id" readonly="True"/> + <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/> + <field name="contact_name"/> + <field name="phone"/> + </group> + <group colspan="4"> + <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/> + <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/> + </group> + <group colspan="4"> + <field name="note"/> + </group> <separator string="" colspan="4"/> <group colspan="4" col="3"> <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" /> diff --git a/addons/crm_caldav/i18n/da.po b/addons/crm_caldav/i18n/da.po index d79cc099c5c..2d68bcce53e 100644 --- a/addons/crm_caldav/i18n/da.po +++ b/addons/crm_caldav/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-11-22 07:37+0000\n" -"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n" +"PO-Revision-Date: 2011-11-08 21:45+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:53+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: crm_caldav #: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse @@ -43,4 +43,4 @@ msgstr "" #. module: crm_caldav #: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse msgid "Synchronyze this calendar" -msgstr "" +msgstr "Synkronisere denne kalender" diff --git a/addons/decimal_precision/i18n/da.po b/addons/decimal_precision/i18n/da.po new file mode 100644 index 00000000000..28871b4c50d --- /dev/null +++ b/addons/decimal_precision/i18n/da.po @@ -0,0 +1,69 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-08 11:35+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: decimal_precision +#: field:decimal.precision,digits:0 +msgid "Digits" +msgstr "Cifre" + +#. module: decimal_precision +#: view:decimal.precision:0 +msgid "Decimal Precision" +msgstr "Betydende decimaler" + +#. module: decimal_precision +#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form +#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form +msgid "Decimal Accuracy Definitions" +msgstr "Definition af betydende decimaler" + +#. module: decimal_precision +#: model:ir.module.module,description:decimal_precision.module_meta_information +msgid "" +"\n" +"This module allows to configure the price accuracy you need for different " +"kind\n" +"of usage: accounting, sales, purchases, ...\n" +"\n" +"The decimal precision is configured per company.\n" +msgstr "" +"\n" +"Dette modul giver dig mulighed indstille prisnøjagtigheden til forskellig " +"brug:\n" +"Bogføring, salg, indkøb osv.\n" + +#. module: decimal_precision +#: field:decimal.precision,name:0 +msgid "Usage" +msgstr "Anvendelse" + +#. module: decimal_precision +#: sql_constraint:decimal.precision:0 +msgid "Only one value can be defined for each given usage!" +msgstr "Kun een værdi kan defineres for hver anvendelse!" + +#. module: decimal_precision +#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information +msgid "Decimal Precision Configuration" +msgstr "Opsætning af betydende decimaler" + +#. module: decimal_precision +#: model:ir.model,name:decimal_precision.model_decimal_precision +msgid "decimal.precision" +msgstr "decimal.precision" diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po index 7e4992e9a97..5c121017845 100644 --- a/addons/delivery/i18n/da.po +++ b/addons/delivery/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-18 16:52+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:36+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 04:55+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: delivery #: report:sale.shipping:0 @@ -25,7 +25,7 @@ msgstr "" #. module: delivery #: model:product.template,name:delivery.delivery_product_product_template msgid "Delivery by Poste" -msgstr "" +msgstr "Levering med post" #. module: delivery #: view:delivery.grid:0 diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po index db4315d50b2..c45213396d2 100644 --- a/addons/document_webdav/i18n/da.po +++ b/addons/document_webdav/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-10-13 07:44+0000\n" -"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n" +"PO-Revision-Date: 2011-11-08 21:52+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:41+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: document_webdav #: field:document.webdav.dir.property,create_date:0 @@ -56,7 +56,7 @@ msgstr "" #: view:document.webdav.dir.property:0 #: view:document.webdav.file.property:0 msgid "Group By..." -msgstr "" +msgstr "Gruppér efter..." #. module: document_webdav #: view:document.directory:0 diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po index 12421bacfd9..9db53ff2a77 100644 --- a/addons/event/i18n/da.po +++ b/addons/event/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-23 14:35+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-09 21:21+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 04:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: event #: view:event.event:0 @@ -42,7 +42,7 @@ msgstr "Hovedtaler" #: view:event.registration:0 #: view:report.event.registration:0 msgid "Group By..." -msgstr "" +msgstr "Gruppér efter..." #. module: event #: field:event.event,register_min:0 @@ -57,7 +57,7 @@ msgstr "" #. module: event #: field:event.registration.badge,title:0 msgid "Title" -msgstr "" +msgstr "Titel" #. module: event #: field:event.event,mail_registr:0 @@ -83,7 +83,7 @@ msgstr "" #. module: event #: view:partner.event.registration:0 msgid "_Close" -msgstr "" +msgstr "_Luk" #. module: event #: model:event.event,name:event.event_0 diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po index 04789b02e47..77f37159701 100644 --- a/addons/event/i18n/ru.po +++ b/addons/event/i18n/ru.po @@ -7,13 +7,13 @@ 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-08-02 10:44+0000\n" +"PO-Revision-Date: 2011-11-07 22:33+0000\n" "Last-Translator: Stanislav Hanzhin <Unknown>\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-11-05 04:58+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: event @@ -689,8 +689,9 @@ msgid "" "outbound emails for this record before being sent. Separate multiple email " "addresses with a comma" msgstr "" -"Эти эл. адреса будут добавлены в поле \"Копия\" всей входящей и исходящей " -"почты для этой записи. Разделяйте эл. адреса запятыми." +"Эти электронные адреса будут добавлены в поле \"Копия\" всех входящих и " +"исходящих сообщений для этой записи перед отправкой. Разделяйте адреса " +"запятыми." #. module: event #: constraint:res.partner:0 diff --git a/addons/fetchmail_crm/installer.xml b/addons/fetchmail_crm/installer.xml index def954eb286..5223367eb29 100644 --- a/addons/fetchmail_crm/installer.xml +++ b/addons/fetchmail_crm/installer.xml @@ -6,8 +6,9 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">fetchmail.server</field> <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="context">{'default_name' : "Email Account For Leads", 'fetchmail_model' : 'crm.lead'}</field> + <field name="view_mode">tree,form</field> + <field name="context" eval="{'default_name': 'Incoming Leads', 'default_object_id': ref('crm.model_crm_lead')}"/> + <field name="help">You can connect your email account with leads in OpenERP. A new email sent to this account (example: info@mycompany.com) will automatically create a lead in OpenERP. The whole communication with the salesman will be attached to the lead automatically.</field> </record> <record model="ir.actions.todo" id="config_wizard_action_create_crm_leads_from_email_account"> diff --git a/addons/fetchmail_crm_claim/installer.xml b/addons/fetchmail_crm_claim/installer.xml index 232d95f6ea2..b3652a72938 100644 --- a/addons/fetchmail_crm_claim/installer.xml +++ b/addons/fetchmail_crm_claim/installer.xml @@ -6,8 +6,9 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">fetchmail.server</field> <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="context">{'default_name' : "Email Account For Claims", 'fetchmail_model' : 'crm.claim'}</field> + <field name="view_mode">tree,form</field> + <field name="context" eval="{'default_name': 'Claims', 'default_object_id' : ref('crm_claim.model_crm_claim')}"/> + <field name="help">You can connect your email account with claims in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create a claim for the followup in OpenERP. The whole communication by email will be attached to the claim automatically to keep track of the history.</field> </record> <record model="ir.actions.todo" id="config_wizard_action_create_crm_claims_from_email_account"> diff --git a/addons/fetchmail_hr_recruitment/installer.xml b/addons/fetchmail_hr_recruitment/installer.xml index f9dc497f357..ae2eb3de3ee 100644 --- a/addons/fetchmail_hr_recruitment/installer.xml +++ b/addons/fetchmail_hr_recruitment/installer.xml @@ -6,8 +6,9 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">fetchmail.server</field> <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="context">{'default_name' : "Email Account For Applicant", 'fetchmail_model' : 'hr.applicant'}</field> + <field name="view_mode">tree,form</field> + <field name="context" eval="{'default_name': 'Recruitment Applicants', 'default_object_id': ref('hr_recruitment.model_hr_applicant')}"/> + <field name="help">You can synchronize the job email account (e.g. job@yourcompany.com) with OpenERP so that new applicants are created automatically in OpenERP for the followup of the recruitment process. Attachments are automatically stored in the DMS of OpenERP so that you get an indexation of all the CVs received.</field> </record> <record model="ir.actions.todo" id="config_wizard_action_link_applicant_to_email_account"> diff --git a/addons/fetchmail_project_issue/installer.xml b/addons/fetchmail_project_issue/installer.xml index 300ffdc22d1..75554b2de29 100644 --- a/addons/fetchmail_project_issue/installer.xml +++ b/addons/fetchmail_project_issue/installer.xml @@ -6,8 +6,9 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">fetchmail.server</field> <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="context">{'default_name' : "Email Account For Issue", 'fetchmail_model' : 'project.issue'}</field> + <field name="view_mode">tree,form</field> + <field name="context" eval="{'default_name': 'Issues', 'default_object_id': ref('project_issue.model_project_issue')}"/> + <field name="help">You can connect your email account with issues in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create an issue. The whole communication will be attached to the issue automatically.</field> </record> <record model="ir.actions.todo" id="config_wizard_action_link_issue_to_email_account"> diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po index c55729d97fd..391cd357fa5 100644 --- a/addons/google_map/i18n/da.po +++ b/addons/google_map/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-11-20 07:53+0000\n" -"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n" +"PO-Revision-Date: 2011-11-08 21:48+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 04:49+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: google_map #: view:res.partner:0 @@ -48,7 +48,7 @@ msgstr "" #. module: google_map #: model:ir.module.module,shortdesc:google_map.module_meta_information msgid "Google Map" -msgstr "Google Kort" +msgstr "Google kort" #. module: google_map #: model:ir.model,name:google_map.model_res_partner_address diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 7a704de78d0..f641a425e18 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -47,7 +47,8 @@ class hr_employee_category(osv.osv): 'name': fields.char("Category", size=64, required=True), 'complete_name': fields.function(_name_get_fnc, type="char", string='Name'), 'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True), - 'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories') + 'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories'), + 'employee_ids': fields.many2many('hr.employee', 'employee_category_rel', 'category_id', 'emp_id', 'Employees'), } def _check_recursion(self, cr, uid, ids, context=None): diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index a59269bd3ff..84d0b6192eb 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -247,9 +247,12 @@ <field name="arch" type="xml"> <tree string="Employees"> <field name="name"/> - <field name="ssnid"/> - <field name="user_id"/> - <field name="address_id"/> + <field name="work_phone"/> + <field name="work_email"/> + <field name="company_id" groups="base.group_multi_company"/> + <field name="department_id"/> + <field name="job_id"/> + <field name="coach_id" invisible="1" /> </tree> </field> </record> @@ -287,6 +290,8 @@ <form string="Employee Category"> <field name="name" /> <field name="parent_id" /> + <separator string="Employees" colspan="4" /> + <field name="employee_ids" colspan="4" nolabel="1" /> </form> </field> </record> diff --git a/addons/hr/test/test_hr.yml b/addons/hr/test/test_hr.yml index 0ddcd7687d3..7b4ba82b243 100644 --- a/addons/hr/test/test_hr.yml +++ b/addons/hr/test/test_hr.yml @@ -1,13 +1,13 @@ - - In order to test hr module in OpenERP, I will create new Employee , Department and Job Position. + In order to test hr module in OpenERP, I will create new Employee, Department and Job Position. - - I create "R&D Department" in Department form. + I create "R&D Department" in Department form. - !record {model: hr.department, id: hr_department_rd0}: manager_id: base.user_root name: 'R & D' - - Now, I create a new employee “Mark Johnson”, and select department as "R&D Department". + Now, I create a new employee “Mark Johnson”, and select department as “R&D Department”. - !record {model: hr.employee, id: hr_employee_mark}: address_home_id: base.res_partner_address_1 @@ -15,10 +15,40 @@ gender: male marital: 'single' name: Mark Johnson - user_id: base.user_root - department_id: 'hr_department_rd0' - - In order to check the wizard “Employee Hierarchy” , I will create new employee “Phil Graves ” and select "Mark Johnson" as + I change the company of the employee. +- + !python {model: hr.employee}: | + res = self.onchange_company(cr, uid, [ref('hr_employee_mark')], ref('base.main_company'), None) + values = dict([('company_id', ref('base.main_company'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_employee_mark')], values, None) +- + I assign department for employee “Mark Johnson”. +- + !python {model: hr.employee}: | + res = self.onchange_department_id(cr, uid, [ref('hr_employee_mark')], ref('hr_department_rd0'), None) + assert res['value']['parent_id'] + values = dict([('department_id', ref('hr_department_rd0'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_employee_mark')], values, None) +- + Now I create a user for employee “Mark Johnson”. +- + !record {model: res.users, id: hr_users_markjohnson0}: + context_lang: en_US + groups_id: + - base.group_user + login: markjohnson + name: Mark Johnson + password: markjohnson +- + I assign user to employee “Mark Johnson”. +- + !python {model: hr.employee}: | + res = self.onchange_user(cr, uid, [ref('hr_employee_mark')], ref('hr_users_markjohnson0'), None) + values = dict([('user_id', ref('hr_users_markjohnson0'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_employee_mark')], values, None) +- + In order to check the wizard “Employee Hierarchy” , I will create new employee “Phil Graves” and select “Mark Johnson” as Manager. - !record {model: hr.employee, id: hr_employee_phil}: @@ -29,11 +59,19 @@ user_id: base.user_demo parent_id: 'hr_employee_mark' - + I fill the Working address for Employee. +- + !python {model: hr.employee}: | + res = self.onchange_address_id(cr, uid, ref('hr_employee_phil'), ref('base.res_partner_address_3000'), None) + assert res['value'] + values = dict([('address_id', ref('base.res_partner_address_3000'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_employee_phil')], values, None) +- I will open up form view of “Mark Johnson” and test the wizard “Employee Hierarchy” so it display the employee hierarchy starting from “Mark Johnson”. - - I will create new Job Position. I will check successfull creation of new Job Position by adding the information. + I will create new Job Position. I will check successful creation of new Job Position by adding the information. - !record {model: hr.job, id: hr_job_jea0}: department_id: 'hr_department_rd0' @@ -45,7 +83,6 @@ - !assert {model: hr.job, id: hr_job_jea0}: - state == 'open' - - I create Employee for job position. - @@ -61,3 +98,43 @@ - !assert {model: hr.job, id: hr_job_jea0}: - no_of_employee != False +- + As more requirements on the said job position are come, I increase the number of expected employees. +- + !python {model: hr.job}: | + res = self.on_change_expected_employee(cr, uid, [ref('hr_job_jea0')], 6, 3, None) + assert res['value']['expected_employees'] + values = dict([('expected_employees', ref('hr_job_jea0'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_job_jea0')], values, None) +- + I open the job position for recruitment. +- + !python {model: hr.job}: | + self.job_recruitement(cr, uid, [ref('hr_job_jea0')]) +- + I assign the job position to employee and mark the position. +- + !python {model: hr.job}: | + self.job_open(cr, uid, [ref('hr_job_jea0')]) +- + Now the process is over so I don't want to use this position. I mark it as Old. +- + !python {model: hr.job}: | + self.job_old(cr, uid, [ref('hr_job_jea0')]) +- + I create a parent category for the new recruited employees who are Freshers. +- + !record {model: hr.employee.category, id: hr_employee_category_fresher0}: + name: Fresher +- + I create another category for Junior Level freshers. +- + !record {model: hr.employee.category, id: hr_employee_category_juniorlevel0}: + name: Junior Level + parent_id: hr_employee_category_fresher0 +- + I open the tree view of Categories and see the categories in a hierarchical manner. +- + !python {model: hr.employee.category}: | + res = self.name_get(cr, uid, [ref('hr_employee_category_juniorlevel0')], None) + assert res diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 485b0566120..5a4f84a9692 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -74,7 +74,7 @@ <field name="wage"/> <field name="type_id" widget="selection"/> </group> - <notebook> + <notebook colspan='4'> <page string="Information" name="information"> <group col="2" colspan="2" name="left_column"> <separator colspan="2" string="Duration"/> diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml index a1c2f92ad1d..893f19d0a3e 100644 --- a/addons/hr_evaluation/test/test_hr_evaluation.yml +++ b/addons/hr_evaluation/test/test_hr_evaluation.yml @@ -96,7 +96,13 @@ name: Final Interview with manager sequence: 2 survey_id: 'survey_0' - +- + I assign the evaluation plan to the employee "Mark Johnson". +- + !python {model: hr.employee}: | + res = self.onchange_evaluation_plan_id(cr, uid, [ref('hr_employee_employee0')], ref('hr_evaluation_plan_managersplan0'), False, None) + values = dict([('evaluation_plan_id', ref('hr_evaluation_plan_managersplan0'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_employee_employee0')], values, None) - I create an Evaluation for employee under "Manager Evaluation Plan". - @@ -107,11 +113,24 @@ progress: 0.0 state: draft - + I change the employee on Evaluation. +- + !python {model: hr_evaluation.evaluation}: | + res = self.onchange_employee_id(cr, uid, [ref('hr_evaluation_evaluation_0')], ref('hr_employee_employee0'), None) + values = dict([('employee_id', ref('hr_employee_employee0'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_evaluation_evaluation_0')], values, None) +- I start the evaluation process by click on "Start Evaluation" button. - !python {model: hr_evaluation.evaluation}: | self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')]) - +- + I find a mistake on evaluation form. So I cancel the evaluation and again start it. +- + !python {model: hr_evaluation.evaluation}: | + self.button_cancel(cr, uid, [ref('hr_evaluation_evaluation_0')]) + self.button_draft(cr, uid, [ref('hr_evaluation_evaluation_0')]) + self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')]) - I close this survey request by giving answer of survey question. - @@ -119,6 +138,12 @@ evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0')) self.pool.get('hr.evaluation.interview').survey_req_done(cr, uid, [r.id for r in evaluation.survey_request_ids]) - + I print the survey. +- + !python {model: hr_evaluation.evaluation}: | + evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0')) + self.pool.get('hr.evaluation.interview').action_print_survey(cr, uid, [r.id for r in evaluation.survey_request_ids]) +- I click on "Final Validation" button to finalise evaluation. - !python {model: hr_evaluation.evaluation}: | diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml index fa237878023..bd13529d645 100644 --- a/addons/hr_expense/test/test_hr_expense.yml +++ b/addons/hr_expense/test/test_hr_expense.yml @@ -9,6 +9,12 @@ - I create a new employee. - + !record {model: hr.employee, id: hr.employee}: + address_home_id: base.res_partner_address_1 + address_id: base.main_address +- + I assign home address to employee. +- !record {model: hr.employee, id: hr.employee1}: address_home_id: base.res_partner_address_1 address_id: base.main_address @@ -26,7 +32,6 @@ !record {model: product.product, id: product_product_travel0}: categ_id: product.product_category_services cost_method: standard - hr_expense_ok: 1 list_price: 800.0 mes_type: fixed name: Travel @@ -40,15 +45,17 @@ warranty: 0.0 weight: 0.0 weight_net: 0.0 - +- + I mark this product for expenses. +- + !python {model: product.product}: | + self.on_change_hr_expense_ok(cr, uid, [ref('product_product_travel0')], True) - I create an expense. - !record {model: hr.expense.expense, id: hr_expense_expense_september0}: company_id: base.main_company - currency_id: base.EUR date: !eval "'%s-05-05' %(datetime.now().year)" - employee_id: hr.employee1 name: September Expenses line_ids: - date_value: !eval "'%s-05-27' %(datetime.now().year)" @@ -64,6 +71,23 @@ !assert {model: hr.expense.expense, id: hr_expense_expense_september0}: - state == 'draft' - + I change the employee on expense form. +- + !python {model: hr.expense.expense}: | + res = self.onchange_employee_id(cr, uid, [ref('hr_expense_expense_september0')], ref('hr.employee1'), None) + values = dict([('employee_id', ref('hr.employee1'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_expense_expense_september0')], values, None) +- + Now I change the related product on expense line. +- + !python {model: hr.expense.expense}: | + exp_line_obj = self.pool.get('hr.expense.line') + exp_obj = self.browse(cr, uid, ref('hr_expense_expense_september0'), None) + line_ids = [line.id for line in exp_obj.line_ids] + res = exp_line_obj.onchange_product_id(cr, uid, line_ids, ref('product_product_expense_air'), False, ref('hr.employee1'), None) + values = dict([('product_id', ref('product_product_expense_air'))] + res['value'].items()) + exp_line_obj.write(cr, uid, line_ids, values, None) +- I confirm this expenses by click on "Confirm" button. - !workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_september0} @@ -81,10 +105,10 @@ - I invoiced this expense by click on "Invoice" button. - - !workflow {model: hr.expense.expense, action: invoice, ref: hr_expense_expense_september0} - + !python {model: hr.expense.expense}: | + self.invoice(cr, uid, [ref('hr_expense_expense_september0')], None) - - I check that state is "Invoiced" + I check that state is "Invoiced". - !assert {model: hr.expense.expense, id: hr_expense_expense_september0}: - state == 'invoiced' @@ -94,3 +118,4 @@ !python {model: hr.expense.expense}: | exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0] assert exp.invoice_id, "Invoice should be created" + diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index b6d6a64ed26..a43378b1c95 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -9,7 +9,7 @@ <search string="Search Leave"> <group> <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/> - <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/> + <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/> <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/> <separator orientation="vertical"/> <filter string="This Month" icon="terp-go-month" name="This Month" domain="[('date_from','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/> @@ -200,6 +200,7 @@ <field name="arch" type="xml"> <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary"> <field name="employee_id"/> + <field name="category_id" invisible="1"/> <field name="department_id" invisible="1"/> <field name="type"/> <field name="name"/> @@ -258,21 +259,21 @@ </record> <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree"> - <field name="sequence" eval="1"/> + <field name="sequence" eval="2"/> <field name="view_mode">tree</field> <field name="view_id" ref="view_holiday"/> <field name="act_window_id" ref="open_ask_holidays"/> </record> <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form"> - <field name="sequence" eval="2"/> + <field name="sequence" eval="3"/> <field name="view_mode">form</field> <field name="view_id" ref="edit_holiday_new"/> <field name="act_window_id" ref="open_ask_holidays"/> </record> <record model="ir.actions.act_window.view" id="action_open_ask_holidays_calendar"> - <field name="sequence" eval="3"/> + <field name="sequence" eval="1"/> <field name="view_mode">calendar</field> <field name="view_id" ref="view_holiday_new_calendar"/> <field name="act_window_id" ref="open_ask_holidays"/> @@ -280,6 +281,32 @@ <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/> + <record model="ir.actions.act_window" id="request_approve_holidays"> + <field name="name">Requests Approve</field> + <field name="res_model">hr.holidays</field> + <field name="view_type">form</field> + <field name="context">{'search_default_approve':1,"search_default_department_id": department_id}</field> + <field name="domain">[('type','=','add')]</field> + <field name="view_id" ref="edit_holiday_new"/> + <field name="search_view_id" ref="view_hr_holidays_filter"/> + </record> + + <record model="ir.actions.act_window.view" id="action_request_approve_holidays_tree"> + <field name="sequence" eval="1"/> + <field name="view_mode">tree</field> + <field name="view_id" ref="view_holiday"/> + <field name="act_window_id" ref="request_approve_holidays"/> + </record> + + <record model="ir.actions.act_window.view" id="action_request_approve_holidays_form"> + <field name="sequence" eval="2"/> + <field name="view_mode">form</field> + <field name="view_id" ref="allocation_leave_new"/> + <field name="act_window_id" ref="request_approve_holidays"/> + </record> + + <menuitem name="Leave Requests to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_holidays" action="request_approve_holidays" groups="base.group_hr_user"/> + <record model="ir.actions.act_window" id="open_allocation_holidays"> <field name="name">Allocation Requests</field> <field name="res_model">hr.holidays</field> @@ -427,9 +454,9 @@ <!-- Shortcuts --> <act_window name="Leaves" domain="[('type','=','remove')]" context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" res_model="hr.holidays" src_model="hr.employee" view_id="view_holiday" id="act_hr_employee_holiday_request"/> - + <!-- Assing leave --> - + <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view"> <field name="name">hr.employee.leave.tree</field> <field name="model">hr.employee</field> @@ -440,7 +467,7 @@ <field name="remaining_leaves" string="Remaining Legal Leaves"/> </tree> </field> - </record> + </record> <record model="ir.actions.act_window" id="hr_holidays_leaves_assign_legal"> <field name="name">Allocate Leaves for Employees</field> @@ -458,7 +485,7 @@ </record> <!-- Hr employee inherit Legal Leaves --> - + <record id="view_employee_form_leave_inherit" model="ir.ui.view"> <field name="name">hr.employee.leave.form.inherit</field> <field name="model">hr.employee</field> diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml index 8215abf12f9..7ed381636cf 100644 --- a/addons/hr_holidays/hr_holidays_wizard.xml +++ b/addons/hr_holidays/hr_holidays_wizard.xml @@ -3,7 +3,7 @@ <data> <menuitem id="menu_hr_reporting_holidays" - name="Holidays" + name="Leaves" parent="hr.menu_hr_reporting" sequence="6"/> </data> diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml index 9b0c5652bdd..7013d62a5ed 100644 --- a/addons/hr_holidays/hr_holidays_workflow.xml +++ b/addons/hr_holidays/hr_holidays_workflow.xml @@ -84,7 +84,7 @@ <field name="act_from" ref="act_validate" /> <field name="act_to" ref="act_validate1" /> <field name="signal">second_validate</field> - <field name="group_id" ref="base.group_hr_user"/> + <field name="group_id" ref="base.group_hr_manager" /> </record> <record model="workflow.transition" id="t11"> diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml index f43b0235e46..c4a847640b6 100644 --- a/addons/hr_holidays/test/test_hr_holiday.yml +++ b/addons/hr_holidays/test/test_hr_holiday.yml @@ -42,7 +42,6 @@ I allocate leave request for employee "Phil Graves". - !record {model: hr.holidays, id: hr_holidays_allocateleaveforuser0}: - employee_id: 'hr_employee_philgraves0' holiday_status_id: hr_holidays_status_sick0 name: Sick Leaves for Phil Graves number_of_days_temp: 12.0 @@ -50,11 +49,46 @@ date_to: !eval "'%s-05-22 13:59:00' %(datetime.now().year)" type: add - + I assign allocation type as 'Employee'. +- + !python {model: hr.holidays}: | + self.onchange_type(cr, uid, [ref('hr_holidays_allocateleaveforuser0')], 'employee') +- + I change Leave Type of the employee. +- + !python {model: hr.holidays}: | + res = self.onchange_sec_id(cr, uid, [ref('hr_holidays_allocateleaveforuser0')], ref('holiday_status_sl')) + values = dict([('holiday_status_id', ref('holiday_status_sl'))] + res['value'].items()) + self.write(cr, uid, [ref('hr_holidays_allocateleaveforuser0')], values, None) +- + I assign the dates in the holiday request. +- + !python {model: hr.holidays}: | + from datetime import datetime + date_from = '%s-%s-%s 14:00:00' %(datetime.now().year, datetime.now().month, datetime.now().day) + date_to = '%s-%s-%s 19:59:00' %(datetime.now().year, datetime.now().month, datetime.now().day) + res = self.onchange_date_from(cr, uid, [ref('hr_holidays_allocateleaveforuser0')], date_to, date_from) + values = dict([('date_from', date_from),('date_to',date_to)] + res['value'].items()) + self.write(cr, uid, [ref('hr_holidays_allocateleaveforuser0')], values, None) +- I confirmed the allocation by clicking on "Confirm" button. - !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_allocateleaveforuser0} - + I find a small mistake on my leave request to I refuse the leave request to correct a mistake. +- + !workflow {model: hr.holidays, action: refuse, ref: hr_holidays_allocateleaveforuser0} + +- + I again set to draft and then confirm. +- + !python {model: hr.holidays}: | + import netsvc + wf_service = netsvc.LocalService("workflow") + self.set_to_draft(cr, uid, [ref('hr_holidays_allocateleaveforuser0')]) + wf_service.trg_validate(uid, 'hr.holidays', ref('hr_holidays_allocateleaveforuser0'), 'confirm', cr) +- I validate the allocation by clicking on "To Approve" button. - !workflow {model: hr.holidays, action: validate, ref: hr_holidays_allocateleaveforuser0} @@ -68,7 +102,7 @@ employee_id: 'hr_employee_philgraves0' holiday_status_id: 'hr_holidays_status_sick0' name: Appointment with Doctor - notes: My appointment with the doctor is confirmed. so please accept my leave. + notes: My appointment with the doctor is confirmed. So please accept my leave. number_of_days_temp: 2.0 type: remove user_id: 'test_holiday_user1' diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py index 34e8924bea5..5c78b80f095 100644 --- a/addons/hr_payroll/__openerp__.py +++ b/addons/hr_payroll/__openerp__.py @@ -23,7 +23,7 @@ 'name': 'Payroll', 'version': '1.0', 'category': 'Human Resources', - 'complexity': "expert", + 'complexity': "normal", 'description': """ Generic Payroll system. ======================= diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index b913cc0b2f1..e361482b28e 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -211,7 +211,7 @@ class one2many_mod2(fields.one2many): class hr_payslip_run(osv.osv): _name = 'hr.payslip.run' - _description = 'Payslip Run' + _description = 'Payslip Batches' _columns = { 'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}), @@ -286,7 +286,7 @@ class hr_payslip(osv.osv): 'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'), 'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}), - 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}), + 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Batches', readonly=True, states={'draft': [('readonly', False)]}), } _defaults = { 'date_from': lambda *a: time.strftime('%Y-%m-01'), diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index aa97ad9503a..01fe270710d 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -392,7 +392,7 @@ <group expand="0" string="Group By..."> <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/> <separator orientation="vertical"/> - <filter string="PaySlip Run" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/> + <filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/> <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/> <separator orientation="vertical"/> @@ -684,9 +684,9 @@ <field name="model">hr.payslip.run</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Search Payslip Runs"> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Runs"/> - <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Runs"/> + <search string="Search Payslip Batches"> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/> + <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/> <separator orientation="vertical"/> <field name="name"/> <field name="date_start"/> @@ -700,7 +700,7 @@ <field name="model">hr.payslip.run</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Payslips Run"> + <tree string="Payslips Batches"> <field name="name"/> <field name="date_start"/> <field name="date_end"/> @@ -715,7 +715,7 @@ <field name="model">hr.payslip.run</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Payslips Run"> + <form string="Payslips Batches"> <group col="6" colspan="4"> <field name="name" colspan="4"/> <field name="credit_note"/> @@ -738,7 +738,7 @@ </record> <record id="action_hr_payslip_run_tree" model="ir.actions.act_window"> - <field name="name">Payslips Run</field> + <field name="name">Payslips Batches</field> <field name="res_model">hr.payslip.run</field> <field name="view_type">form</field> <field name="view_id" ref="hr_payslip_run_tree"/> diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml index 089005f0b52..09af98ee0cd 100644 --- a/addons/hr_payroll/test/payslip.yml +++ b/addons/hr_payroll/test/payslip.yml @@ -16,7 +16,6 @@ name: Salary Structure for Software Developer code: SD company_id: base.main_company - parent_id: structure_base rule_ids: - hr_salary_rule_houserentallowance1 - hr_salary_rule_convanceallowance1 @@ -91,4 +90,46 @@ !python {model: hr.payslip}: | from tools.translate import _ payslip_brw=self.browse(cr, uid, ref("hr_payslip_0")) - assert(payslip_brw.state == 'done'), _('State not changed!')
\ No newline at end of file + assert(payslip_brw.state == 'done'), _('State not changed!') +- + I want to check refund payslip so I click on refund button. +- + !python {model: hr.payslip}: | + self.refund_sheet(cr, uid, [ref("hr_payslip_0")], None) +- + I check on new payslip Credit Note is checked or not. +- + !python {model: hr.payslip}: | + payslip_obj = self.browse(cr, uid, ref("hr_payslip_0"), None) + payslip_ids = self.search(cr, uid, [('name','like','Refund: '+payslip_obj.name),('credit_note','=',True)], None) + assert payslip_ids, "Payslip not refunded!" +- + I want to generate a payslip from Payslip run. +- + !record {model: hr.payslip.run, id: hr_payslip_run_PayslipforEmployee0}: + date_end: '2011-09-30' + date_start: '2011-09-01' + name: Payslip for Employee +- + I create record for generating the payslip for this Payslip run. +- + !record {model: hr.payslip.employees, id: hr_payslip_employees0}: + employee_ids: + - hr_employee_richard0 +- + I generate the payslip by clicking on Generat button wizard. +- + !python {model: hr.payslip.employees}: | + self.compute_sheet(cr, uid, [ref('hr_payslip_employees0')], context={'active_id': ref('hr_payslip_run_PayslipforEmployee0')}) +- + I open Contribution Register and from there I print the Payslip Lines report. +- + !record {model: payslip.lines.contribution.register, id: payslip_lines_contribution_register0}: + date_from: '2011-09-30' + date_to: '2011-09-01' +- + I print the report. +- + !python {model: payslip.lines.contribution.register}: | + self.print_report(cr, uid, [ref('payslip_lines_contribution_register0')], context={'active_ids': [ref('hr_houserent_register')]}) + diff --git a/addons/hr_payroll_account/test/hr_payroll_account.yml b/addons/hr_payroll_account/test/hr_payroll_account.yml index c399789f439..4481f53c2d1 100644 --- a/addons/hr_payroll_account/test/hr_payroll_account.yml +++ b/addons/hr_payroll_account/test/hr_payroll_account.yml @@ -1,7 +1,7 @@ - - I test the "Payslip" in order to check the hr_payroll_account module in OpenERP + I test the "Payslip" in order to check the hr_payroll_account module in OpenERP. - - I create a bank record + I create a bank record. - !record {model: res.partner.bank, id: res_partner_bank_0}: acc_number: '001-9876543-21' @@ -9,7 +9,7 @@ state: bank bank: base.res_bank_1 - - I create a new employee "John" + I create a new employee "John". - !record {model: hr.employee, id: hr_employee_john}: address_home_id: base.res_partner_address_2 @@ -24,7 +24,7 @@ bank_account_id: res_partner_bank_0 vehicle_distance: 0.0 - - I create a salary structure for 'Software Developer' + I create a salary structure for 'Software Developer'. - !record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper}: name: Salary Structure for Software Developer @@ -39,7 +39,7 @@ - hr_payroll.hr_salary_rule_meal_voucher - hr_payroll.hr_salary_rule_sales_commission - - I create a contract for "John" + I create a contract for "John". - !record {model: hr.contract, id: hr_contract_john}: date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)" @@ -50,14 +50,16 @@ employee_id: hr_employee_john struct_id: hr_payroll_structure_softwaredeveloper working_hours: resource.timesheet_group1 + journal_id: account.expenses_journal - - I create a Payslip + I create a Payslip. - !record {model: hr.payslip, id: hr_payslip_0}: employee_id: hr_employee_john journal_id: account.expenses_journal + - - The selection of an employee fills the contract, structure, worked days and input data fields + The selection of an employee fills the contract, structure, worked days and input data fields. - !python {model: hr.payslip}: | import time @@ -71,25 +73,27 @@ 'struct_id': res['value']['struct_id'], 'contract_id': res['value']['contract_id'], 'name': res['value']['name'], - } + } vals['worked_days_line_ids'] = [(0,0,i) for i in res['value']['worked_days_line_ids']] vals['input_line_ids'] = [(0,0,i) for i in res['value']['input_line_ids']] + res_contract = self.onchange_contract_id(cr, uid, [ref('hr_payslip_0')], date_from, date_to, ref('hr_employee_john'), ref('hr_contract_john'), None) + vals.update({'contract_id': ref('hr_contract_john')}) self.write(cr, uid, ref("hr_payslip_0"), vals) - - I assign the amount to Input data + I assign the amount to Input data. - !python {model: hr.payslip.input}: | ids = self.search(cr, uid, [('payslip_id', '=', ref("hr_payslip_0"))]) self.write(cr, uid, ids, {'amount': 5.0}) - - I verify the payslip is in draft state + I verify the payslip is in draft state. - !python {model: hr.payslip}: | from tools.translate import _ payslip_brw=self.browse(cr, uid, ref("hr_payslip_0")) assert(payslip_brw.state == 'draft'), _('State not changed!') - - I click on "Compute Sheet" button + I click on "Compute Sheet" button. - !python {model: hr.payslip}: | self.compute_sheet(cr, uid, [ref("hr_payslip_0")], {"lang": "en_US", "tz": False, @@ -97,19 +101,28 @@ "section_id": False, "active_id": ref("hr_payroll.menu_department_tree"), }) - - Then I click on the "Confirm" button + I want to check cancel button. So I first cancel the sheet then make it set to draft. +- + !python {model: hr.payslip}: | + import netsvc + wf_service = netsvc.LocalService("workflow") + self.cancel_sheet(cr, uid, [ref("hr_payslip_0")], None) + wf_service.trg_validate(uid, 'hr.payslip', ref("hr_payslip_0"), 'draft', cr) +- + Then I click on the "Confirm" button. - !workflow {model: hr.payslip, action: hr_verify_sheet, ref: hr_payslip_0} - - I verify that the Accounting Entries are created + I verify that the Accounting Entries are created. - !python {model: hr.payslip}: | payslip = self.browse(cr, uid, ref("hr_payslip_0")) assert payslip.move_id, "Accounting Entries has not been created" - - I verify that the payslip is in done state + I verify that the payslip is in done state. - !python {model: hr.payslip}: | from tools.translate import _ payslip_brw=self.browse(cr, uid, ref("hr_payslip_0")) assert(payslip_brw.state == 'done'), _('State not changed!') + diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index e2ecf522cae..65e81091798 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -473,7 +473,7 @@ class hr_job(osv.osv): _inherit = "hr.job" _name = "hr.job" _columns = { - 'survey_id': fields.many2one('survey', 'Survey', help="Select survey for the current job"), + 'survey_id': fields.many2one('survey', 'Interview Form', help="Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"), } hr_job() diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml index b2d029f74d4..0fc2c94f034 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.xml +++ b/addons/hr_recruitment/hr_recruitment_demo.xml @@ -151,6 +151,7 @@ <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/> <field eval="'6630125'" name="partner_phone"/> <field name="job_id" ref="hr.job_jr_appli"/> + <field name="department_id" ref="hr.dep_it"/> <field eval="11000.0" name="salary_expected"/> </record> diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml index 0bac3f8615a..7fe746f580b 100644 --- a/addons/hr_recruitment/hr_recruitment_menu.xml +++ b/addons/hr_recruitment/hr_recruitment_menu.xml @@ -8,7 +8,7 @@ <field name="res_model">hr.applicant</field> <field name="view_mode">tree,form,graph,calendar,kanban</field> <field name="view_id" ref="crm_case_tree_view_job"/> - <field name="context">{"search_default_user_id":uid, 'search_default_current': 1,"search_default_department_id": department_id}</field> + <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1,"search_default_department_id": department_id}</field> <field name="search_view_id" ref="view_crm_case_jobs_filter"/> <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field> </record> diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 6b863121369..4ccfcbe48a2 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -218,11 +218,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Jobs"> - <filter icon="terp-document-new" string="New" + <filter icon="terp-document-new" string="New" name="filter_new" domain="[('state','=','draft')]" help="All Initial Jobs" /> - <filter icon="terp-camera_test" string="In Progress" + <filter icon="terp-camera_test" string="In Progress" name="filter_inprogress" domain="[('state','=','open')]" help="Open Jobs" /> @@ -334,7 +334,7 @@ <a string="Change Color" icon="color-picker" type="color" name="color"/> <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/> <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/> - <a name="action_makeMeeting" type="object" string="Schedule Meeting" icon="gtk-redo" /> + <a string="Schedule Meeting" name="action_makeMeeting" type="object" icon="stock_calendar"/> <a t-if="record.survey.raw_value" name="action_print_survey" type="object" string="Print Interview" icon="gtk-print" /> </div> <div class="oe_kanban_right"> diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml index 1acbf33eb72..b797353bde2 100644 --- a/addons/hr_recruitment/test/test_hr_recruitment.yml +++ b/addons/hr_recruitment/test/test_hr_recruitment.yml @@ -52,7 +52,12 @@ !python {model: hr.applicant}: | self.case_open(cr, uid, [ref("hr_applicant_fresher0")], {"active_ids": [ref("hr_recruitment.menu_crm_case_categ0_act_job")], }) - +- + I change the stages by clicking on stage next and stage previous buttons. +- + !python {model: hr.applicant}: | + self.stage_next(cr, uid, [ref('hr_applicant_fresher0')], None) + self.stage_previous(cr, uid, [ref('hr_applicant_fresher0')], None) - I create a new case category. - @@ -97,14 +102,38 @@ rrule_type: none state: open user_id: base.user_root - - - On a successful meeting with the applicant, I hired employee by click on "Hired" button. + I print the survery filled up by the applicant. +- + !python {model: hr.applicant}: | + self.action_print_survey(cr, uid, [ref('hr_applicant_fresher0')], None) +- + I assign the position to the applicant and its relevant department. - !python {model: hr.applicant}: | - self.case_close(cr, uid, [ref('hr_applicant_fresher0')]) + res = self.onchange_job(cr, uid, [ref('hr_applicant_fresher0')], ref('hr.job_jr_developers'), None) + values = dict([('job_id', ref('hr.job_jr_developers'))] + res['value'].items()) + res1 = self.onchange_department_id(cr, uid, [ref('hr_applicant_fresher0')], ref('hr.dep_it'), None) + values.update(dict([('department_id', ref('hr.dep_it'))] + res1['value'].items())) + self.write(cr, uid, [ref('hr_applicant_fresher0')], values, None) +- + On a successful meeting with the applicant, I hired employee by click on "Hired" button. +- + !python {model: hired.employee}: | + self.case_close(cr, uid, [], context={'active_ids': [ref('hr_applicant_fresher0')]}) - I check that applicant state is "Hired". - !assert {model: hr.applicant, id: hr_applicant_fresher0}: - state == 'done' +- + I create partner for the hired applicant for accounting purpose. +- + !record {model: hr.recruitment.partner.create, id: hr_recruitment_partner_create0}: + close: False +- + I click on Create Partner button to create a partner for applicant. +- + !python {model: hr.recruitment.partner.create}: | + self.make_order(cr, uid, [ref('hr_recruitment_partner_create0')], context={'active_ids': [ref('hr_applicant_fresher0')]}) + diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml index 7ce2908f24f..30c97c3eb70 100644 --- a/addons/hr_timesheet/test/test_hr_timesheet.yml +++ b/addons/hr_timesheet/test/test_hr_timesheet.yml @@ -38,14 +38,6 @@ user_id: 'test_timesheet_user1' - - I create Timesheet journal for employee. -- - !record {model: account.analytic.journal, id: analytic_journal}: - code: TS - name: Timesheet Journal - type: general - -- I create a product as "Consultancy - Senior Developer". - !record {model: product.product, id: product_consultant}: @@ -103,7 +95,26 @@ uid = ref('test_timesheet_user1') new_id = self.create(cr, uid, {'emp_id': ref('hr_employee_fracline1'), 'name': 'Francline', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'absent'}) self.sign_in_result(cr, uid, [new_id], context) - +- + I create a timesheet line manually to check several default values. + I also assign proper date and user for that line. +- + !python {model: hr.analytic.timesheet}: | + import time + uid = ref('test_timesheet_user1') + current_date = time.strftime('%Y-%m-%d') + vals = {'name': 'Worked on project', + 'user_id': ref('test_timesheet_user1'), + 'account_id': ref('account.analytic_project_1_development'), + 'unit_amount': 5.00, + 'journal_id': ref('analytic_journal') + } + line_id = self.create(cr, uid, vals, None) + res = self.on_change_date(cr, uid, [line_id], current_date) + values = dict([('date', current_date)] + res['value'].items()) + res1 = self.on_change_user_id(cr, uid, [line_id], ref('base.user_root')) + values.update(dict([('user_id', ref('base.user_root'))] + res1['value'].items())) + self.write(cr, uid, [line_id], values, None) - To stop work I click on "Sign In/Sign Out" button of "Sign In/Sign Out by Project" wizard. Which check state in hr attendace form for user. @@ -113,7 +124,6 @@ ids = self.search(cr, uid, [('emp_id', '=', ref('hr_employee_fracline1')),('name', '=', 'Francline')]) self.check_state(cr, uid, ids, {"active_ids": [ref("hr_timesheet.action_hr_timesheet_sign_in")] }) - - I Create an analytic account "Project2". - @@ -136,3 +146,4 @@ - | I can see employee timesheet for particular month using "Employee Timesheet" report. + diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml index cf068ac9ce9..ed50ccc5d4d 100644 --- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml +++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml @@ -23,7 +23,17 @@ !record {model: account.analytic.account, id: account.analytic_sednacom}: partner_id: base.res_partner_desertic_hispafuentes pricelist_id: product.list0 - +- + I open this account and make the state as pending. +- + !python {model: account.analytic.account}: | + self.set_open(cr, uid, [ref('account.analytic_sednacom')], None) + self.set_pending(cr, uid, [ref('account.analytic_sednacom')], None) +- + I assign account on analytic account line. +- + !python {model: hr.analytic.timesheet}: | + self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')], ref('account.analytic_sednacom')) - I create invoice on analytic Line using "Invoice analytic Line" wizard. - @@ -73,11 +83,15 @@ price: 1 time: 1 - - I click on "Create Invoice" button to create Invoice. + I click on "Create Invoice" button to create Invoice and validate the invoice. - !python {model: hr.timesheet.invoice.create.final}: | - self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_sednacom")]}) - + import netsvc + wkf_service = netsvc.LocalService("workflow") + res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_sednacom")]}) + invoice_ids = eval(res['domain'])[0][2] + for inv in invoice_ids: + wkf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_open', cr) - I can also make some theoretical revenue reports. - diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index c1c936ccc0f..089ade7c618 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -313,7 +313,7 @@ class hr_timesheet_sheet(osv.osv): def _default_employee(self, cr, uid, context=None): emp_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context) return emp_ids and emp_ids[0] or False - + _defaults = { 'date_from' : _default_date_from, 'date_current' : lambda *a: time.strftime('%Y-%m-%d'), @@ -329,7 +329,7 @@ class hr_timesheet_sheet(osv.osv): if new_user_id: cr.execute('SELECT id \ FROM hr_timesheet_sheet_sheet \ - WHERE (date_from < %s and %s < date_to) \ + WHERE (date_from <= %s and %s <= date_to) \ AND user_id=%s \ AND id <> %s',(sheet.date_to, sheet.date_from, new_user_id, sheet.id)) if cr.fetchall(): diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 11e1789aa41..b14c9133319 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -186,7 +186,7 @@ <field name="res_model">hr_timesheet_sheet.sheet</field> <field name="view_type">form</field> <field name="view_id" eval="False"/> - <field name="context">{'search_default_my_timesheet':1, }</field> + <field name="context">{'search_default_my_timesheet':1,'group_by_no_leaf':1}</field> <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/> <field name="help">Check your timesheets for a specific period. You can also encode time spent on a project (i.e. an analytic account) thus generating costs in the analytic account concerned.</field> </record> diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml index 405c6585cf9..24ffe3bb178 100644 --- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml +++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml @@ -71,13 +71,30 @@ user_id: base.user_demo employee_id: 'hr_employee_employee0' - - Now , at the time of login, I create Attendances and perform "Sign In" action. + Now, at the time of login, I create Attendances and perform "Sign In" action. - - !record {model: hr.attendance, id: hr_attendance_0}: - action: sign_in - employee_id: 'hr_employee_employee0' - name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(max(0,datetime.now().hour-1),max(0,datetime.now().minute-1),max(0,datetime.now().second-1)) - + !python {model: hr_timesheet_sheet.sheet}: + self.sign_in(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {}) +- + I want to check attendance and work of yesterday. I click on <- button. +- + !python {model: hr_timesheet_sheet.sheet}: | + self.date_previous(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None) +- + Then I click on "Today" button to fill today's timesheet. +- + !python {model: hr_timesheet_sheet.sheet}: | + self.date_today(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None) +- + I want to go to a particular date and see attendance then I select the date and click on "Go to:" button. +- + !python {model: hr_timesheet_sheet.sheet}: | + self.button_dummy(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None) +- + I can also move to next day by clicking on -> button. +- + !python {model: hr_timesheet_sheet.sheet}: | + self.date_next(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None) - At the time of logout, I create attendance and perform "Sign Out". - @@ -88,7 +105,6 @@ - I create Timesheet Entry for time spend on today work. - - !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}: timesheet_ids: diff --git a/addons/html_view/i18n/da.po b/addons/html_view/i18n/da.po index e340fd0f736..2c33fe8b010 100644 --- a/addons/html_view/i18n/da.po +++ b/addons/html_view/i18n/da.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-24 09:55+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:09+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:53+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: html_view #: field:html.view,name:0 msgid "Name" -msgstr "" +msgstr "Navn" #. module: html_view #: field:html.view,comp_id:0 msgid "Company" -msgstr "Virksomhed" +msgstr "Firma" #. module: html_view #: model:ir.actions.act_window,name:html_view.action_html_view_form @@ -36,17 +36,17 @@ msgstr "HTML test" #. module: html_view #: view:html.view:0 msgid "Html Example" -msgstr "" +msgstr "HTML eksempel" #. module: html_view #: model:ir.module.module,shortdesc:html_view.module_meta_information msgid "Html View" -msgstr "" +msgstr "HTML visning" #. module: html_view #: field:html.view,bank_ids:0 msgid "Banks" -msgstr "" +msgstr "Banker" #. module: html_view #: model:ir.module.module,description:html_view.module_meta_information @@ -56,8 +56,12 @@ msgid "" "view.\n" " " msgstr "" +"\n" +" Dette er testmodulet, der viser understøttelse af HTML tags i en normal " +"XML formular.\n" +" " #. module: html_view #: model:ir.model,name:html_view.model_html_view msgid "html.view" -msgstr "" +msgstr "html.view" diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py index e6dab775d6e..66709824c4a 100644 --- a/addons/idea/__openerp__.py +++ b/addons/idea/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Ideas Box', 'version': '0.1', - 'category': 'Hidden', + 'category': 'Human Resources', 'complexity': "easy", 'description': """ This module allows your user to easily and efficiently participate in enterprise innovation. diff --git a/addons/idea/i18n/da.po b/addons/idea/i18n/da.po index f26f0d38ffe..e285d0d1135 100644 --- a/addons/idea/i18n/da.po +++ b/addons/idea/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-11-01 20:17+0000\n" +"PO-Revision-Date: 2011-11-08 21:34+0000\n" "Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:17+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: idea #: help:idea.category,visibility:0 @@ -154,7 +154,7 @@ msgstr "Idéstemme" #. module: idea #: field:idea.category,parent_id:0 msgid "Parent Categories" -msgstr "" +msgstr "Forældrekategorier" #. module: idea #: selection:idea.idea,my_vote:0 @@ -443,7 +443,7 @@ msgstr "Brugernavn" #. module: idea #: model:ir.model,name:idea.model_idea_vote_stat msgid "Idea Votes Statistics" -msgstr "" +msgstr "Stemme statistik" #. module: idea #: field:idea.comment,user_id:0 @@ -451,7 +451,7 @@ msgstr "" #: field:idea.vote,user_id:0 #: view:report.vote:0 msgid "User" -msgstr "Bruger" +msgstr "User" #. module: idea #: field:idea.vote,date:0 @@ -461,7 +461,7 @@ msgstr "Dato" #. module: idea #: view:idea.post.vote:0 msgid "Post" -msgstr "" +msgstr "Send" #. module: idea #: field:idea.idea,my_vote:0 @@ -512,7 +512,7 @@ msgstr "Historik" #. module: idea #: view:idea.idea:0 msgid "Vots Statistics" -msgstr "" +msgstr "Stemme statistik" #. module: idea #: field:report.vote,date:0 @@ -551,7 +551,7 @@ msgstr "Luk" #: view:idea.idea:0 #: view:report.vote:0 msgid "Open" -msgstr "Åbn" +msgstr "Åben" #. module: idea #: view:report.vote:0 @@ -640,17 +640,17 @@ msgstr "April" #. module: idea #: field:idea.idea,count_comments:0 msgid "Count of comments" -msgstr "" +msgstr "Antal kommentarer" #. module: idea #: field:idea.vote,score:0 msgid "Vote Status" -msgstr "" +msgstr "Stemme status" #. module: idea #: field:idea.idea,vote_avg:0 msgid "Average Score" -msgstr "" +msgstr "Gennemsnitlig score" #. module: idea #: field:idea.comment,idea_id:0 @@ -662,7 +662,7 @@ msgstr "" #: view:report.vote:0 #: field:report.vote,idea_id:0 msgid "Idea" -msgstr "" +msgstr "Idé" #. module: idea #: view:idea.idea:0 @@ -672,7 +672,7 @@ msgstr "Godkend" #. module: idea #: field:idea.post.vote,vote:0 msgid "Post Vote" -msgstr "" +msgstr "Send stemme" #. module: idea #: view:report.vote:0 diff --git a/addons/knowledge/i18n/da.po b/addons/knowledge/i18n/da.po new file mode 100644 index 00000000000..f198a77905b --- /dev/null +++ b/addons/knowledge/i18n/da.po @@ -0,0 +1,155 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-09 21:31+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: knowledge +#: model:ir.ui.menu,name:knowledge.menu_document +msgid "Knowledge" +msgstr "Viden" + +#. module: knowledge +#: help:knowledge.installer,wiki_quality_manual:0 +msgid "Creates an example skeleton for a standard quality manual." +msgstr "" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "Share information within the company with these specific Addons." +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,document_ftp:0 +msgid "Shared Repositories (FTP)" +msgstr "" + +#. module: knowledge +#: model:ir.module.module,shortdesc:knowledge.module_meta_information +msgid "Knowledge Management System" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,wiki:0 +msgid "Collaborative Content (Wiki)" +msgstr "" + +#. module: knowledge +#: help:knowledge.installer,document_ftp:0 +msgid "" +"Provides an FTP access to your OpenERP's Document Management System. It lets " +"you access attachments and virtual documents through a standard FTP client." +msgstr "" + +#. module: knowledge +#: help:knowledge.installer,document_webdav:0 +msgid "" +"Provides a WebDAV access to your OpenERP's Document Management System. Lets " +"you access attachments and virtual documents through your standard file " +"browser." +msgstr "" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "Configure" +msgstr "Konfigurer" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "title" +msgstr "titel" + +#. module: knowledge +#: model:ir.module.module,description:knowledge.module_meta_information +msgid "" +"Installer for knowledge-based tools\n" +" " +msgstr "" + +#. module: knowledge +#: model:ir.ui.menu,name:knowledge.menu_document_configuration +msgid "Configuration" +msgstr "Konfiguration" + +#. module: knowledge +#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer +msgid "Knowledge Modules Installation" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,wiki_quality_manual:0 +msgid "Quality Manual" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,document_webdav:0 +msgid "Shared Repositories (WebDAV)" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,progress:0 +msgid "Configuration Progress" +msgstr "Konfigurationsfremgang" + +#. module: knowledge +#: help:knowledge.installer,wiki_faq:0 +msgid "" +"Creates a skeleton internal FAQ pre-filled with documentation about " +"OpenERP's Document Management System." +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,wiki_faq:0 +msgid "Internal FAQ" +msgstr "" + +#. module: knowledge +#: model:ir.ui.menu,name:knowledge.menu_document2 +msgid "Collaborative Content" +msgstr "" + +#. module: knowledge +#: field:knowledge.installer,config_logo:0 +msgid "Image" +msgstr "Billede" + +#. module: knowledge +#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer +#: view:knowledge.installer:0 +msgid "Knowledge Application Configuration" +msgstr "" + +#. module: knowledge +#: model:ir.model,name:knowledge.model_knowledge_installer +msgid "knowledge.installer" +msgstr "" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "Configure Your Knowledge Application" +msgstr "" + +#. module: knowledge +#: help:knowledge.installer,wiki:0 +msgid "" +"Lets you create wiki pages and page groups in order to keep track of " +"business knowledge and share it with and between your employees." +msgstr "" + +#. module: knowledge +#: view:knowledge.installer:0 +msgid "Content templates" +msgstr "" diff --git a/addons/l10n_hn/__init__.py b/addons/l10n_hn/__init__.py index b4f408623f9..b4f408623f9 100755..100644 --- a/addons/l10n_hn/__init__.py +++ b/addons/l10n_hn/__init__.py diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py index c4428759af0..31d9344cb65 100755..100644 --- a/addons/l10n_hn/__openerp__.py +++ b/addons/l10n_hn/__openerp__.py @@ -35,7 +35,7 @@ { 'name': 'Honduras - Plan contable general', 'version': '0.1', - 'category': 'Localisation/Account Charts', + 'category': 'Localization/Account Charts', 'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes and the Lempira currency""", 'author': 'Salvatore Josue Trimarchi Pinto', 'website': 'http://trimarchi.co.cc', diff --git a/addons/l10n_hn/account_chart.xml b/addons/l10n_hn/account_chart.xml index 7bd17b0e82d..7bd17b0e82d 100755..100644 --- a/addons/l10n_hn/account_chart.xml +++ b/addons/l10n_hn/account_chart.xml diff --git a/addons/l10n_hn/account_tax.xml b/addons/l10n_hn/account_tax.xml index 64675ecde33..64675ecde33 100755..100644 --- a/addons/l10n_hn/account_tax.xml +++ b/addons/l10n_hn/account_tax.xml diff --git a/addons/l10n_hn/account_types.xml b/addons/l10n_hn/account_types.xml index aeb7a01964e..aeb7a01964e 100755..100644 --- a/addons/l10n_hn/account_types.xml +++ b/addons/l10n_hn/account_types.xml diff --git a/addons/l10n_hn/i18n/ca.po b/addons/l10n_hn/i18n/ca.po index 24de725e214..aad943ef40d 100755..100644 --- a/addons/l10n_hn/i18n/ca.po +++ b/addons/l10n_hn/i18n/ca.po @@ -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: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\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 54a8a33376c..fa71768c797 100755..100644 --- a/addons/l10n_hn/i18n/es.po +++ b/addons/l10n_hn/i18n/es.po @@ -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: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/es_PY.po b/addons/l10n_hn/i18n/es_PY.po index ebb0a661769..ebb0a661769 100755..100644 --- a/addons/l10n_hn/i18n/es_PY.po +++ b/addons/l10n_hn/i18n/es_PY.po diff --git a/addons/l10n_hn/i18n/fr.po b/addons/l10n_hn/i18n/fr.po index f61ad5dae13..9d2e759a734 100755..100644 --- a/addons/l10n_hn/i18n/fr.po +++ b/addons/l10n_hn/i18n/fr.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\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 ef2997a1875..0c718c8e4eb 100755..100644 --- a/addons/l10n_hn/i18n/gl.po +++ b/addons/l10n_hn/i18n/gl.po @@ -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: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\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 305ba7c6e40..8cb0490fdaa 100755..100644 --- a/addons/l10n_hn/i18n/hu.po +++ b/addons/l10n_hn/i18n/hu.po @@ -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: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\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 36b0d853598..b2cbae2b860 100755..100644 --- a/addons/l10n_hn/i18n/it.po +++ b/addons/l10n_hn/i18n/it.po @@ -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: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/i18n/l10n_hn.pot b/addons/l10n_hn/i18n/l10n_hn.pot index ca694f03e88..ca694f03e88 100755..100644 --- a/addons/l10n_hn/i18n/l10n_hn.pot +++ b/addons/l10n_hn/i18n/l10n_hn.pot diff --git a/addons/l10n_hn/i18n/pt_BR.po b/addons/l10n_hn/i18n/pt_BR.po index 811711bfd59..85231507ac5 100755..100644 --- a/addons/l10n_hn/i18n/pt_BR.po +++ b/addons/l10n_hn/i18n/pt_BR.po @@ -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: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\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 861c48c341e..60d3fcb2dec 100755..100644 --- a/addons/l10n_hn/i18n/sr@latin.po +++ b/addons/l10n_hn/i18n/sr@latin.po @@ -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: 2011-11-05 05:58+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: l10n_hn #: model:ir.module.module,shortdesc:l10n_hn.module_meta_information diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml index e86409f62b1..e86409f62b1 100755..100644 --- a/addons/l10n_hn/l10n_hn_base.xml +++ b/addons/l10n_hn/l10n_hn_base.xml diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py index 2a493f39dcf..6d5cd576912 100644 --- a/addons/lunch/__openerp__.py +++ b/addons/lunch/__openerp__.py @@ -33,7 +33,7 @@ """, "version": "0.1", "depends": ["base_tools"], - "category" : "Hidden", + "category" : "Human Resources", 'description': """ The base module to manage lunch diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 621eef59da5..9c535966e17 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -74,7 +74,7 @@ class mail_message_common(osv.osv_memory): 'model': fields.char('Related Document model', size=128, select=1, readonly=1), 'res_id': fields.integer('Related Document ID', select=1, readonly=1), 'date': fields.datetime('Date'), - 'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences'), + 'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences. If empty, this is not a mail but a message.'), 'email_to': fields.char('To', size=256, help='Message recipients'), 'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'), 'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'), @@ -334,8 +334,8 @@ class mail_message(osv.osv): 'subtype': msg_mime_subtype, 'body_text': plaintext_body 'body_html': html_body, - 'attachments': { 'file1': 'bytes', - 'file2': 'bytes' } + 'attachments': [('file1', 'bytes'), + ('file2', 'bytes') } # ... 'original': source_of_email, } @@ -416,7 +416,7 @@ class mail_message(osv.osv): body = tools.html2plaintext(body) msg['body_text'] = tools.ustr(body, encoding) - attachments = {} + attachments = [] if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''): body = "" if 'multipart/alternative' in msg.get('content-type', ''): @@ -432,7 +432,7 @@ class mail_message(osv.osv): if part.get_content_maintype()=='text': content = part.get_payload(decode=True) if filename: - attachments[filename] = content + attachments.append((filename, content)) content = tools.ustr(content, encoding) if part.get_content_subtype() == 'html': msg['body_html'] = content @@ -442,7 +442,7 @@ class mail_message(osv.osv): body = content elif part.get_content_maintype() in ('application', 'image'): if filename : - attachments[filename] = part.get_payload(decode=True) + attachments.append((filename,part.get_payload(decode=True))) else: res = part.get_payload(decode=True) body += tools.ustr(res, encoding) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index fa785c3517c..c8f7da9a5bb 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -201,7 +201,8 @@ class mail_thread(osv.osv): for thread in threads: to_attach = [] - for fname, fcontent in attachments.items(): + for attachment in attachments: + fname, fcontent = attachment if isinstance(fcontent, unicode): fcontent = fcontent.encode('utf-8') data_attach = { diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po index a51b8994cee..f4c85881403 100644 --- a/addons/marketing_campaign/i18n/ru.po +++ b/addons/marketing_campaign/i18n/ru.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-10-10 07:30+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"PO-Revision-Date: 2011-11-07 22:35+0000\n" +"Last-Translator: Stanislav Hanzhin <Unknown>\n" "Language-Team: Russian <ru@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: 2011-11-05 05:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: marketing_campaign @@ -809,7 +809,7 @@ msgstr "" #: selection:marketing.campaign.segment,state:0 #: selection:marketing.campaign.workitem,state:0 msgid "Done" -msgstr "Сделано" +msgstr "Выполнено" #. module: marketing_campaign #: code:addons/marketing_campaign/marketing_campaign.py:209 @@ -861,7 +861,7 @@ msgstr "" #: view:marketing.campaign.workitem:0 #: selection:marketing.campaign.workitem,state:0 msgid "To Do" -msgstr "Задача" +msgstr "Сделать" #. module: marketing_campaign #: view:marketing.campaign.workitem:0 diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py index b97926e564c..d0be223158f 100644 --- a/addons/membership/wizard/membership_invoice.py +++ b/addons/membership/wizard/membership_invoice.py @@ -35,7 +35,7 @@ class membership_invoice(osv.osv_memory): """This function returns value of product's member price based on product id. """ if not product_id: - return {'value': {'unit_price': False}} + return {'value': {'member_price': False}} return {'value': {'member_price': self.pool.get('product.product').price_get(cr, uid, [product_id])[product_id]}} def membership_invoice(self, cr, uid, ids, context=None): @@ -67,4 +67,4 @@ class membership_invoice(osv.osv_memory): membership_invoice() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml index 500885d35f1..dedecf1e9dc 100644 --- a/addons/membership/wizard/membership_invoice_view.xml +++ b/addons/membership/wizard/membership_invoice_view.xml @@ -10,7 +10,7 @@ <form string="Membership Invoice"> <group colspan="4" > <field name="product_id" colspan="4" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/> - <field name="member_price" colspan="4" readonly="1"/> + <field name="member_price" colspan="4" /> </group> <group colspan="4" col="6"> <button icon="gtk-close" special="cancel" string="Close"/> diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po index 36d205ac301..17a13380616 100644 --- a/addons/mrp/i18n/da.po +++ b/addons/mrp/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-22 19:10+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-09 21:53+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 04:53+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: mrp #: field:mrp.production,move_created_ids:0 @@ -74,7 +74,7 @@ msgstr "" #: field:mrp.production,picking_id:0 #: field:mrp.production.order,picking_id:0 msgid "Picking list" -msgstr "" +msgstr "Pluk liste" #. module: mrp #: code:addons/mrp/report/price.py:121 diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po index bfc38acb0ad..f67b9afca9c 100644 --- a/addons/mrp/i18n/pt.po +++ b/addons/mrp/i18n/pt.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-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-12-21 06:10+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"PO-Revision-Date: 2011-11-09 17:38+0000\n" +"Last-Translator: DReis <Unknown>\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-11-05 04:54+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: mrp #: field:mrp.production,move_created_ids:0 @@ -376,7 +376,7 @@ msgstr "Quantidade" #. module: mrp #: field:mrp.production.workcenter.line,hour:0 msgid "Nbr of hours" -msgstr "Número de horas" +msgstr "N.º de horas" #. module: mrp #: view:mrp.production:0 diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 191bd6ec819..aeacf4a71a2 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -465,7 +465,6 @@ class mrp_production(osv.osv): 'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}), 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."), - 'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict", help="This is the internal picking list that brings the finished product to the production plan"), 'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True), @@ -480,6 +479,7 @@ class mrp_production(osv.osv): \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'), 'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True), 'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True), + 'user_id':fields.many2one('res.users', 'Responsible'), 'company_id': fields.many2one('res.company','Company',required=True), } _defaults = { @@ -680,6 +680,17 @@ class mrp_production(osv.osv): res = False return res + def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None): + """ Compute the factor to compute the qty of procucts to produce for the given production_id. By default, + it's always equal to the quantity encoded in the production order or the production wizard, but if the + module mrp_subproduct is installed, then we must use the move_id to identify the product to produce + and its quantity. + :param production_id: ID of the mrp.order + :param move_id: ID of the stock move that needs to be produced. Will be used in mrp_subproduct. + :return: The factor to apply to the quantity that we should produce for the given production order. + """ + return 1 + def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None): """ To produce final product based on production mode (consume/consume&produce). If Production mode is consume, all stock move lines of raw materials will be done/consumed. @@ -693,7 +704,6 @@ class mrp_production(osv.osv): stock_mov_obj = self.pool.get('stock.move') production = self.browse(cr, uid, production_id, context=context) - produced_qty = 0 if production_mode == 'consume_produce': produced_qty = production_qty @@ -748,11 +758,12 @@ class mrp_production(osv.osv): for produce_product in production.move_created_ids: produced_qty = produced_products.get(produce_product.product_id.id, 0) - rest_qty = production.product_qty - produced_qty + subproduct_factor = self._get_subproduct_factor(cr, uid, production.id, produce_product.id, context=context) + rest_qty = (subproduct_factor * production.product_qty) - produced_qty if rest_qty <= production_qty: production_qty = rest_qty if rest_qty > 0 : - stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, context=context) + stock_mov_obj.action_consume(cr, uid, [produce_product.id], (subproduct_factor * production_qty), context=context) for raw_product in production.move_lines2: new_parent_ids = [] diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index cec6fd42687..13ac6287e52 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -777,6 +777,7 @@ <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/> </page> <page string="Extra Information"> + <field name="user_id"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="priority" groups="base.group_extended"/> <newline/> diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py index 69fc3a9dd7d..dc9a235ff63 100644 --- a/addons/mrp/wizard/mrp_product_produce.py +++ b/addons/mrp/wizard/mrp_product_produce.py @@ -49,8 +49,9 @@ class mrp_product_produce(osv.osv_memory): context['active_id'], context=context) done = 0.0 for move in prod.move_created_ids2: - if not move.scrapped: - done += move.product_qty + if move.product_id == prod.product_id: + if not move.scrapped: + done += move.product_qty return (prod.product_qty - done) or prod.product_qty _defaults = { diff --git a/addons/mrp_jit/i18n/da.po b/addons/mrp_jit/i18n/da.po index b501c281dfd..e7887542f67 100644 --- a/addons/mrp_jit/i18n/da.po +++ b/addons/mrp_jit/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2009-11-17 07:31+0000\n" -"Last-Translator: SmartWi <kurt@smartwi.net>\n" +"PO-Revision-Date: 2011-11-08 11:44+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:40+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: mrp_jit #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information msgid "MRP JIT" -msgstr "MRP JIT" +msgstr "MRP Just In Time" #. module: mrp_jit #: model:ir.module.module,description:mrp_jit.module_meta_information diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index a9cf0cbb718..45b6ffd9be9 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -48,8 +48,10 @@ <search string="Search"> <group> <filter icon="terp-go-year" string="Year" + name="year" domain="[('year','=',time.strftime('%%Y'))]" help="Work orders made during current year"/> + <separator orientation="vertical"/> <filter icon="terp-go-month" string="Month" name="month" domain="[('month','=',time.strftime('%%m'))]" @@ -91,7 +93,7 @@ <field name="view_mode">graph,tree</field> <field name="view_id" ref="view_report_mrp_workorder_tree"/> <field name="search_view_id" ref="view_report_mrp_workorder_filter"/> - <field name="context">{'search_default_Workcenter': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field> + <field name="context">{'search_default_Workcenter': 1,'search_default_year':1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field> </record> <record model="ir.actions.act_window.view" id="action_report_mrp_workorder_tree"> diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_subproduct/i18n/pt.po index 0aef00a5ab0..8ec1ced1ec6 100644 --- a/addons/mrp_subproduct/i18n/pt.po +++ b/addons/mrp_subproduct/i18n/pt.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-01-03 16:58+0000\n" -"PO-Revision-Date: 2010-12-09 08:35+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"PO-Revision-Date: 2011-11-09 17:33+0000\n" +"Last-Translator: DReis <Unknown>\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-11-05 05:38+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: mrp_subproduct #: field:mrp.subproduct,product_id:0 @@ -97,7 +97,7 @@ msgstr "UOM" #. module: mrp_subproduct #: constraint:mrp.bom:0 msgid "Error ! You can not create recursive BoM." -msgstr "" +msgstr "Erro! Não pode criar BoM's recursivos." #. module: mrp_subproduct #: view:mrp.bom:0 diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 130411987c1..bb3b6789574 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -29,11 +29,14 @@ class mrp_subproduct(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True), 'product_qty': fields.float('Product Qty', required=True), 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), - 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True), + 'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of subproducts will be set on the production orders using this BoM.\ + 'Fixed' depicts a situation where the quantity of created subproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\ + By opposition, 'Variable' means that the quantity will be computed as\ + '(quantity of subproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"), 'bom_id': fields.many2one('mrp.bom', 'BoM'), } _defaults={ - 'subproduct_type': lambda *args: 'fixed' + 'subproduct_type': 'variable', } def onchange_product_id(self, cr, uid, ids, product_id, context=None): @@ -97,5 +100,27 @@ class mrp_production(osv.osv): self.pool.get('stock.move').create(cr, uid, data) return picking_id + def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None): + """Compute the factor to compute the qty of procucts to produce for the given production_id. By default, + it's always equal to the quantity encoded in the production order or the production wizard, but with + the module mrp_subproduct installed it can differ for subproducts having type 'variable'. + :param production_id: ID of the mrp.order + :param move_id: ID of the stock move that needs to be produced. Identify the product to produce. + :return: The factor to apply to the quantity that we should produce for the given production order and stock move. + """ + sub_obj = self.pool.get('mrp.subproduct') + move_obj = self.pool.get('stock.move') + production_obj = self.pool.get('mrp.production') + production_browse = production_obj.browse(cr, uid, production_id, context=context) + move_browse = move_obj.browse(cr, uid, move_id, context=context) + subproduct_factor = 1 + sub_id = sub_obj.search(cr, uid,[('product_id', '=', move_browse.product_id.id),('bom_id', '=', production_browse.bom_id.id), ('subproduct_type', '=', 'variable')], context=context) + if sub_id: + subproduct_record = sub_obj.browse(cr ,uid, sub_id[0], context=context) + if subproduct_record.bom_id.product_qty: + subproduct_factor = subproduct_record.product_qty / subproduct_record.bom_id.product_qty + return subproduct_factor + return super(mrp_production, self)._get_subproduct_factor(cr, uid, production_id, move_id, context=context) + mrp_production() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index 5248a26f4f9..063ee9b8544 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -548,52 +548,6 @@ <record id="project.project_task_190" model="project.task"> <field name="company_id" ref="res_company_oerp_us"/> </record> - <record id="project.project_task_192" model="project.task"> - <field name="company_id" ref="res_company_oerp_us"/> - </record> - <record id="project.project_task_193" model="project.task"> - <field name="company_id" ref="res_company_oerp_us"/> - </record> - <record id="project.project_task_194" model="project.task"> - <field name="company_id" ref="res_company_oerp_be"/> - </record> - <record id="project.project_task_195" model="project.task"> - <field name="company_id" ref="res_company_oerp_in"/> - </record> - <record id="project.project_task_196" model="project.task"> - <field name="company_id" ref="res_company_oerp_be"/> - </record> - <record id="project.project_task_197" model="project.task"> - <field name="company_id" ref="res_company_oerp_us"/> - </record> - <record id="project.project_task_198" model="project.task"> - <field name="company_id" ref="res_company_oerp_us"/> - </record> - <record id="project.project_task_199" model="project.task"> - <field name="company_id" ref="res_company_oerp_be"/> - </record> - <record id="project.project_task_200" model="project.task"> - <field name="company_id" ref="res_company_oerp_be"/> - </record> - <record id="project.project_task_201" model="project.task"> - <field name="company_id" ref="res_company_oerp_in"/> - </record> - <record id="project.project_task_202" model="project.task"> - <field name="company_id" ref="res_company_oerp_be"/> - </record> - <record id="project.project_task_203" model="project.task"> - <field name="company_id" ref="res_company_oerp_be"/> - </record> - <record id="project.project_task_204" model="project.task"> - <field name="company_id" ref="res_company_oerp_us"/> - </record> - <record id="project.project_task_205" model="project.task"> - <field name="company_id" ref="res_company_oerp_be"/> - </record> - <record id="project.project_task_206" model="project.task"> - <field name="company_id" ref="res_company_oerp_be"/> - </record> - <!-- diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 9bbeb558375..1abf8f0ebfa 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -22,5 +22,8 @@ Lets the company customize which Pad installation should be used to link to new 'web': True, 'certificate' : '001183545978470526509', 'js': ['static/src/js/pad.js'], + 'qweb' : [ + "static/src/xml/*.xml", + ], 'images': ['static/src/img/pad_link_companies.jpeg'], } diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js index d6f2c1de26b..acc91f2273e 100644 --- a/addons/pad/static/src/js/pad.js +++ b/addons/pad/static/src/js/pad.js @@ -1,8 +1,5 @@ openerp.pad = function(instance) { -var QWeb = instance.web.qweb; -QWeb.add_template('/pad/static/src/xml/pad.xml'); - instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({ on_attachments_loaded: function(attachments) { this._super(attachments); diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index 41fe2c3b4d6..ab6e9f73df4 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -86,7 +86,7 @@ <field name="name">Point of Sale Analysis</field> <field name="res_model">report.pos.order</field> <field name="view_type">form</field> - <field name="view_mode">tree,graph</field> + <field name="view_mode">tree</field> <field name="search_view_id" ref="view_report_pos_order_search"/> <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field> </record> diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 086bc38cf65..59c13e0553c 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -421,12 +421,12 @@ openerp.point_of_sale = function(db) { Shop.__super__.constructor.apply(this, arguments); } - Shop.prototype.defaults = { - orders: new OrderCollection, - products: new ProductCollection - }; Shop.prototype.initialize = function() { this.set({ + orders: new OrderCollection(), + products: new ProductCollection() + }); + this.set({ cashRegisters: new CashRegisterCollection(pos.store.get('account.bank.statement')), }); return (this.get('orders')).bind('remove', __bind( function(removedOrder) { @@ -751,6 +751,10 @@ openerp.point_of_sale = function(db) { function CategoryView() { CategoryView.__super__.constructor.apply(this, arguments); } + + CategoryView.prototype.events = { + 'click .oe-pos-categories-list a': 'changeCategory' + }; CategoryView.prototype.template = qweb_template('pos-category-template'); CategoryView.prototype.render = function(ancestors, children) { @@ -776,6 +780,10 @@ openerp.point_of_sale = function(db) { })() })); }; + CategoryView.prototype.changeCategory = function(a) { + var id = $(a.target).data("category-id"); + this.trigger("changeCategory", id); + }; return CategoryView; })(); ProductView = (function() { @@ -1131,22 +1139,20 @@ openerp.point_of_sale = function(db) { return ShopView; })(); App = (function() { - __extends(App, Backbone.Router); - function App() { - App.__super__.constructor.apply(this, arguments); + function App($element) { + this.initialize($element); } - App.prototype.routes = { - '': 'category', - 'category/:id': 'category' - }; App.prototype.initialize = function($element) { this.shop = new Shop; this.shopView = new ShopView({ shop: this.shop, el: $element }); - return this.categoryView = new CategoryView; + this.categoryView = new CategoryView; + this.categoryView.bind("changeCategory", this.category, this); + this.category(); + return this.categoryView; }; App.prototype.category = function(id) { var c, products; @@ -1155,6 +1161,7 @@ openerp.point_of_sale = function(db) { } c = pos.categories[id]; $('#products-screen').html(this.categoryView.render(c.ancestors, c.children)); + this.categoryView.delegateEvents(); products = pos.store.get('product.product').filter( function(p) { var _ref; return _ref = p.pos_categ_id[0], __indexOf.call(c.subtree, _ref) >= 0; @@ -1188,14 +1195,13 @@ openerp.point_of_sale = function(db) { db.point_of_sale.PointOfSale = db.web.Widget.extend({ template: "PointOfSale", start: function() { - // FIXME: absolutely horrible hack to avoid conflict - // between backbone's history and al's action - // thingie - window.location.hash = ''; var self = this; + this.$element.find("#loggedas button").click(function() { + self.stop(); + }); if (pos) - throw "It is not possible to instantiate multiple instances"+ + throw "It is not possible to instantiate multiple instances "+ "of the point of sale at the same time."; pos = new Pos(this.session); @@ -1203,7 +1209,6 @@ openerp.point_of_sale = function(db) { return pos.ready.then( function() { pos.app = new App(self.$element); - return Backbone.history.start(); }); }, stop: function() { diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 32994b01c98..b9148395cbe 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -24,6 +24,9 @@ <ol id="orders"></ol> </div> </div> + <div id="loggedas"> + <button>Back</button> + </div> </div> <div id="content"> @@ -140,15 +143,15 @@ <t t-name="pos-category-template"> <header> <ol class="breadcrumb"> - <li> - <a href="#"> + <li class="oe-pos-categories-list"> + <a href="javascript:void(0)"> <img src="/point_of_sale/static/src/img/home.png" class="homeimg" /> </a> </li> <t t-foreach="breadcrumb" t-as="category"> - <li> + <li class="oe-pos-categories-list"> <img src="/point_of_sale/static/src/img/bc-arrow.png" class="bc-arrow" /> - <a t-att-href="'#category/' + category.id"> + <a href="javascript:void(0)" t-att-data-category-id="category.id"> <t t-esc="category.name"/> </a> </li> @@ -163,8 +166,8 @@ <h4>Categories:</h4> <ol> <t t-foreach="categories" t-as="category"> - <li> - <a t-att-href="'#category/' + category.id" class="button"> + <li class="oe-pos-categories-list"> + <a href="javascript:void(0)" t-att-data-category-id="category.id" class="button"> <t t-esc="category.name"/> </a> </li> diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py index 0b417d8b1cf..0c48aff736f 100644 --- a/addons/point_of_sale/wizard/pos_box_entries.py +++ b/addons/point_of_sale/wizard/pos_box_entries.py @@ -96,11 +96,11 @@ class pos_box_entries(osv.osv_memory): for data in self.read(cr, uid, ids, context=context): vals = {} curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id - statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context) + statement_id = statement_obj.search(cr, uid, [('journal_id', '=', int(data['journal_id'])), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context) if not statement_id: raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox')) - acc_id = product_obj.browse(cr, uid, data['product_id']).property_account_income + acc_id = product_obj.browse(cr, uid, int(data['product_id'])).property_account_income if not acc_id: raise osv.except_osv(_('Error !'), _('Please check that income account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name)) if statement_id: diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml index 433078263c1..a8df2e0b142 100644 --- a/addons/procurement/stock_orderpoint.xml +++ b/addons/procurement/stock_orderpoint.xml @@ -7,7 +7,7 @@ <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint"> <field name="product_max_qty">20.0</field> <field name="product_min_qty">5.0</field> - <field model="product.uom" name="product_uom" search="[]"/> + <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> <field model="product.product" name="product_id" ref="product.product_product_mb1"/> <field name="location_id" ref="stock.stock_location_stock"/> @@ -15,7 +15,7 @@ <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint"> <field name="product_max_qty">50.0</field> <field name="product_min_qty">10.0</field> - <field model="product.uom" name="product_uom" search="[]"/> + <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> <field model="product.product" name="product_id" ref="product.product_product_cpu1"/> <field name="location_id" ref="stock.stock_location_stock"/> @@ -23,7 +23,7 @@ <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint"> <field name="product_max_qty">20.0</field> <field name="product_min_qty">10.0</field> - <field model="product.uom" name="product_uom" search="[]"/> + <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> <field model="product.product" name="product_id" ref="product.product_product_hdd1"/> <field name="location_id" ref="stock.stock_location_stock"/> @@ -31,7 +31,7 @@ <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint"> <field name="product_max_qty">50.0</field> <field name="product_min_qty">10.0</field> - <field model="product.uom" name="product_uom" search="[]"/> + <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> <field model="product.product" name="product_id" ref="product.product_product_fan"/> <field name="location_id" ref="stock.stock_location_stock"/> @@ -39,7 +39,7 @@ <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint"> <field name="product_max_qty">5.0</field> <field name="product_min_qty">3.0</field> - <field model="product.uom" name="product_uom" search="[]"/> + <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> <field model="product.product" name="product_id" ref="product.product_product_pc1"/> <field name="location_id" ref="stock.stock_location_stock"/> @@ -47,7 +47,7 @@ <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint"> <field name="product_max_qty">50.0</field> <field name="product_min_qty">10.0</field> - <field model="product.uom" name="product_uom" search="[]"/> + <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/> <field model="stock.warehouse" name="warehouse_id" search="[]"/> <field model="product.product" name="product_id" ref="product.product_product_tow1"/> <field name="location_id" ref="stock.stock_location_stock"/> diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml index 79e6773980c..2f8982a1faf 100644 --- a/addons/product/pricelist_view.xml +++ b/addons/product/pricelist_view.xml @@ -165,6 +165,19 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="search_view_id" ref="product_pricelist_view_search" /> + <field name="context">{"search_default_type":"sale"}</field> + <field name="domain">[('type','=','sale')]</field> + <field name="help">A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80.</field> + </record> + <record id="product_pricelist_action_for_purchase" model="ir.actions.act_window"> + <field name="name">Pricelists</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">product.pricelist</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="search_view_id" ref="product_pricelist_view_search" /> + <field name="context">{"search_default_type":"purchase"}</field> + <field name="domain">[('type','=','purchase')]</field> <field name="help">A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80.</field> </record> <menuitem diff --git a/addons/product/product.py b/addons/product/product.py index 7e7f7375e87..0e1b2048ea7 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -93,6 +93,7 @@ class product_uom(osv.osv): del(data['factor_inv']) return super(product_uom, self).create(cr, uid, data, context) + _order = "name" _columns = { 'name': fields.char('Name', size=64, required=True, translate=True), 'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade', diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py index ebf3b97bc0a..bd1ad693a93 100644 --- a/addons/product_expiry/__openerp__.py +++ b/addons/product_expiry/__openerp__.py @@ -21,7 +21,7 @@ "name" : "Products Expiry Date", "version" : "1.0", "author" : "OpenERP SA", - "category" : "Vertical Applications", + "category" : "Specific Industry Applications", 'complexity': "easy", "depends" : ["stock"], "init_xml" : [], diff --git a/addons/product_visible_discount/i18n/da.po b/addons/product_visible_discount/i18n/da.po new file mode 100644 index 00000000000..92f78c208b1 --- /dev/null +++ b/addons/product_visible_discount/i18n/da.po @@ -0,0 +1,81 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-08 11:47+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:147 +#, python-format +msgid "No Purchase Pricelist Found !" +msgstr "Kunne ikke finde indkøbsprisliste!" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:155 +#, python-format +msgid "No Sale Pricelist Found " +msgstr "Kunne ikke finde salgsprisliste! " + +#. module: product_visible_discount +#: model:ir.module.module,description:product_visible_discount.module_meta_information +msgid "" +"\n" +" This module lets you calculate discounts on Sale Order lines and Invoice " +"lines base on the partner's pricelist.\n" +" To this end, a new check box named \"Visible Discount\" is added to the " +"pricelist form.\n" +" Example:\n" +" For the product PC1 and the partner \"Asustek\": if listprice=450, " +"and the price calculated using Asustek's pricelist is 225\n" +" If the check box is checked, we will have on the sale order line: " +"Unit price=450, Discount=50,00, Net price=225\n" +" If the check box is unchecked, we will have on Sale Order and " +"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n" +" " +msgstr "" + +#. module: product_visible_discount +#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information +#: field:product.pricelist,visible_discount:0 +msgid "Visible Discount" +msgstr "Synlig rabat" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_account_invoice_line +msgid "Invoice Line" +msgstr "Fakturalinie" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:155 +#, python-format +msgid "You must first define a pricelist for Customer !" +msgstr "Man skal først definere en prisliste til kunden!" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_product_pricelist +msgid "Pricelist" +msgstr "Prisliste" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:147 +#, python-format +msgid "You must first define a pricelist for Supplier !" +msgstr "Man skal først definere en prisliste til leverandøren!" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_sale_order_line +msgid "Sales Order Line" +msgstr "Salgsordrelinie" diff --git a/addons/project/project.py b/addons/project/project.py index 2c647825408..791d8c902df 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -431,9 +431,10 @@ class task(osv.osv): 'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority'), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."), 'type_id': fields.many2one('project.task.type', 'Stage'), - 'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('ready', 'Ready'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True, + 'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True, help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\ \n If the task is over, the states is set to \'Done\'.'), + 'kanban_state': fields.selection([('blocked', 'Blocked'),('normal', 'Normal'),('done', 'Done')], 'Kanban State', readonly=True, required=False), 'create_date': fields.datetime('Create Date', readonly=True,select=True), 'date_start': fields.datetime('Starting Date',select=True), 'date_end': fields.datetime('Ending Date',select=True), @@ -477,6 +478,7 @@ class task(osv.osv): _defaults = { 'state': 'draft', + 'kanban_state': 'normal', 'priority': '2', 'progress': 0, 'sequence': 10, @@ -706,10 +708,6 @@ class task(osv.osv): self.log(cr, uid, t.id, message) return True - def do_ready(self, cr, uid, ids, context={}): - self.write(cr, uid, ids, {'state': 'ready'}, context=context) - return True - def do_draft(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state': 'draft'}, context=context) return True @@ -753,22 +751,31 @@ class task(osv.osv): self.log(cr, uid, id, message) return True - def set_remaining_hours_1(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'remaining_hours': 8.0}, context=context) + def set_remaining_time_1(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'remaining_hours': 1.0}, context=context) return True - def set_remaining_hours_2(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'remaining_hours': 2 * 8.0}, context=context) + def set_remaining_time_2(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'remaining_hours': 2.0}, context=context) return True - def set_remaining_hours_5(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'remaining_hours': 5 * 8.0}, context=context) + def set_remaining_time_5(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'remaining_hours': 5.0}, context=context) return True - def set_remaining_hours_10(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'remaining_hours': 10 * 8.0}, context=context) + def set_remaining_time_10(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'remaining_hours': 10.0}, context=context) return True + def set_kanban_state_blocked(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context) + + def set_kanban_state_normal(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context) + + def set_kanban_state_done(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context) + def _change_type(self, cr, uid, ids, next, *args): """ go to the next stage diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index 999d16c07cc..f752c72c992 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -76,6 +76,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Prepare Requirements Document</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_2" model="project.task"> @@ -84,6 +85,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Make SRS</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_3" model="project.task"> @@ -92,6 +94,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Design Use Cases</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_4" model="project.task"> @@ -100,6 +103,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Budget Planning</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_5" model="project.task"> @@ -108,6 +112,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Quality Planning</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_6" model="project.task"> @@ -116,6 +121,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Risk Management Planning</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_7" model="project.task"> @@ -124,6 +130,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Create Project Schedules</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_8" model="project.task"> @@ -132,6 +139,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Dataflow Design</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_9" model="project.task"> @@ -140,6 +148,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">User Interface Design</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_10" model="project.task"> @@ -148,6 +157,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Develop Module in Sale Management</field> + <field name="type_id" ref="project_tt_development"/> </record> <record id="project_task_11" model="project.task"> @@ -156,6 +166,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Develop module in Warehouse</field> + <field name="type_id" ref="project_tt_development"/> </record> <record id="project_task_12" model="project.task"> @@ -164,6 +175,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Integrate Modules</field> + <field name="type_id" ref="project_tt_development"/> </record> <record id="project_task_13" model="project.task"> @@ -172,6 +184,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Unit Testing</field> + <field name="type_id" ref="project_tt_testing"/> </record> <record id="project_task_14" model="project.task"> @@ -180,6 +193,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Regression Test</field> + <field name="type_id" ref="project_tt_testing"/> </record> <record id="project_task_15" model="project.task"> @@ -188,6 +202,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Documentation</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_16" model="project.task"> @@ -197,6 +212,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Performance Tuning</field> + <field name="type_id" ref="project_tt_merge"/> </record> <record id="project_task_17" model="project.task"> @@ -205,6 +221,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Deploy and Review on Customer System</field> + <field name="type_id" ref="project_tt_merge"/> </record> <record id="project_task_18" model="project.task"> @@ -213,6 +230,7 @@ <field name="priority">2</field> <field name="project_id" ref="project.project_integrate_openerp"/> <field name="name">Training and Presentation</field> + <field name="type_id" ref="project_tt_merge"/> </record> <!-- @@ -321,6 +339,7 @@ <field model="res.users" name="user_id" search="[('login','=','demo')]"/> <field name="project_id" ref="project_project_23"/> <field name="name">Parameters</field> + <field name="type_id" ref="project_tt_specification"/> </record> <record id="project_task_190" model="project.task"> <field name="sequence">20</field> @@ -330,130 +349,7 @@ <field name="state">open</field> <field name="project_id" ref="project_project_21"/> <field name="name">Start of the doc redaction + MRP</field> - </record> - <record id="project_task_192" model="project.task"> - <field name="sequence">25</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_21"/> - <field name="state">done</field> - <field name="name">MRP Tests</field> - </record> - <record id="project_task_193" model="project.task"> - <field name="sequence">29</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project_project_21"/> - <field name="name">MRP; functional layer</field> - <field name="state">done</field> - </record> - <record id="project_task_194" model="project.task"> - <field name="sequence">30</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_22"/> - <field name="name">Products Adaptation</field> - </record> - <record id="project_task_195" model="project.task"> - <field name="sequence">30</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_23"/> - <field name="name">Install + Super User Training</field> - </record> - <record id="project_task_196" model="project.task"> - <field name="sequence">30</field> - <field name="planned_hours">32.0</field> - <field name="remaining_hours">32.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_22"/> - <field name="name">Customer doc</field> - </record> - <record id="project_task_197" model="project.task"> - <field name="sequence">30</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_21"/> - <field name="name">Development of the presentation layer</field> - </record> - <record id="project_task_198" model="project.task"> - <field name="sequence">40</field> - <field name="planned_hours">32.0</field> - <field name="remaining_hours">32.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_21"/> - <field name="name">Free Time</field> - </record> - <record id="project_task_199" model="project.task"> - <field name="sequence">40</field> - <field name="planned_hours">50.0</field> - <field name="remaining_hours">50.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_22"/> - <field name="name">Specific tests</field> - </record> - <record id="project_task_200" model="project.task"> - <field name="sequence">40</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_22"/> - <field name="name">Sale module</field> - </record> - <record id="project_task_201" model="project.task"> - <field name="sequence">40</field> - <field name="planned_hours">32.0</field> - <field name="remaining_hours">32.0</field> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project_project_23"/> - <field name="state">open</field> - <field name="name">In house training</field> - </record> - <record id="project_task_202" model="project.task"> - <field name="sequence">50</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project_project_22"/> - <field name="state">open</field> - <field name="name">Validation + latest modifications.</field> - </record> - <record id="project_task_203" model="project.task"> - <field name="sequence">50</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_22"/> - <field name="name">Adaptations buy module</field> - </record> - <record id="project_task_204" model="project.task"> - <field name="sequence">60</field> - <field name="planned_hours">16.0</field> - <field name="remaining_hours">16.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_21"/> - <field name="name">Presentation of the software.</field> - </record> - <record id="project_task_205" model="project.task"> - <field name="sequence">60</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_22"/> - <field name="name">Adaptations Stock module</field> - </record> - <record id="project_task_206" model="project.task"> - <field name="sequence">70</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field model="res.users" name="user_id" search="[('login','=','demo')]"/> - <field name="project_id" ref="project_project_22"/> - <field name="name">Latest in house tests</field> + <field name="type_id" ref="project_tt_specification"/> </record> </data> </openerp> diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml index 1dd8965fe76..338040df5e2 100644 --- a/addons/project/project_installer.xml +++ b/addons/project/project_installer.xml @@ -21,21 +21,6 @@ <field name="category_id" ref="category_project_config" /> </record> - <record id="action_configure_default_time_unit" model="ir.actions.act_window"> - <field name="name">Setup your Project's Time Unit</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">res.company</field> - <field name="view_id" ref="base.view_company_form" /> - <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="context">{'res_id' : user.company_id.id}</field> - </record> - <record id="config_wizard_action_configure_default_time_unit" model="ir.actions.todo"> - <field name="action_id" ref="action_configure_default_time_unit" /> - <field name="category_id" ref="category_project_config" /> - <field name="type">once</field> - </record> - <record id="action_review_task_stage" model="ir.actions.act_window"> <field name="name">Review Task Stages</field> <field name="type">ir.actions.act_window</field> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index da35d9ae52d..4c4d4b668b1 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -175,7 +175,6 @@ <field name="context">{'search_default_Current':1}</field> <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field> </record> - <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_definitions" sequence="1"/> <record id="open_view_template_project" model="ir.actions.act_window"> <field name="name">Templates of Projects</field> @@ -244,7 +243,7 @@ </group> <group col="3" colspan="2"> <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/> - <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,ready,pending" icon="gtk-edit"/> + <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/> </group> <field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/> @@ -259,13 +258,13 @@ <newline/> <group col="11" colspan="4"> <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/> - <button name="do_cancel" states="draft,open,ready,pending" string="Cancel" type="object" icon="gtk-cancel"/> - <button name="do_draft" states="open,ready" string="Draft" type="object" icon="gtk-indent"/> + <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/> + <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/> <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/> <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" /> - <button name="do_pending" states="open,ready" string="Pending" type="object" icon="gtk-media-pause"/> - <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,ready,draft" string="Delegate" type="action" icon="gtk-sort-descending"/> - <button name="action_close" states="pending,open,ready" string="Done" type="object" icon="terp-dialog-close"/> + <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/> + <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending"/> + <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/> </group> </page> <page groups="base.group_extended" string="Delegations History"> @@ -329,12 +328,14 @@ <field name="description"/> <field name="sequence"/> <field name="state"/> + <field name="kanban_state"/> <field name="project_id"/> - <field name="remaining_hours" sum="Remaining Time"/> <templates> <t t-name="kanban-box"> <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.underscored(_.trim(record.name.raw_value))"/></t> - <div t-att-class="kanban_color(record.color.raw_value) + (record.state.raw_value === 'pending' ? ' oe_kanban_color_alert' : '') + (record.state.raw_value === 'ready' ? ' oe_kanban_color_green' : '')"> + <t t-if="record.kanban_state.raw_value === 'blocked'" t-set="border">oe_kanban_color_red</t> + <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t> + <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}"> <div class="oe_kanban_box oe_kanban_color_border"> <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle"> <tr> @@ -354,13 +355,13 @@ </div> <div> <i t-if="record.date_deadline.raw_value"><field name="date_deadline"/> ,</i> - <field name="remaining_hours"/> - <b> - <a name="set_remaining_hours_1" string="Set 1 day" type="object"> [1d]</a> - <a name="set_remaining_hours_2" string="Set 2 day" type="object"> [2d]</a> - <a name="set_remaining_hours_5" string="Set 5 day" type="object"> [5d]</a> - <a name="set_remaining_hours_10" string="Set 10 day" type="object"> [10d]</a> - </b> + <field name="remaining_hours" sum="Remaining Time"/> + <t t-set="style_bold">font-weight: bold</t> + <t t-set="hours" t-value="record.remaining_hours.raw_value"/> + <a name="set_remaining_time_1" type="object" t-att-style="(hours gte 1 and hours lt 2) ? style_bold : undefined"> [1]</a> + <a name="set_remaining_time_2" type="object" t-att-style="(hours gte 2 and hours lt 5) ? style_bold : undefined"> [2]</a> + <a name="set_remaining_time_5" type="object" t-att-style="(hours gte 5 and hours lt 10) ? style_bold : undefined"> [5]</a> + <a name="set_remaining_time_10" type="object" t-att-style="hours gte 10 ? style_bold : undefined"> [10]</a> </div> <br class="oe_kanban_clear"/> </div> @@ -370,10 +371,9 @@ <a string="Change Color" icon="color-picker" type="color" name="color"/> </div> <div class="oe_kanban_right"> - <a name="do_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/> - <a name="do_open" string="Start Task" states="pending,ready" type="object" icon="gtk-media-play"/> - <a name="do_ready" string="Ready" states="draft,open" type="object" icon="gtk-go-forward"/> - <a name="action_close" string="Done" states="draft,open,ready" type="object" icon="gtk-apply"/> + <a name="set_kanban_state_blocked" string="Block" kanban_states="normal,done" type="object" icon="gtk-media-pause"/> + <a name="set_kanban_state_normal" string="Normal" kanban_states="blocked,done" type="object" icon="gtk-media-play"/> + <a name="set_kanban_state_done" string="Done" kanban_states="blocked,normal" type="object" icon="gtk-apply"/> </div> <br class="oe_kanban_clear"/> </div> @@ -514,7 +514,7 @@ <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field> <field eval="False" name="filter"/> <field name="view_id" ref="view_task_tree2"/> - <field name="context">{"search_default_draft": 1, "search_default_open":1 }</field> + <field name="context">{"search_default_draft": 1, "search_default_open":1}</field> <field name="search_view_id" ref="view_task_search_form"/> <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field> </record> @@ -603,7 +603,11 @@ </record> <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/> - <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/> + + <menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/> + + <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/> + <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1"/> <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/> diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py index 8d03112ed04..a9a1aecd0c5 100644 --- a/addons/project_gtd/__openerp__.py +++ b/addons/project_gtd/__openerp__.py @@ -21,7 +21,7 @@ { - 'name': 'Methodology: Getting Things Done', + 'name': 'Todo List based on the Getting Things Done methodology', 'version': '1.0', 'category': 'Project Management', 'complexity': "easy", @@ -29,8 +29,12 @@ This module implements all concepts defined by the Getting Things Done methodology. =================================================================================== -This world-wide used methodology is used for personal -time management improvement. +This module implements a simple personnal Todo list based on tasks. It adds in +the project application an editable list of tasks simplified to the minimum +required fields. + +The todo list is based on the GTD methodology. This world-wide used methodology +is used for personal time management improvement. Getting Things Done (commonly abbreviated as GTD) is an action management method created by David Allen, and described in a book of the same name. diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml index 2780cd0f8d0..659b0fe9cb2 100644 --- a/addons/project_gtd/project_gtd_data.xml +++ b/addons/project_gtd/project_gtd_data.xml @@ -1,5 +1,31 @@ <?xml version="1.0" ?> <openerp> <data> + <record model="project.gtd.context" id="context_office"> + <field name="name">Office</field> + <field name="sequence">0</field> + </record> + <record model="project.gtd.context" id="context_travel"> + <field name="name">Travel</field> + <field name="sequence">2</field> + </record> + + <record model="project.gtd.timebox" id="timebox_daily"> + <field name="name">Today</field> + <field name="icon">terp-go-today</field> + </record> + <record model="project.gtd.timebox" id="timebox_weekly"> + <field name="name">This Week</field> + <field name="icon">terp-go-week</field> + </record> + <record model="project.gtd.timebox" id="timebox_monthly"> + <field name="name">This Month</field> + <field name="icon">terp-go-month</field> + </record> + <record model="project.gtd.timebox" id="timebox_lt"> + <field name="name">Long Term</field> + <field name="icon">terp-project</field> + </record> + </data> </openerp> diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml index a2d3cf65923..00ba897c4e2 100644 --- a/addons/project_gtd/project_gtd_demo.xml +++ b/addons/project_gtd/project_gtd_demo.xml @@ -2,105 +2,34 @@ <openerp> <data> - <record model="project.gtd.context" id="context_office"> - <field name="name">Office</field> - <field name="sequence">0</field> - </record> - <record model="project.gtd.context" id="context_travel"> - <field name="name">Travel</field> - <field name="sequence">2</field> - </record> - <record model="project.gtd.context" id="context_car"> - <field name="name">Car</field> - <field name="sequence">1</field> - </record> <record model="project.gtd.context" id="context_home"> <field name="name">Home</field> <field name="sequence">3</field> </record> - - <record model="project.gtd.timebox" id="timebox_daily"> - <field name="name">Today</field> - <field name="icon">terp-go-today</field> - </record> - <record model="project.gtd.timebox" id="timebox_weekly"> - <field name="name">This Week</field> - <field name="icon">terp-go-week</field> - </record> - <record model="project.gtd.timebox" id="timebox_monthly"> - <field name="name">This Month</field> - <field name="icon">terp-go-month</field> - </record> - <record model="project.gtd.timebox" id="timebox_lt"> - <field name="name">Long Term</field> - <field name="icon">terp-project</field> + <record model="project.gtd.context" id="context_car"> + <field name="name">Car</field> + <field name="sequence">1</field> </record> - <record id="project.project_task_116" model="project.task"> - <field name="planned_hours">38.0</field> - <field name="remaining_hours">38.0</field> + <record id="project.project_task_10" model="project.task"> <field name="timebox_id" ref="timebox_daily"/> <field name="context_id" ref="context_office"/> - <field name="type_id" ref="project.project_tt_development"/> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project.project_project_22"/> - <field name="name">Specific adaptation to MRP</field> </record> - <record id="project.project_task_201" model="project.task"> - <field name="sequence">40</field> - <field name="planned_hours">32.0</field> - <field name="remaining_hours">32.0</field> - <field name="timebox_id" ref="timebox_monthly"/> - <field name="context_id" ref="context_home"/> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project.project_project_23"/> - <field name="name">In house training</field> - </record> - - <record id="project.project_task_202" model="project.task"> - <field name="sequence">50</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field name="timebox_id" ref="timebox_weekly"/> - <field name="context_id" ref="context_office"/> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project.project_project_22"/> - <field name="name">Validation + latest modifications.</field> - </record> - - <record id="project.project_task_116" model="project.task"> - <field name="planned_hours">38.0</field> - <field name="remaining_hours">38.0</field> + <record id="project.project_task_11" model="project.task"> <field name="timebox_id" ref="timebox_daily"/> <field name="context_id" ref="context_office"/> - <field name="type_id" ref="project.project_tt_development"/> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project.project_project_22"/> - <field name="name">Specific adaptation to MRP</field> </record> - <record id="project.project_task_201" model="project.task"> - <field name="sequence">40</field> - <field name="planned_hours">32.0</field> - <field name="remaining_hours">32.0</field> - <field name="timebox_id" ref="timebox_monthly"/> - <field name="context_id" ref="context_home"/> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project.project_project_23"/> - <field name="name">In house training</field> - </record> + <record id="project.project_task_12" model="project.task"> + <field name="timebox_id" ref="timebox_daily"/> + <field name="context_id" ref="context_car"/> + </record> - <record id="project.project_task_202" model="project.task"> - <field name="sequence">50</field> - <field name="planned_hours">24.0</field> - <field name="remaining_hours">24.0</field> - <field name="timebox_id" ref="timebox_weekly"/> - <field name="context_id" ref="context_office"/> - <field name="user_id" ref="base.user_root"/> - <field name="project_id" ref="project.project_project_22"/> - <field name="name">Validation + latest modifications.</field> - </record> + <record id="project.project_task_13" model="project.task"> + <field name="timebox_id" ref="timebox_daily"/> + <field name="context_id" ref="context_car"/> + </record> </data> </openerp> diff --git a/addons/project_issue/i18n/ru.po b/addons/project_issue/i18n/ru.po new file mode 100644 index 00000000000..5c1528e4c92 --- /dev/null +++ b/addons/project_issue/i18n/ru.po @@ -0,0 +1,967 @@ +# Russian translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-07 22:20+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Russian <ru@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: 2011-11-08 05:49+0000\n" +"X-Generator: Launchpad (build 14231)\n" + +#. module: project_issue +#: field:project.issue.report,delay_open:0 +msgid "Avg. Delay to Open" +msgstr "Средняя задержка при Открытии" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +msgid "Group By..." +msgstr "Группировать по ..." + +#. module: project_issue +#: field:project.issue,working_hours_open:0 +msgid "Working Hours to Open the Issue" +msgstr "" + +#. module: project_issue +#: constraint:project.project:0 +msgid "Error! project start-date must be lower then project end-date." +msgstr "" +"Ошибка! Дата начала проекта должна быть раньше даты окончания проекта." + +#. module: project_issue +#: field:project.issue,date_open:0 +msgid "Opened" +msgstr "Открыто" + +#. module: project_issue +#: field:project.issue.report,opening_date:0 +msgid "Date of Opening" +msgstr "Дата открытия" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "March" +msgstr "Март" + +#. module: project_issue +#: field:project.issue,progress:0 +msgid "Progress (%)" +msgstr "Выполнение (%)" + +#. module: project_issue +#: field:project.issue,company_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,company_id:0 +msgid "Company" +msgstr "Организация" + +#. module: project_issue +#: field:project.issue,email_cc:0 +msgid "Watchers Emails" +msgstr "Адреса наблюдателей" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Close Working hours" +msgstr "" + +#. module: project_issue +#: model:ir.model,name:project_issue.model_project_issue_version +msgid "project.issue.version" +msgstr "project.issue.version" + +#. module: project_issue +#: field:project.issue,day_open:0 +msgid "Days to Open" +msgstr "Дней до открытия" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:360 +#, python-format +msgid "" +"You cannot escalate this issue.\n" +"The relevant Project has not configured the Escalation Project!" +msgstr "" +"Не возможна эскалация этой проблемы.\n" +"Связанный с проблемой проект ещё не настроил процедуры эскалации!" + +#. module: project_issue +#: constraint:project.project:0 +msgid "Error! You cannot assign escalation to the same project!" +msgstr "Ошибка! Вы не можете назначить эскалацию на тот же проект!" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Date Closed" +msgstr "Дата закрытия" + +#. module: project_issue +#: view:project.issue.report:0 +#: field:project.issue.report,day:0 +msgid "Day" +msgstr "День" + +#. module: project_issue +#: view:project.issue:0 +msgid "Add Internal Note" +msgstr "Добавить внутреннюю заметку" + +#. module: project_issue +#: field:project.issue,task_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,task_id:0 +msgid "Task" +msgstr "Задача" + +#. module: project_issue +#: view:board.board:0 +msgid "Issues By Stage" +msgstr "Проблемы по стадии" + +#. module: project_issue +#: field:project.issue,partner_mobile:0 +msgid "Mobile" +msgstr "Мобильный" + +#. module: project_issue +#: field:project.issue,message_ids:0 +msgid "Messages" +msgstr "Сообщения" + +#. module: project_issue +#: model:ir.model,name:project_issue.model_project_project +#: view:project.issue:0 +#: field:project.issue,project_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,project_id:0 +msgid "Project" +msgstr "Проект" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree +msgid "My Open Project issues" +msgstr "Мои открытые проблемы по проекту" + +#. module: project_issue +#: selection:project.issue,state:0 +#: selection:project.issue.report,state:0 +msgid "Cancelled" +msgstr "Отменен" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:360 +#, python-format +msgid "Warning !" +msgstr "Warning !" + +#. module: project_issue +#: field:project.issue.report,date_closed:0 +msgid "Date of Closing" +msgstr "Дата закрытия" + +#. module: project_issue +#: view:project.issue:0 +msgid "Issue Tracker Search" +msgstr "Поиск по проблемам" + +#. module: project_issue +#: field:project.issue.report,working_hours_open:0 +msgid "Avg. Working Hours to Open" +msgstr "Ср. кол-во часов до открытия" + +#. module: project_issue +#: field:project.issue,date_action_next:0 +msgid "Next Action" +msgstr "Следующее действие" + +#. module: project_issue +#: help:project.project,project_escalation_id:0 +msgid "" +"If any issue is escalated from the current Project, it will be listed under " +"the project selected here." +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Extra Info" +msgstr "Доп. инфо." + +#. module: project_issue +#: model:ir.actions.act_window,help:project_issue.action_project_issue_report +msgid "" +"This report on the project issues allows you to analyse the quality of your " +"support or after-sales services. You can track the issues per age. You can " +"analyse the time required to open or close an issue, the number of email to " +"exchange and the time spent on average by issues." +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,partner_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,partner_id:0 +msgid "Partner" +msgstr "Контрагент" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:473 +#, python-format +msgid " (copy)" +msgstr " (копия)" + +#. module: project_issue +#: view:project.issue:0 +msgid "Previous" +msgstr "Предыдущий" + +#. module: project_issue +#: view:project.issue:0 +msgid "Statistics" +msgstr "Статистика" + +#. module: project_issue +#: view:project.issue:0 +msgid "Convert To Task" +msgstr "Преобразовать в задачу" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_project_issue_report +#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree +#: view:project.issue.report:0 +msgid "Issues Analysis" +msgstr "Анализ проблемы" + +#. module: project_issue +#: field:project.issue.version,name:0 +msgid "Version Number" +msgstr "Номер версии" + +#. module: project_issue +#: view:project.issue:0 +msgid "Next" +msgstr "Следующий" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,priority:0 +#: view:project.issue.report:0 +#: field:project.issue.report,priority:0 +msgid "Priority" +msgstr "Приоритет" + +#. module: project_issue +#: view:project.issue:0 +msgid "Send New Email" +msgstr "Отправить новое эл. письмо" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,version_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,version_id:0 +msgid "Version" +msgstr "Версия" + +#. module: project_issue +#: model:ir.module.module,shortdesc:project_issue.module_meta_information +msgid "Issue Management in Project Management" +msgstr "Управление инцидентами в управлении проектами" + +#. module: project_issue +#: view:board.board:0 +msgid "Pending Issues" +msgstr "Ожидающие инциденты" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Open Working Hours" +msgstr "Открыто рабочих часов" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action +msgid "Issue Categories" +msgstr "Категории инцидентов" + +#. module: project_issue +#: field:project.issue,email_from:0 +msgid "Email" +msgstr "Электронная почта" + +#. module: project_issue +#: field:project.issue,canal_id:0 +#: field:project.issue.report,canal_id:0 +msgid "Channel" +msgstr "Канал" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "Lowest" +msgstr "Низший" + +#. module: project_issue +#: field:project.issue,create_date:0 +#: field:project.issue.report,creation_date:0 +msgid "Creation Date" +msgstr "Дата создания" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.project_issue_version_action +#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act +msgid "Versions" +msgstr "Версии" + +#. module: project_issue +#: field:project.issue,partner_phone:0 +msgid "Phone" +msgstr "Телефон" + +#. module: project_issue +#: view:project.issue:0 +msgid "Reset to Draft" +msgstr "Вернуть в черновики" + +#. module: project_issue +#: view:project.issue:0 +msgid "Today" +msgstr "Сегодня" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.open_board_project_issue +#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue +msgid "Project Issue Dashboard" +msgstr "Инфо-панель \"Инциденты проекта\"" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +msgid "Done" +msgstr "Выполнено" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "July" +msgstr "Июль" + +#. module: project_issue +#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act +msgid "Categories" +msgstr "Категории" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +#: field:project.issue.report,type_id:0 +msgid "Stage" +msgstr "Этап" + +#. module: project_issue +#: view:project.issue:0 +msgid "History Information" +msgstr "История" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree +#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree +msgid "Project issues" +msgstr "Инциденты проекта" + +#. module: project_issue +#: view:project.issue:0 +msgid "Communication & History" +msgstr "Общение & история" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "My Open Project Issue" +msgstr "Мой открытый инцидент" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree +msgid "My Project Issues" +msgstr "Мои инциденты" + +#. module: project_issue +#: view:project.issue:0 +msgid "Contact" +msgstr "Контакт" + +#. module: project_issue +#: view:board.board:0 +msgid "My Board" +msgstr "Моя панель" + +#. module: project_issue +#: view:board.board:0 +msgid "My Issues" +msgstr "Мои инциденты" + +#. module: project_issue +#: help:project.issue,canal_id:0 +msgid "" +"The channels represent the different communication modes available with the " +"customer. With each commercial opportunity, you can indicate the canall " +"which is this opportunity source." +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,help:project_issue.project_issue_version_action +msgid "" +"You can use the issues tracker in OpenERP to handle bugs in the software " +"development project, to handle claims in after-sales services, etc. Define " +"here the different versions of your products on which you can work on issues." +msgstr "" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:283 +#, python-format +msgid "Tasks" +msgstr "Задачи" + +#. module: project_issue +#: field:project.issue.report,nbr:0 +msgid "# of Issues" +msgstr "Кол-во инцидентов" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "September" +msgstr "Сентябрь" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "December" +msgstr "Декабрь" + +#. module: project_issue +#: view:project.issue:0 +msgid "Issue Tracker Tree" +msgstr "Дерево инцидентов" + +#. module: project_issue +#: help:project.issue,assigned_to:0 +msgid "This is the current user to whom the related task have been assigned" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +#: field:project.issue.report,month:0 +msgid "Month" +msgstr "Месяц" + +#. module: project_issue +#: model:ir.model,name:project_issue.model_project_issue_report +msgid "project.issue.report" +msgstr "project.issue.report" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:362 +#: view:project.issue:0 +#, python-format +msgid "Escalate" +msgstr "Эскалировать" + +#. module: project_issue +#: model:crm.case.categ,name:project_issue.feature_request_categ +msgid "Feature Requests" +msgstr "Запросы на доработку" + +#. module: project_issue +#: field:project.issue,write_date:0 +msgid "Update Date" +msgstr "Дата изменения" + +#. module: project_issue +#: model:ir.module.module,description:project_issue.module_meta_information +msgid "" +"\n" +" This module provide Issues/Bugs Management in Project\n" +" " +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,categ_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,categ_id:0 +msgid "Category" +msgstr "Категория" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "#Number of Project Issues" +msgstr "Кол-во инцидентов на проекте" + +#. module: project_issue +#: help:project.issue,email_cc:0 +msgid "" +"These email addresses will be added to the CC field of all inbound and " +"outbound emails for this record before being sent. Separate multiple email " +"addresses with a comma" +msgstr "" +"Эти электронные адреса будут добавлены в поле \"Копия\" всех входящих и " +"исходящих сообщений для этой записи перед отправкой. Разделяйте адреса " +"запятыми." + +#. module: project_issue +#: selection:project.issue,state:0 +#: selection:project.issue.report,state:0 +msgid "Draft" +msgstr "Черновик" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "Low" +msgstr "Низкий" + +#. module: project_issue +#: field:project.issue,date_closed:0 +#: selection:project.issue,state:0 +#: selection:project.issue.report,state:0 +msgid "Closed" +msgstr "Закрыт" + +#. module: project_issue +#: field:project.issue.report,delay_close:0 +msgid "Avg. Delay to Close" +msgstr "Ср. задержка перед закрытием" + +#. module: project_issue +#: view:project.issue:0 +#: selection:project.issue,state:0 +#: view:project.issue.report:0 +#: selection:project.issue.report,state:0 +msgid "Pending" +msgstr "В ожидании" + +#. module: project_issue +#: view:project.issue:0 +msgid "Status" +msgstr "Состояние" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "#Project Issues" +msgstr "Кол-во инцидентов на проекте" + +#. module: project_issue +#: view:board.board:0 +msgid "Current Issues" +msgstr "Текущие индиденты" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "August" +msgstr "Август" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "Normal" +msgstr "Обычный" + +#. module: project_issue +#: view:project.issue:0 +msgid "Global CC" +msgstr "Глобальная копия" + +#. module: project_issue +#: view:project.issue:0 +#: selection:project.issue,state:0 +msgid "To Do" +msgstr "Сделать" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "June" +msgstr "Июнь" + +#. module: project_issue +#: field:project.issue,day_close:0 +msgid "Days to Close" +msgstr "Дней до закрытия" + +#. module: project_issue +#: field:project.issue,active:0 +#: field:project.issue.version,active:0 +msgid "Active" +msgstr "Активный" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "November" +msgstr "Ноябрь" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +msgid "Extended Filters..." +msgstr "Расширенные фильтры..." + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Search" +msgstr "Поиск" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "October" +msgstr "Октябрь" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "January" +msgstr "Январь" + +#. module: project_issue +#: view:project.issue:0 +msgid "Feature Tracker Tree" +msgstr "Дерево запросов функциональности" + +#. module: project_issue +#: model:crm.case.categ,name:project_issue.bug_categ +msgid "Bugs" +msgstr "" + +#. module: project_issue +#: view:board.board:0 +msgid "Issues By State" +msgstr "Инциденты по состоянию" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,date:0 +msgid "Date" +msgstr "Дата" + +#. module: project_issue +#: field:project.issue,partner_address_id:0 +msgid "Partner Contact" +msgstr "Контакт контрагента" + +#. module: project_issue +#: field:project.issue,type_id:0 +msgid "Resolution" +msgstr "Решение" + +#. module: project_issue +#: view:project.issue:0 +msgid "History" +msgstr "История" + +#. module: project_issue +#: field:project.issue,assigned_to:0 +#: view:project.issue.report:0 +#: field:project.issue.report,assigned_to:0 +msgid "Assigned to" +msgstr "Назначено" + +#. module: project_issue +#: field:project.project,reply_to:0 +msgid "Reply-To Email Address" +msgstr "Обратный адрес электронной почты" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "Highest" +msgstr "Наивысший" + +#. module: project_issue +#: view:project.issue:0 +msgid "Attachments" +msgstr "Прикрепленные файлы" + +#. module: project_issue +#: view:project.issue:0 +msgid "Issue Tracker Form" +msgstr "Форма для отслеживания инцидентов" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,state:0 +#: view:project.issue.report:0 +#: field:project.issue.report,state:0 +msgid "State" +msgstr "Состояние" + +#. module: project_issue +#: view:project.issue:0 +msgid "General" +msgstr "" + +#. module: project_issue +#: view:project.issue.version:0 +msgid "Issue Version" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Communication" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Cancel" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Close" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: selection:project.issue.report,state:0 +msgid "Open" +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all +#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0 +#: model:ir.ui.menu,name:project_issue.menu_project_issue_track +#: view:project.issue:0 +msgid "Issues" +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage +#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state +#: model:ir.model,name:project_issue.model_project_issue +#: model:ir.ui.menu,name:project_issue.menu_project_confi +#: view:project.issue.report:0 +msgid "Project Issue" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,user_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,user_id:0 +msgid "Responsible" +msgstr "" + +#. module: project_issue +#: help:project.issue,progress:0 +msgid "Computed as: Time Spent / Total Time." +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +msgid "Current" +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0 +msgid "" +"Issues such as system bugs, customer complaints, and material breakdowns are " +"collected here. You can define the stages assigned when solving the project " +"issue (analysis, development, done). With the mailgateway module, issues can " +"be integrated through an email address (example: support@mycompany.com)" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Details" +msgstr "" + +#. module: project_issue +#: help:project.issue,email_from:0 +msgid "These people will receive email." +msgstr "Эти люди получат эл. письма." + +#. module: project_issue +#: view:project.issue:0 +msgid "Reply" +msgstr "" + +#. module: project_issue +#: field:project.issue,name:0 +msgid "Issue" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Feature Tracker Search" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,description:0 +msgid "Description" +msgstr "" + +#. module: project_issue +#: field:project.issue,section_id:0 +msgid "Sales Team" +msgstr "" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "May" +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_project_issue_report +#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree +msgid "Issue Analysis" +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Sale Team " +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +#: field:project.issue.report,email:0 +msgid "# Emails" +msgstr "" + +#. module: project_issue +#: field:project.issue,partner_name:0 +msgid "Employee's Name" +msgstr "" + +#. module: project_issue +#: help:project.issue,state:0 +msgid "" +"The state is set to 'Draft', when a case is created. " +" \n" +"If the case is in progress the state is set to 'Open'. " +" \n" +"When the case is over, the state is set to 'Done'. " +" \n" +"If the case needs to be reviewed then the state is set to 'Pending'." +msgstr "" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "February" +msgstr "" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:61 +#, python-format +msgid "Issue '%s' has been opened." +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Feature description" +msgstr "" + +#. module: project_issue +#: field:project.project,project_escalation_id:0 +msgid "Project Escalation" +msgstr "" + +#. module: project_issue +#: help:project.issue,section_id:0 +msgid "" +"Sales team to which Case belongs to. Define " +"Responsible user and Email account for mail gateway." +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Month-1" +msgstr "" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:76 +#, python-format +msgid "Issue '%s' has been closed." +msgstr "" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "April" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "References" +msgstr "" + +#. module: project_issue +#: field:project.issue,working_hours_close:0 +msgid "Working Hours to Close the Issue" +msgstr "" + +#. module: project_issue +#: field:project.issue,id:0 +msgid "ID" +msgstr "" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:377 +#, python-format +msgid "No Title" +msgstr "" + +#. module: project_issue +#: help:project.issue.report,delay_close:0 +#: help:project.issue.report,delay_open:0 +msgid "Number of Days to close the project issue" +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +#: field:project.issue.report,section_id:0 +msgid "Sale Team" +msgstr "" + +#. module: project_issue +#: field:project.issue.report,working_hours_close:0 +msgid "Avg. Working Hours to Close" +msgstr "" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "High" +msgstr "" + +#. module: project_issue +#: field:project.issue,date_deadline:0 +msgid "Deadline" +msgstr "" + +#. module: project_issue +#: field:project.issue,date_action_last:0 +msgid "Last Action" +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +#: field:project.issue.report,name:0 +msgid "Year" +msgstr "" + +#. module: project_issue +#: field:project.issue,duration:0 +msgid "Duration" +msgstr "" + +#. module: project_issue +#: view:board.board:0 +msgid "My Open Issues by Creation Date" +msgstr "" + +#~ msgid "Maintenance" +#~ msgstr "Обслуживание" diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 228a899a640..54e7dd22cdf 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -98,26 +98,25 @@ class project_issue(crm.crm_case, osv.osv): ans = False hours = 0 + date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S") if field in ['working_hours_open','day_open']: if issue.date_open: - date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S") date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S") ans = date_open - date_create date_until = issue.date_open #Calculating no. of working hours to open the issue hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id, - datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), - datetime.strptime(issue.date_open, '%Y-%m-%d %H:%M:%S')) + date_create, + date_open) elif field in ['working_hours_close','day_close']: if issue.date_closed: - date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S") date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S") date_until = issue.date_closed ans = date_close - date_create #Calculating no. of working hours to close the issue hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id, - datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), - datetime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S')) + date_create, + date_close) elif field in ['days_since_creation']: if issue.create_date: days_since_creation = datetime.today() - datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S") @@ -139,7 +138,11 @@ class project_issue(crm.crm_case, osv.osv): duration = float(ans.days) if issue.project_id and issue.project_id.resource_calendar_id: duration = float(ans.days) * 24 - new_dates = cal_obj.interval_min_get(cr, uid, issue.project_id.resource_calendar_id.id, datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'), duration, resource=resource_id) + + new_dates = cal_obj.interval_min_get(cr, uid, + issue.project_id.resource_calendar_id.id, + date_create, + duration, resource=resource_id) no_days = [] date_until = datetime.strptime(date_until, '%Y-%m-%d %H:%M:%S') for in_time, out_time in new_dates: @@ -148,10 +151,12 @@ class project_issue(crm.crm_case, osv.osv): if out_time > date_until: break duration = len(no_days) + if field in ['working_hours_open','working_hours_close']: res[issue.id][field] = hours else: res[issue.id][field] = abs(float(duration)) + return res def _get_issue_task(self, cr, uid, ids, context=None): @@ -196,7 +201,7 @@ class project_issue(crm.crm_case, osv.osv): domain="[('partner_id','=',partner_id)]"), 'company_id': fields.many2one('res.company', 'Company'), 'description': fields.text('Description'), - 'state': fields.selection([('draft', 'New'), ('open', 'To Solve'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True, + 'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ \nWhen the case is over, the state is set to \'Done\'.\ @@ -365,7 +370,6 @@ class project_issue(crm.crm_case, osv.osv): self.write(cr, uid, task.id, {'type_id': index and types[index-1] or False}) return True - def onchange_task_id(self, cr, uid, ids, task_id, context=None): result = {} if not task_id: @@ -383,7 +387,7 @@ class project_issue(crm.crm_case, osv.osv): """ cases = self.browse(cr, uid, ids) for case in cases: - data = {} + data = {'state' : 'draft'} if case.project_id.project_escalation_id: data['project_id'] = case.project_id.project_escalation_id.id if case.project_id.project_escalation_id.user_id: diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index c6d852cfde0..a1602113979 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -2,7 +2,7 @@ <openerp> <data> - <menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/> + <menuitem id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/> <record model="ir.ui.view" id="project_issue_version_search_view"> <field name="name">Issue Version</field> @@ -55,7 +55,7 @@ <field name="name"/> <field name="project_id" required="True" on_change="on_change_project(project_id)"/> <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> - <field name="user_id"/> + <field name="user_id"/> <field name="version_id" colspan="2" widget="selection"/> <group colspan="2" col="4"> <field name="type_id" string="Resolution" /> @@ -85,8 +85,8 @@ <group col="8" colspan="4"> <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/> - <button name="case_open" string="Solve" states="draft,pending" type="object" icon="gtk-go-forward"/> - <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/> + <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/> + <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/> <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/> <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/> <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/> @@ -188,7 +188,7 @@ <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/> <field name="version_id" widget="selection"/> <field name="user_id"/> - <field name="progress" widget="progressbar"/> + <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/> <field name="state"/> <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/> <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/> @@ -372,7 +372,7 @@ </record> <record id="view_project_feature_filter" model="ir.ui.view"> - <field name="name">Project Issue- Feature Tracker Search</field> + <field name="name">Project Issue - Feature Tracker Search</field> <field name="model">project.issue</field> <field name="type">search</field> <field name="arch" type="xml"> @@ -384,8 +384,8 @@ <field name="name" string="Feature description"/> <field name="user_id"/> <field name="state"> - <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/> - <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/> + <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/> + <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/> </field> <field name="project_id" string="Project"/> </group> diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml index 1e9b139aed1..d10fba8fb0b 100644 --- a/addons/project_issue_sheet/project_issue_sheet_view.xml +++ b/addons/project_issue_sheet/project_issue_sheet_view.xml @@ -19,7 +19,7 @@ <notebook colspan="4"> <page string="Worklogs"> <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}"> - <tree editable="top" string="Timesheet"> + <tree editable="top" string="Timesheets"> <field name="name"/> <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/> <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/> diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py index f022f952792..f1c48f97c00 100644 --- a/addons/project_mrp/project_procurement.py +++ b/addons/project_mrp/project_procurement.py @@ -19,9 +19,7 @@ # ############################################################################## -from osv import fields, osv, orm - -import tools +from osv import fields, osv class procurement_order(osv.osv): _name = "procurement.order" @@ -30,11 +28,25 @@ class procurement_order(osv.osv): 'task_id': fields.many2one('project.task', 'Task'), 'sale_line_id': fields.many2one('sale.order.line', 'Sale order line') } + def check_produce_service(self, cr, uid, procurement, context=None): return True def action_produce_assign_service(self, cr, uid, ids, context=None): + project_obj = self.pool.get('project.project') for procurement in self.browse(cr, uid, ids, context=context): + # project_id = the product's associated project if it exists, + # the sales order's associated project otherwise + project_id = False + if procurement.product_id.project_id: + project_id = procurement.product_id.project_id.id + elif procurement.sale_line_id: + account_id = procurement.sale_line_id.order_id.project_id.id + if account_id: + project_ids = project_obj.search(cr, uid, [('analytic_account_id', '=', account_id)]) + project_id = project_ids and project_ids[0] or False + + # create task under the project self.write(cr, uid, [procurement.id], {'state': 'running'}) planned_hours = procurement.product_qty task_id = self.pool.get('project.task').create(cr, uid, { @@ -47,7 +59,7 @@ class procurement_order(osv.osv): 'procurement_id': procurement.id, 'description': procurement.note, 'date_deadline': procurement.date_planned, - 'project_id': procurement.product_id.project_id and procurement.product_id.project_id.id or False, + 'project_id': project_id, 'state': 'draft', 'company_id': procurement.company_id.id, },context=context) diff --git a/addons/project_planning/project_planning_demo.xml b/addons/project_planning/project_planning_demo.xml index 4943ca0e5e3..f1b7e288734 100644 --- a/addons/project_planning/project_planning_demo.xml +++ b/addons/project_planning/project_planning_demo.xml @@ -30,7 +30,7 @@ <field name="amount_unit" ref="product.uom_hour"/> <field name="planning_id" ref="project_plannning_1"/> <field name="user_id" ref="project.res_users_technical_leader"/> - <field name="task_ids" eval="[(6,0,[ref('project.project_task_192')])]"/> + <field name="task_ids" eval="[(6,0,[ref('project.project_task_190')])]"/> </record> diff --git a/addons/project_retro_planning/i18n/da.po b/addons/project_retro_planning/i18n/da.po new file mode 100644 index 00000000000..9003e2af861 --- /dev/null +++ b/addons/project_retro_planning/i18n/da.po @@ -0,0 +1,47 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-08 11:48+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: project_retro_planning +#: model:ir.model,name:project_retro_planning.model_project_project +msgid "Project" +msgstr "Projekt" + +#. module: project_retro_planning +#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information +msgid "Project Retro planning" +msgstr "" + +#. module: project_retro_planning +#: model:ir.module.module,description:project_retro_planning.module_meta_information +msgid "" +"\n" +" - If end date of project is changed\n" +" then the deadline date and start date for all the tasks will " +"change accordingly " +msgstr "" + +#. module: project_retro_planning +#: constraint:project.project:0 +msgid "Error! project start-date must be lower then project end-date." +msgstr "" + +#. module: project_retro_planning +#: constraint:project.project:0 +msgid "Error! You cannot assign escalation to the same project!" +msgstr "" diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po index a883340b195..619436f2e86 100644 --- a/addons/purchase/i18n/bg.po +++ b/addons/purchase/i18n/bg.po @@ -7,13 +7,13 @@ 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: 2010-08-03 10:12+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1570,7 +1570,7 @@ msgstr "Февруари" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Категории продукти" #. module: purchase diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po index 48ea16b8b5e..24429012b29 100644 --- a/addons/purchase/i18n/ca.po +++ b/addons/purchase/i18n/ca.po @@ -7,13 +7,13 @@ 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-08-17 21:54+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1648,7 +1648,7 @@ msgstr "Febrer" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Categories de productes" #. module: purchase diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po index 01c61e5a13e..a3a9b09968b 100644 --- a/addons/purchase/i18n/cs.po +++ b/addons/purchase/i18n/cs.po @@ -7,13 +7,13 @@ 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-07-15 02:37+0000\n" +"PO-Revision-Date: 2011-11-07 12:54+0000\n" "Last-Translator: Jiří Hajda <robie@centrum.cz>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" @@ -1579,7 +1579,7 @@ msgstr "Únor" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Kategorie výrobků" #. module: purchase diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po index fc89ea5fc5e..4c366d8124d 100644 --- a/addons/purchase/i18n/da.po +++ b/addons/purchase/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-09-19 08:04+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:35+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 04:56+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -76,7 +76,7 @@ msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Not Invoiced" -msgstr "" +msgstr "Ikke faktureret" #. module: purchase #: field:purchase.order,dest_address_id:0 diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po index dbdae8eedb1..6aa22d7b2d1 100644 --- a/addons/purchase/i18n/de.po +++ b/addons/purchase/i18n/de.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-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-18 11:29+0000\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-" "consulting.net>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1669,7 +1669,7 @@ msgstr "Februar" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Produkte Kategorien" #. module: purchase diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po index 88d87ed04fe..755695102f8 100644 --- a/addons/purchase/i18n/es.po +++ b/addons/purchase/i18n/es.po @@ -7,13 +7,13 @@ 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-10-16 23:04+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1642,7 +1642,7 @@ msgstr "Febrero" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Categorías de productos" #. module: purchase diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po index 0e964f82410..361ed5c8603 100644 --- a/addons/purchase/i18n/fi.po +++ b/addons/purchase/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-12-16 05:43+0000\n" +"PO-Revision-Date: 2011-11-07 12:55+0000\n" "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" "Language-Team: Finnish <fi@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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1619,7 +1619,7 @@ msgstr "Helmikuu" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Tuotteiden Kategoriat" #. module: purchase diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po index d6e3b44caa9..89bdac8d444 100644 --- a/addons/purchase/i18n/fr.po +++ b/addons/purchase/i18n/fr.po @@ -7,13 +7,13 @@ 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-01-19 08:42+0000\n" -"Last-Translator: Xavier Verbeke <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:55+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1656,7 +1656,7 @@ msgstr "Février" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Catégories de produits" #. module: purchase diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po index ace4a1ce344..27aa4fa3bd4 100644 --- a/addons/purchase/i18n/hu.po +++ b/addons/purchase/i18n/hu.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-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-02-09 18:38+0000\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " "<openerp@novotrade.hu>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1640,7 +1640,7 @@ msgstr "Február" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Termék kategóriák" #. module: purchase diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po index 46d8ee4df5e..c10f1c6e9db 100644 --- a/addons/purchase/i18n/id.po +++ b/addons/purchase/i18n/id.po @@ -7,13 +7,13 @@ 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-01-25 06:44+0000\n" -"Last-Translator: moelyana <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1621,7 +1621,7 @@ msgstr "Februari" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Kategori Produk" #. module: purchase diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po index 0f37f3ff217..ca9077d432c 100644 --- a/addons/purchase/i18n/it.po +++ b/addons/purchase/i18n/it.po @@ -7,13 +7,13 @@ 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-01-12 04:56+0000\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1635,7 +1635,7 @@ msgstr "Febbraio" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Categorie Prodotti" #. module: purchase diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po index d0b4029ee3d..381c796a1c7 100644 --- a/addons/purchase/i18n/nl.po +++ b/addons/purchase/i18n/nl.po @@ -7,13 +7,13 @@ 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-01-16 17:01+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1638,7 +1638,7 @@ msgstr "Februari" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Productcategoriën" #. module: purchase diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po index 4d877f2b186..4f5b8ee53c6 100644 --- a/addons/purchase/i18n/pl.po +++ b/addons/purchase/i18n/pl.po @@ -7,13 +7,13 @@ 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-01-22 13:10+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1629,7 +1629,7 @@ msgstr "Luty" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Kategorie produktów" #. module: purchase diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po index fab2d0d3b02..a8e82a4db94 100644 --- a/addons/purchase/i18n/pt_BR.po +++ b/addons/purchase/i18n/pt_BR.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-02-28 21:53+0000\n" -"Last-Translator: Emerson <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: <pt@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: 2011-11-05 04:57+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1647,7 +1647,7 @@ msgstr "Fevereiro" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Categorias de produtos" #. module: purchase diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po index e8211fdec42..1b90abfe14a 100644 --- a/addons/purchase/i18n/ro.po +++ b/addons/purchase/i18n/ro.po @@ -7,13 +7,13 @@ 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-04-04 15:03+0000\n" -"Last-Translator: Mihai Satmarean <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1606,7 +1606,7 @@ msgstr "Februarie" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Categorii Produse" #. module: purchase diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po index 58663d74579..48335dbbf50 100644 --- a/addons/purchase/i18n/ru.po +++ b/addons/purchase/i18n/ru.po @@ -7,13 +7,13 @@ 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-24 14:57+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1590,7 +1590,7 @@ msgstr "Февраль" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Категории ТМЦ" #. module: purchase diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po index 9b1d93b5996..52ba5cd56b9 100644 --- a/addons/purchase/i18n/tr.po +++ b/addons/purchase/i18n/tr.po @@ -7,13 +7,13 @@ 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: 2010-12-16 04:39+0000\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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-11-05 04:57+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1638,7 +1638,7 @@ msgstr "Şubat" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "Ürün Kategorileri" #. module: purchase diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po index bc43915ecf4..9e67dc54b69 100644 --- a/addons/purchase/i18n/zh_CN.po +++ b/addons/purchase/i18n/zh_CN.po @@ -7,13 +7,13 @@ 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-01-28 02:07+0000\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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-11-05 04:57+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase @@ -1569,7 +1569,7 @@ msgstr "2月" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Product Categories" +msgid "Products Categories" msgstr "产品分类" #. module: purchase diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 4c48d971d47..83b20833c5f 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -188,11 +188,10 @@ class purchase_order(osv.osv): 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'), 'invoiced': fields.function(_invoiced, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"), 'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'), - 'invoice_method': fields.selection([('manual','Based on purchase order lines'),('order','Draft invoices pre-generated'),('picking','Based on receptions')], 'Invoicing Control', required=True, - help="Based on orders: a draft invoice will be generated based on the purchase order. The accountant " \ - "will just have to validate this invoice for control.\n" \ - "Based on receptions: a draft invoice will be generated based on validated receptions.\n" \ - "Pre-generate Invoice: allows you to generate draft suppliers invoices on validation of the PO." + 'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated invoice'),('picking','Based on receptions')], 'Invoicing Control', required=True, + help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' frow where you can selectively create an invoice.\n" \ + "Based on generated invoice: create a draft invoice you can validate later.\n" \ + "Based on receptions: let you create an invoice when receptions are validated." ), 'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.", store = { @@ -402,6 +401,7 @@ class purchase_order(osv.osv): return False def action_cancel(self, cr, uid, ids, context=None): + wf_service = netsvc.LocalService("workflow") for purchase in self.browse(cr, uid, ids, context=context): for pick in purchase.picking_ids: if pick.state not in ('draft','cancel'): @@ -409,7 +409,6 @@ class purchase_order(osv.osv): _('Unable to cancel this purchase order!'), _('You must first cancel all receptions related to this purchase order.')) for pick in purchase.picking_ids: - wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr) for inv in purchase.invoice_ids: if inv and inv.state not in ('cancel','draft'): @@ -417,65 +416,96 @@ class purchase_order(osv.osv): _('Unable to cancel this purchase order!'), _('You must first cancel all invoices related to this purchase order.')) if inv: - wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr) self.write(cr,uid,ids,{'state':'cancel'}) - for (id,name) in self.name_get(cr, uid, ids): + + for (id, name) in self.name_get(cr, uid, ids): + wf_service.trg_validate(uid, 'purchase.order', id, 'purchase_cancel', cr) message = _("Purchase order '%s' is cancelled.") % name self.log(cr, uid, id, message) return True + def _prepare_order_picking(self, cr, uid, order, *args): + return { + 'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'), + 'origin': order.name + ((order.origin and (':' + order.origin)) or ''), + 'date': order.date_order, + 'type': 'in', + 'address_id': order.dest_address_id.id or order.partner_address_id.id, + 'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none', + 'purchase_id': order.id, + 'company_id': order.company_id.id, + 'move_lines' : [], + } + + def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, *args): + return { + 'name': order.name + ': ' + (order_line.name or ''), + 'product_id': order_line.product_id.id, + 'product_qty': order_line.product_qty, + 'product_uos_qty': order_line.product_qty, + 'product_uom': order_line.product_uom.id, + 'product_uos': order_line.product_uom.id, + 'date': order_line.date_planned, + 'date_expected': order_line.date_planned, + 'location_id': order.partner_id.property_stock_supplier.id, + 'location_dest_id': order.location_id.id, + 'picking_id': picking_id, + 'address_id': order.dest_address_id.id or order.partner_address_id.id, + 'move_dest_id': order_line.move_dest_id.id, + 'state': 'draft', + 'purchase_line_id': order_line.id, + 'company_id': order.company_id.id, + 'price_unit': order_line.price_unit + } + + def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, *args): + """Creates pickings and appropriate stock moves for given order lines, then + confirms the moves, makes them available, and confirms the picking. + + If ``picking_id`` is provided, the stock moves will be added to it, otherwise + a standard outgoing picking will be created to wrap the stock moves, as returned + by :meth:`~._prepare_order_picking`. + + Modules that wish to customize the procurements or partition the stock moves over + multiple stock pickings may override this method and call ``super()`` with + different subsets of ``order_lines`` and/or preset ``picking_id`` values. + + :param browse_record order: purchase order to which the order lines belong + :param list(browse_record) order_lines: purchase order line records for which picking + and moves should be created. + :param int picking_id: optional ID of a stock picking to which the created stock moves + will be added. A new picking will be created if omitted. + :return: list of IDs of pickings used/created for the given order lines (usually just one) + """ + if not picking_id: + picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, *args)) + todo_moves = [] + stock_move = self.pool.get('stock.move') + wf_service = netsvc.LocalService("workflow") + for order_line in order_lines: + if not order_line.product_id: + continue + if order_line.product_id.type in ('product', 'consu'): + move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, *args)) + if order_line.move_dest_id: + order_line.move_dest_id.write({'location_id': order.location_id.id}) + todo_moves.append(move) + stock_move.action_confirm(cr, uid, todo_moves) + stock_move.force_assign(cr, uid, todo_moves) + wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr) + return [picking_id] + def action_picking_create(self,cr, uid, ids, *args): - picking_id = False + picking_ids = [] for order in self.browse(cr, uid, ids): - loc_id = order.partner_id.property_stock_supplier.id - istate = 'none' - if order.invoice_method=='picking': - istate = '2binvoiced' - pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in') - picking_id = self.pool.get('stock.picking').create(cr, uid, { - 'name': pick_name, - 'origin': order.name+((order.origin and (':'+order.origin)) or ''), - 'type': 'in', - 'address_id': order.dest_address_id.id or order.partner_address_id.id, - 'invoice_state': istate, - 'purchase_id': order.id, - 'company_id': order.company_id.id, - 'move_lines' : [], - }) - todo_moves = [] - for order_line in order.order_line: - if not order_line.product_id: - continue - if order_line.product_id.product_tmpl_id.type in ('product', 'consu'): - dest = order.location_id.id - move = self.pool.get('stock.move').create(cr, uid, { - 'name': order.name + ': ' +(order_line.name or ''), - 'product_id': order_line.product_id.id, - 'product_qty': order_line.product_qty, - 'product_uos_qty': order_line.product_qty, - 'product_uom': order_line.product_uom.id, - 'product_uos': order_line.product_uom.id, - 'date': order_line.date_planned, - 'date_expected': order_line.date_planned, - 'location_id': loc_id, - 'location_dest_id': dest, - 'picking_id': picking_id, - 'address_id': order.dest_address_id.id or order.partner_address_id.id, - 'move_dest_id': order_line.move_dest_id.id, - 'state': 'draft', - 'purchase_line_id': order_line.id, - 'company_id': order.company_id.id, - 'price_unit': order_line.price_unit - }) - if order_line.move_dest_id: - self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id}) - todo_moves.append(move) - self.pool.get('stock.move').action_confirm(cr, uid, todo_moves) - self.pool.get('stock.move').force_assign(cr, uid, todo_moves) - wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr) - return picking_id + picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, *args)) + + # Must return one unique picking ID: the one to connect in the subflow of the purchase order. + # In case of multiple (split) pickings, we should return the ID of the critical one, i.e. the + # one that should trigger the advancement of the purchase workflow. + # By default we will consider the first one as most important, but this behavior can be overridden. + return picking_ids[0] if picking_ids else False def copy(self, cr, uid, id, default=None, context=None): if not default: @@ -490,7 +520,6 @@ class purchase_order(osv.osv): }) return super(purchase_order, self).copy(cr, uid, id, default, context) - def do_merge(self, cr, uid, ids, context=None): """ To merge similar type of purchase orders. diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 3e9a6d97ddf..49102d6bfdf 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -21,7 +21,7 @@ parent="menu_purchase_config_pricelist" sequence="20"/> <menuitem - action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase" + action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase" parent="menu_purchase_config_pricelist" sequence="10"/> <!--<menuitem @@ -112,7 +112,7 @@ <field name="help">Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it.</field> </record> - <menuitem name="Supplier Invoices to Receive" + <menuitem name="Based on generated invoice" id="menu_procurement_management_pending_invoice" action="action_invoice_pending" parent="menu_procurement_management_invoice" @@ -495,14 +495,14 @@ <record id="purchase_line_form_action2" model="ir.actions.act_window"> - <field name="name">On Purchase Order Lines</field> + <field name="name">Based on Purchase Order lines</field> <field name="type">ir.actions.act_window</field> <field name="res_model">purchase.order.line</field> <field name="domain">[('order_id.invoice_method','<>','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="search_view_id" ref="purchase_order_line_search"/> - <field name="help">If you set the invoicing control on a purchase order as "Based on Purchase Order Lines", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field> + <field name="help">If you set the Invoicing Control on a purchase order as "Based on Purchase Order lines", you can track here all the purchase order lines for which you have not yet received the supplier invoice. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field> </record> <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view"> <field eval="1" name="sequence"/> diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml index aea6fa2b2ac..c978712c0a1 100644 --- a/addons/purchase/purchase_workflow.xml +++ b/addons/purchase/purchase_workflow.xml @@ -138,12 +138,12 @@ <record id="trans_except_picking" model="workflow.transition"> <field name="act_from" ref="act_except_picking"/> <field name="act_to" ref="act_cancel"/> - <field name="signal">cancel</field> + <field name="signal">purchase_cancel</field> </record> <record id="trans_except_invoice" model="workflow.transition"> <field name="act_from" ref="act_except_invoice"/> <field name="act_to" ref="act_cancel"/> - <field name="signal">cancel</field> + <field name="signal">purchase_cancel</field> </record> <record id="trans_picking_except_picking" model="workflow.transition"> <field name="act_from" ref="act_picking"/> diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index f947857a016..68323bc9146 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -54,15 +54,17 @@ <field name="arch" type="xml"> <search string="Purchase Orders"> <group> - <filter icon="terp-go-year" string=" Year " + <filter icon="terp-go-year" string="Year" + name="year" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]" help="Order in current year"/> - <filter icon="terp-go-month" string=" Month " + <separator orientation="vertical"/> + <filter icon="terp-go-month" string="Month" name="month" domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]" help="Order in current month"/> <filter icon="terp-go-month" - string=" Month-1 " + string="Month-1" domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" help="Order in last month"/> <separator orientation="vertical"/> @@ -149,7 +151,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,graph</field> <field name="view_id" ref="view_purchase_order_tree"></field> - <field name="context">{'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field> + <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field> <field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc.</field> </record> @@ -179,8 +181,8 @@ <field name="res_model">report.stock.move</field> <field name="view_type">form</field> <field name="view_mode">tree,graph</field> - <field name="search_view_id" ref="stock.view_stock_search"/> - <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field> + <field name="search_view_id" ref="stock.view_stock_search"/> + <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,}</field> <field name="help">Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.</field> </record> <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/> @@ -211,7 +213,7 @@ <field name="model">purchase.report</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Total price by product by state" type="pie"> + <graph string="Total price by product by state" type="pie"> <field name="product_id"/> <field name="price_total" operator="+"/> diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 5b9901a9a49..0e2a1852eca 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -104,7 +104,7 @@ </record> <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window"> - <field name="name">On Incoming Shipments</field> + <field name="name">Based on receptions</field> <field name="res_model">stock.picking</field> <field name="type">ir.actions.act_window</field> <field name="view_type">form</field> @@ -112,7 +112,7 @@ <field name="domain">[('type','=','in')]</field> <field name="context">{'contact_display': 'partner_address',"search_default_done":1, "search_default_to_invoice":1}</field> <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/> - <field name="help">Create invoice from reception of products. If you selected this invoice control method in the purchase order, all receptions done are available here to be invoiced.</field> + <field name="help">If you set the Invoicing Control on a purchase order as "Based on receptions", you can track here all the product receptions and create invoices for those receptions.</field> </record> <menuitem action="action_picking_tree4_picking_to_invoice" diff --git a/addons/purchase_analytic_plans/i18n/da.po b/addons/purchase_analytic_plans/i18n/da.po new file mode 100644 index 00000000000..7679cbef497 --- /dev/null +++ b/addons/purchase_analytic_plans/i18n/da.po @@ -0,0 +1,51 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-03 16:58+0000\n" +"PO-Revision-Date: 2011-11-08 11:49+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: purchase_analytic_plans +#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line +msgid "Purchase Order Line" +msgstr "Indkøbsordrelinie" + +#. module: purchase_analytic_plans +#: sql_constraint:purchase.order:0 +msgid "Order Reference must be unique !" +msgstr "Ordre reference skal være unik" + +#. module: purchase_analytic_plans +#: field:purchase.order.line,analytics_id:0 +msgid "Analytic Distribution" +msgstr "" + +#. module: purchase_analytic_plans +#: model:ir.model,name:purchase_analytic_plans.model_purchase_order +msgid "Purchase Order" +msgstr "Indkøbsordre" + +#. module: purchase_analytic_plans +#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information +msgid "Purchase Analytic Distribution Management" +msgstr "" + +#. module: purchase_analytic_plans +#: model:ir.module.module,description:purchase_analytic_plans.module_meta_information +msgid "" +"\n" +" The base module to manage analytic distribution and purchase orders.\n" +" " +msgstr "" diff --git a/addons/resource/resource.py b/addons/resource/resource.py index f90a402946b..f5473bdd65b 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -211,15 +211,21 @@ resource_calendar() class resource_calendar_attendance(osv.osv): _name = "resource.calendar.attendance" _description = "Work Detail" + _columns = { 'name' : fields.char("Name", size=64, required=True), - 'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week'), + 'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week', required=True), 'date_from' : fields.date('Starting date'), 'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from"), 'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"), 'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True), } + _order = 'dayofweek, hour_from' + + _defaults = { + 'dayofweek' : '0' + } resource_calendar_attendance() def convert_timeformat(time_string): diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index ac2f2090c7f..76f99024fba 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -81,8 +81,8 @@ Dashboard for Sales Manager that includes: 'report/sale_report_view.xml', 'sale_report.xml', 'stock_view.xml', - 'board_sale_view.xml', 'process/sale_process.xml', + 'board_sale_view.xml', ], 'demo_xml': ['sale_demo.xml'], 'test': [ diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index 66b3c8805e4..ef2519e8714 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -32,5 +32,105 @@ <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/> <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/> + + + <record id="action_quotation_for_sale" model="ir.actions.act_window"> + <field name="name">My Quotations</field> + <field name="res_model">sale.order</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form</field> + <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field> + <field name="view_id" ref="sale.view_order_tree"/> + </record> + + <record id="view_turnover_by_month_tree" model="ir.ui.view"> + <field name="name">turnover.by.month.tree</field> + <field name="model">account.invoice.report</field> + <field name="type">tree</field> + <!-- Lower priority to avoid conflicting with default accounting views for reports --> + <field name="priority" eval="32"/> + <field name="arch" type="xml"> + <tree string="Monthly Turnover"> + <field name="month"/> + <field name="price_total"/> + </tree> + </field> + </record> + + <record id="view_turnover_by_month_graph" model="ir.ui.view"> + <field name="name">turnover.by.month.graph</field> + <field name="model">account.invoice.report</field> + <!-- Lower priority to avoid conflicting with default accounting views for reports --> + <field name="priority" eval="32"/> + <field name="type">graph</field> + <field name="arch" type="xml"> + <graph string="Monthly Turnover" type="bar"> + <field name="month"/> + <field name="price_total" operator="+"/> + </graph> + </field> + </record> + + <record model="ir.actions.act_window" id="action_turnover_by_month"> + <field name="name">Monthly Turnover</field> + <field name="res_model">account.invoice.report</field> + <field name="view_type">form</field> + <field name="view_mode">graph,tree</field> + <field name="view_id" ref="view_turnover_by_month_graph"/> + <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field> + <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field> + <field name="search_view_id" ref="account.view_account_invoice_report_search"/> + </record> + + <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view"> + <field name="act_window_id" ref="action_turnover_by_month"/> + <field name="view_mode">graph</field> + <field name="view_id" ref="view_turnover_by_month_graph"/> + </record> + + <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view"> + <field name="act_window_id" ref="action_turnover_by_month"/> + <field name="view_mode">tree</field> + <field name="view_id" ref="view_turnover_by_month_tree"/> + </record> + + <record id="board_sales_form" model="ir.ui.view"> + <field name="name">board.sales.form</field> + <field name="model">board.board</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Sales Dashboard"> + <hpaned position="100"> + <child1> + <action + name="%(action_quotation_for_sale)d" + string="My Quotations" + height="150" + width="510" + groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"/> + </child1> + <child2> + <action + string="Monthly Turnover" + name="%(action_turnover_by_month)d" + groups="base.group_sale_salesman,account.group_account_manager" + colspan="4"/> + </child2> + </hpaned> + </form> + </field> + </record> + + <record id="open_board_sales" model="ir.actions.act_window"> + <field name="name">Sales Dashboard</field> + <field name="res_model">board.board</field> + <field name="view_type">form</field> + <field name="view_mode">form</field> + <field name="view_id" ref="board_sales_form"/> + </record> + + <menuitem + id="base.menu_base_partner" action="open_board_sales"/> + </data> </openerp> diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po index 51f05793939..f0c4e392425 100644 --- a/addons/sale/i18n/da.po +++ b/addons/sale/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-11-05 12:32+0000\n" +"PO-Revision-Date: 2011-11-08 17:59+0000\n" "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-06 05:23+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: sale #: view:board.board:0 @@ -59,7 +59,7 @@ msgstr "Dag" #: model:process.transition.action,name:sale.process_transition_action_cancelorder0 #: view:sale.order:0 msgid "Cancel Order" -msgstr "Annuler ordre" +msgstr "Annuller ordre" #. module: sale #: view:sale.config.picking_policy:0 @@ -162,7 +162,7 @@ msgstr "Standard betalingsbetinelser" #. module: sale #: model:ir.actions.act_window,name:sale.action_config_picking_policy msgid "Configure Picking Policy for Sales Order" -msgstr "" +msgstr "Konfigurerer plukpolitik for salgsorder" #. module: sale #: view:sale.order:0 @@ -185,7 +185,7 @@ msgstr "" #. module: sale #: help:sale.make.invoice,grouped:0 msgid "Check the box to group the invoices for the same customers" -msgstr "" +msgstr "Afkryds for at gruppere fakturaer pr. kunde." #. module: sale #: selection:sale.order,invoice_quantity:0 @@ -200,13 +200,13 @@ msgstr "Salg pr. sælger" #. module: sale #: field:sale.order.line,move_ids:0 msgid "Inventory Moves" -msgstr "" +msgstr "Lagerbevægelser" #. module: sale #: field:sale.order,name:0 #: field:sale.order.line,order_id:0 msgid "Order Reference" -msgstr "" +msgstr "Ordre referense" #. module: sale #: view:sale.order:0 @@ -224,6 +224,8 @@ msgid "" "The invoice is created automatically if the shipping policy is 'Invoice from " "pick' or 'Invoice on order after delivery'." msgstr "" +"Fakturaen laves automatisk hvis leveringspolitiken er 'Fakturer på grundlag " +"af plukliste' eller 'Fakturer på grundlag af ordre efter levering'." #. module: sale #: model:ir.model,name:sale.model_sale_make_invoice @@ -245,6 +247,8 @@ msgstr "Rabat (%)" msgid "" "This is the days added to what you promise to customers for security purpose" msgstr "" +"Det er det antal dage som du lägger till det datum som du lovat kunden av " +"säkerhetsskäl" #. module: sale #: view:board.board:0 diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 294a1c29c00..8963942dbff 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -110,7 +110,7 @@ class sale_order(osv.osv): for item in cr.dictfetchall(): if item['move_state'] == 'cancel': continue - + if item['picking_type'] == 'in':#this is a returned picking tmp[item['sale_order_id']]['total'] -= item['nbr'] or 0.0 # Deducting the return picking qty if item['procurement_state'] == 'done' or item['move_state'] == 'done': @@ -125,7 +125,7 @@ class sale_order(osv.osv): res[order.id] = 100.0 else: res[order.id] = tmp[order.id]['total'] and (100.0 * tmp[order.id]['picked'] / tmp[order.id]['total']) or 0.0 - return res + return res def _invoiced_rate(self, cursor, user, ids, name, arg, context=None): res = {} @@ -726,6 +726,7 @@ class sale_order(osv.osv): return { 'name': pick_name, 'origin': order.name, + 'date': order.date_order, 'type': 'out', 'state': 'auto', 'move_type': order.picking_policy, @@ -766,13 +767,13 @@ class sale_order(osv.osv): if line.product_id: if line.product_id.product_tmpl_id.type in ('product', 'consu'): if not picking_id: - picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, args)) - move_id = self.pool.get('stock.move').create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, args)) + picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, *args)) + move_id = self.pool.get('stock.move').create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, *args)) else: # a service has no stock move move_id = False - proc_id = self.pool.get('procurement.order').create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, args)) + proc_id = self.pool.get('procurement.order').create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, *args)) proc_ids.append(proc_id) line.write({'procurement_id': proc_id}) @@ -811,7 +812,7 @@ class sale_order(osv.osv): def action_ship_create(self, cr, uid, ids, *args): for order in self.browse(cr, uid, ids, context={}): - self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, args) + self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, *args) return True def action_ship_end(self, cr, uid, ids, context=None): @@ -898,7 +899,7 @@ class sale_order_line(osv.osv): return result[1] except Exception, ex: return False - + _name = 'sale.order.line' _description = 'Sales Order Line' _columns = { @@ -1266,7 +1267,7 @@ sale_order_line() class sale_config_picking_policy(osv.osv_memory): _name = 'sale.config.picking_policy' _inherit = 'res.config' - + _columns = { 'name': fields.char('Name', size=64), 'sale_orders': fields.boolean('Based on Sales Orders',), @@ -1307,7 +1308,7 @@ class sale_config_picking_policy(osv.osv_memory): if wizard.sale_orders: menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').id - menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]}) + menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]}) if wizard.deli_orders: menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').id @@ -1315,6 +1316,7 @@ class sale_config_picking_policy(osv.osv_memory): if wizard.task_work: module_name.append('project_timesheet') + module_name.append('project_mrp') module_name.append('account_analytic_analysis') if wizard.timesheet: @@ -1344,7 +1346,7 @@ class sale_config_picking_policy(osv.osv_memory): product_obj = self.pool.get('product.product') product_obj.write(cr, uid, prod_id, {'uom_id':wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id}) - ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy) + ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy) if wizard.task_work and wizard.time_unit: company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id self.pool.get('res.company').write(cr, uid, [company_id], { diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index e49e22c71c7..73a8a6cd42a 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -1,8 +1,12 @@ <openerp> <data> - <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/> + <menuitem icon="terp-partner" + id="base.menu_base_partner" name="Sales" + sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/> - <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/> + <menuitem id="base.menu_sales" name="Sales" + parent="base.menu_base_partner" sequence="1" + /> <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/> @@ -119,40 +123,51 @@ <form string="Sales Order Lines"> <notebook> <page string="Order Line"> - <field colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/> + <group colspan="4" col="5"> + <field colspan="3" + context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" + name="product_id" + on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/> + <field name="name"/> + <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/> - <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/> + <field name="product_uom" + on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)" + nolabel="1"/> + <field name="price_unit"/> + <field groups="product.group_uos" name="product_uos_qty"/> <field groups="product.group_uos" name="product_uos"/> - <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="base.group_extended"/> - <field colspan="4" name="name"/> - <field name="price_unit"/> - <field name="discount"/> - <field name="type" groups="base.group_extended"/> - <field name="delay" groups="base.group_extended"/> <newline/> + <field name="product_packaging" + context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" + domain="[('product_id','=',product_id)]" groups="base.group_extended" + colspan="3"/> + <field name="discount"/> + <separator colspan="5" string="Notes"/> + <field colspan="5" name="notes" nolabel="1"/> <separator colspan="5" string="Taxes"/> - <field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/> - <group colspan="4" col="5" groups="base.group_extended"> + <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/> + <group colspan="5" col="5" groups="base.group_extended"> <separator colspan="5" string="States"/> <field name="state"/> <field name="invoiced"/> <group attrs="{'invisible':[('invoiced','=',True)]}"> - <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/> - </group> + <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/> + </group> </group> + </group> </page> <page groups="base.group_extended" string="Extra Info"> + <field name="type"/> + <field name="delay"/> <field name="th_weight"/> <field name="address_allotment_id"/> <field name="property_ids" colspan="4"/> </page> - <page string="Notes"> - <field colspan="4" name="notes" nolabel="1"/> - </page> <page string="History" groups="base.group_extended"> <separator colspan="4" string="Invoice Lines"/> <field colspan="4" name="invoice_lines" nolabel="1"/> diff --git a/addons/sale/stock.py b/addons/sale/stock.py index eeb37c28d9a..9043bc9abe9 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -140,9 +140,11 @@ class stock_picking(osv.osv): continue sale_lines = picking.sale_id.order_line invoice_created = invoices[result[picking.id]] - for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context): - if not inv.fiscal_position: - invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context) + if picking.sale_id.user_id: + invoice_obj.write(cursor, user, [invoice_created.id], {'user_id': picking.sale_id.user_id.id}, context=context) + + if picking.sale_id.fiscal_position: + invoice_obj.write(cursor, user, [invoice_created.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context) if picking.sale_id.client_order_ref: inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context) diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml index 27adce0ca9d..1557166015a 100644 --- a/addons/sale_crm/board_sale_crm_view.xml +++ b/addons/sale_crm/board_sale_crm_view.xml @@ -1,110 +1,56 @@ <?xml version="1.0"?> <openerp> - <data> - - <record id="action_quotation_for_sale_crm" model="ir.actions.act_window"> - <field name="name">Quotations</field> - <field name="res_model">sale.order</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field> - <field name="view_id" ref="sale.view_order_tree"/> - </record> - - <record id="view_turnover_by_month_tree" model="ir.ui.view"> - <field name="name">turnover.by.month.tree</field> - <field name="model">account.invoice.report</field> - <field name="type">tree</field> - <!-- Lower priority to avoid conflicting with default accounting views for reports --> - <field name="priority" eval="32"/> - <field name="arch" type="xml"> - <tree string="Monthly Turnover"> - <field name="month"/> - <field name="price_total"/> - </tree> - </field> - </record> - - <record id="view_turnover_by_month_graph" model="ir.ui.view"> - <field name="name">turnover.by.month.graph</field> - <field name="model">account.invoice.report</field> - <!-- Lower priority to avoid conflicting with default accounting views for reports --> - <field name="priority" eval="32"/> - <field name="type">graph</field> - <field name="arch" type="xml"> - <graph string="Monthly Turnover" type="bar"> - <field name="month"/> - <field name="price_total" operator="+"/> - </graph> - </field> - </record> - - <record model="ir.actions.act_window" id="action_turnover_by_month"> - <field name="name">Monthly Turnover</field> - <field name="res_model">account.invoice.report</field> - <field name="view_type">form</field> - <field name="view_mode">graph,tree</field> - <field name="view_id" ref="view_turnover_by_month_graph"/> - <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field> - <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field> - <field name="search_view_id" ref="account.view_account_invoice_report_search"/> - </record> - <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view"> - <field name="act_window_id" ref="action_turnover_by_month"/> - <field name="view_mode">graph</field> - <field name="view_id" ref="view_turnover_by_month_graph"/> - </record> - <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view"> - <field name="act_window_id" ref="action_turnover_by_month"/> - <field name="view_mode">tree</field> - <field name="view_id" ref="view_turnover_by_month_tree"/> - </record> - - <record model="ir.ui.view" id="board_crm_form_inherit_child1"> - <field name="name">board.crm.form.inherit.child1</field> + <data> + <record model="ir.ui.view" id="board_crm_form_inherit_replace1"> + <field name="name">board.crm.form.inherit.replace1</field> <field name="model">board.board</field> <field name="type">form</field> - <field name="inherit_id" ref="crm.board_crm_form"/> + <field name="inherit_id" ref="sale.board_sales_form"/> <field name="arch" type="xml"> - <xpath expr="/form/hpaned/child1/action[@string='My Open Opportunities']" position="after"> - <action - string="My Quotations" - name="%(action_quotation_for_sale_crm)d" - colspan="4" - height="150" - groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user" - width="510"/> - </xpath> + <xpath expr="/form/hpaned/child1/action[@string='My Quotations']" position="before"> + <action + string="My Open Opportunities" + name="%(crm.act_my_oppor)d" + colspan="4" + height="150" + groups="base.group_sale_salesman,base.group_sale_manager" + width="510"/> + </xpath> </field> </record> - <record model="ir.ui.view" id="board_crm_form_inherit_replace1"> + <record model="ir.ui.view" id="board_crm_form_inherit_replace2"> <field name="name">board.crm.form.inherit.replace1</field> <field name="model">board.board</field> <field name="type">form</field> - <field name="inherit_id" ref="crm.board_crm_form"/> + <field name="inherit_id" ref="sale.board_sales_form"/> <field name="arch" type="xml"> - <xpath expr="/form/hpaned/child2/action[@string='My Win/Lost Ratio for the Last Year']" position="replace"> - <action - string="Monthly Turnover" - name="%(action_turnover_by_month)d" - groups="base.group_sale_salesman,account.group_account_manager" - colspan="4"/> - </xpath> + <xpath expr="/form/hpaned/child1/action[@string='My Quotations']" position="after"> + <action + string="My Meetings" + name="%(crm.act_my_meetings)d" + height="150" + colspan="4"/> + </xpath> </field> </record> - <record model="ir.ui.view" id="board_crm_form_inherit_replace2"> - <field name="name">board.crm.form.inherit.replace2</field> + <record model="ir.ui.view" id="board_crm_form_inherit_replace3"> + <field name="name">board.crm.form.inherit.replace1</field> <field name="model">board.board</field> <field name="type">form</field> - <field name="inherit_id" ref="crm.board_crm_form"/> + <field name="inherit_id" ref="sale.board_sales_form"/> <field name="arch" type="xml"> - <xpath expr="/form/hpaned/child2/action[@string='My Planned Revenues by Stage']" position="attributes"> - <attribute name="string">Opportunities by Stage</attribute> - </xpath> + <xpath expr="/form/hpaned/child2/action[@string='Monthly Turnover']" position="before"> + <action + string="My Planned Revenues by Stage" + name="%(crm.act_my_oppor_stage)d" + groups="base.group_sale_salesman,base.group_sale_manager" + colspan="4"/> + </xpath> </field> </record> - + <menuitem icon="terp-partner" + id="base.menu_base_partner" action="sale.open_board_sales"/> </data> </openerp> diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index ae41ced671c..d1f6dc98edd 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -103,12 +103,13 @@ class crm_make_sale(osv.osv_memory): } if partner.id: vals['user_id'] = partner.user_id and partner.user_id.id or uid - new_id = sale_obj.create(cr, uid, vals) + new_id = sale_obj.create(cr, uid, vals, context=context) + sale_order = sale_obj.browse(cr, uid, new_id, context=context) case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id}) new_ids.append(new_id) message = _("Opportunity '%s' is converted to Quotation.") % (case.name) self.log(cr, uid, case.id, message) - case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id), context=context) + case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(%s).") % (sale_order.name), context=context) if make.close: case_obj.case_close(cr, uid, data) @@ -148,7 +149,7 @@ class crm_make_sale(osv.osv_memory): } _defaults = { 'shop_id': _get_shop_id, - 'close': True, + 'close': False, 'partner_id': _selectPartner, } diff --git a/addons/sale_layout/i18n/da.po b/addons/sale_layout/i18n/da.po index cfe4d50326a..d27e07c62ae 100644 --- a/addons/sale_layout/i18n/da.po +++ b/addons/sale_layout/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-09-24 17:46+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-08 22:33+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:44+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: sale_layout #: selection:sale.order.line,layout_type:0 @@ -39,7 +39,7 @@ msgstr "" #. module: sale_layout #: selection:sale.order.line,layout_type:0 msgid "Title" -msgstr "" +msgstr "Titel" #. module: sale_layout #: report:sale.order.layout:0 @@ -49,7 +49,7 @@ msgstr "" #. module: sale_layout #: selection:sale.order.line,layout_type:0 msgid "Note" -msgstr "" +msgstr "Notat" #. module: sale_layout #: report:sale.order.layout:0 @@ -69,7 +69,7 @@ msgstr "Ordre linier" #. module: sale_layout #: report:sale.order.layout:0 msgid "Disc.(%)" -msgstr "" +msgstr "Rabat (%)" #. module: sale_layout #: field:sale.order.line,layout_type:0 diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index 0c81586c08c..7c15713d3b3 100644 --- a/addons/sale_layout/sale_layout.py +++ b/addons/sale_layout/sale_layout.py @@ -117,8 +117,8 @@ class sale_order_line(osv.osv): ('subtotal', 'Sub Total'), ('line', 'Separator Line'), ('break', 'Page Break'),] - ,'Layout Type', select=True, required=True), - 'sequence': fields.integer('Layout Sequence'), + ,'Line Type', select=True, required=True), + 'sequence': fields.integer('Line Sequence'), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)), 'product_uom': fields.many2one('product.uom', 'Product UoM'), diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml index 3b0600f9d8b..79adefa32f3 100644 --- a/addons/sale_layout/sale_layout_view.xml +++ b/addons/sale_layout/sale_layout_view.xml @@ -14,60 +14,83 @@ <field name="arch" type="xml"> <xpath expr="/form/notebook/page/field[@name='order_line']" position="replace"> <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list"> - <form string="Sale Order Lines"> + <form string="Order Line"> <notebook> <page string="Order Line"> - <separator colspan="4" string="Automatic Declaration"/> - <field colspan="4" + <group colspan="4" col="5"> + <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/> + <field name="sequence" groups="base.group_extended"/> + </group> + <group colspan="4" col="5"> + <field colspan="3" context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}" name="product_id" - attrs="{'readonly':[('layout_type','!=','article')]}" + attrs="{'invisible':[('layout_type','!=','article')]}" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)" select="1"/> <field + name="name" required="0" + attrs="{'invisible':[('layout_type','in',('line','break','subtotal'))], 'required':[('layout_type','not in',['line','break'])]}"/> + + <field context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}" name="product_uom_qty" - attrs="{'readonly':[('layout_type','!=','article')]}" - on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)" - select="1"/> + attrs="{'invisible':[('layout_type','!=','article')]}" + on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/> <field name="product_uom" - required="0" - attrs="{'readonly':[('layout_type','!=','article')], 'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}" + nolabel="1" + required="0" + attrs="{'invisible':[('layout_type','!=','article')], 'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}" on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/> + <field name="price_unit" + attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/> + + <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/> + <field groups="product.group_uos" name="product_uos"/> + <newline/> + <field name="product_packaging" - attrs="{'readonly':[('layout_type','!=','article')]}" + colspan="3" + attrs="{'invisible':[('layout_type','!=','article')]}" context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="base.group_extended"/> - <separator colspan="4" string="Manual Description" /> - <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/> - <field name="sequence" string="Seq."/> - <field colspan="4" name="name" required="0" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))], 'required':[('layout_type','not in',['line','break'])]}"/> - <field name="price_unit" select="2" attrs="{'readonly':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/> - <field name="discount" attrs="{'readonly':[('layout_type','!=','article')]}"/> - <field name="type" attrs="{'readonly':[('layout_type','!=','article')]}"/> - <field name="delay" select="2" attrs="{'readonly':[('layout_type','!=','article')]}"/> - <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" attrs="{'readonly':[('layout_type','!=','article')]}"/> - <separator colspan="4" string="States"/> - <field name="state" select="2"/> - <group col="3" colspan="2"> - <field name="invoiced" select="2"/> + <field + name="discount" + attrs="{'invisible':[('layout_type','!=','article')]}"/> + + <group colspan="5" + attrs="{'invisible':[('layout_type','not in', ['article','text'])]}"> + <separator colspan="4" string="Notes"/> + <field colspan="4" name="notes" nolabel="1"/> + </group> + + <group colspan="5" + attrs="{'invisible':[('layout_type','!=','article')]}"> + <separator colspan="4" string="Taxes"/> + <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" nolabel="1"/> + </group> + + <group col="5" colspan="5" attrs="{'invisible':[('layout_type','!=','article')]}"> + <separator colspan="5" string="States"/> + <field name="state"/> + <field name="invoiced"/> <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/> </group> + </group> </page> - <page groups="base.group_extended" string="Extra Info"> - <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/> - <field groups="product.group_uos" name="product_uos"/> + <page groups="base.group_extended" string="Extra Info" + attrs="{'invisible':[('layout_type','!=','article')]}"> + <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/> + <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/> <field name="address_allotment_id" select="2"/> <separator colspan="4" string="Properties"/> <field colspan="4" name="property_ids" nolabel="1"/> </page> - <page string="Notes"> - <field colspan="4" name="notes" nolabel="1"/> - </page> - <page string="History" groups="base.group_extended"> + <page string="History" groups="base.group_extended" + attrs="{'invisible':[('layout_type','!=','article')]}"> <separator colspan="4" string="Invoice Lines"/> <field colspan="4" name="invoice_lines" nolabel="1"/> <separator colspan="4" string="Stock Moves"/> diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index cfa3543f09c..82a7150b6d1 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -81,42 +81,4 @@ class sale_order(osv.osv): sale_order() -class stock_picking(osv.osv): - _inherit = 'stock.picking' - - _columns = { - 'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type', '=', 'out_invoice')]), - } - - def action_invoice_create(self, cr, uid, ids, journal_id=False, - group=False, type='out_invoice', context=None): - # need to carify with new requirement - invoice_ids = [] - picking_obj = self.pool.get('stock.picking') - res = super(stock_picking, self).action_invoice_create(cr, uid, ids, journal_id=journal_id, group=group, type=type, context=context) - invoice_ids = res.values() - picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]}) - return res - -stock_picking() - -class account_invoice_line(osv.osv): - _inherit = "account.invoice.line" - _columns = { - 'cost_price': fields.float('Cost Price', digits=(16, 2)), - } - def write(self, cr, uid, ids, vals, context=None): - if vals.get('product_id', False): - res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price']) - vals['cost_price'] = res[0]['standard_price'] - return super(account_invoice_line, self).write(cr, uid, ids, vals, context) - - def create(self, cr, uid, vals, context=None): - if vals.get('product_id',False): - res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price']) - vals['cost_price'] = res[0]['standard_price'] - return super(account_invoice_line, self).create(cr, uid, vals, context) - -account_invoice_line() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml index 201dd12d7a0..ad0b8440f19 100644 --- a/addons/sale_margin/sale_margin_view.xml +++ b/addons/sale_margin/sale_margin_view.xml @@ -20,7 +20,7 @@ <field name="model">sale.order</field> <field name="inherit_id" ref="sale.view_order_form" /> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after"> + <xpath expr="//field[@name='order_line']/form//field[@name='price_unit']" position="after"> <field name="purchase_price"/> </xpath> </field> @@ -32,7 +32,7 @@ <field name="model">sale.order</field> <field name="inherit_id" ref="sale.view_order_form" /> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after"> + <xpath expr="//field[@name='order_line']/tree//field[@name='price_unit']" position="after"> <field name="purchase_price"/> </xpath> </field> @@ -61,21 +61,6 @@ </field> </field> </record> - - - <record model="ir.ui.view" id="view_picking_margin_out_form"> - <field name="name">picking.margin.view.form</field> - <field name="type">form</field> - <field name="model">stock.picking</field> - <field name="inherit_id" ref="stock.view_picking_out_form" /> - <field name="arch" type="xml"> - <xpath expr="/form/notebook/page[@string='Additional info']" position="after"> - <page string="Customer Invoices"> - <field colspan="4" name="invoice_ids" nolabel="1"/> - </page> - </xpath> - </field> - </record> - + </data> </openerp> diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 954f915c885..b9077109c3c 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -56,6 +56,9 @@ synchronization with other companies, etc. 'certificate' : '001301246528927038493', 'js': ['static/src/js/share.js'], 'css': ['static/src/css/share.css'], + 'qweb' : [ + "static/src/xml/*.xml", + ], 'images': ['images/share_wizard.jpeg','images/sharing_wizard_step1.jpeg', 'images/sharing_wizard_step2.jpeg'], } diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js index 6d02a39cf1f..b2abc1832a4 100644 --- a/addons/share/static/src/js/share.js +++ b/addons/share/static/src/js/share.js @@ -1,7 +1,5 @@ openerp.share = function(instance) { -var QWeb = instance.web.qweb; -QWeb.add_template('/share/static/src/xml/share.xml'); function launch_wizard(self, view) { var action = view.widget_parent.action; @@ -30,10 +28,9 @@ function if_has_share(yes, no) { if (!_has_share) { _has_share = $.Deferred(function() { var self = this; - var session = instance.webclient.session; - session.on_session_invalid.add_last(function() { _has_share = null; }); - var func = new instance.web.Model(session, "share.wizard").get_func("has_share"); - func(session.uid).pipe(function(res) { + instance.connection.on_session_invalid.add_last(function() { _has_share = null; }); + var func = new instance.web.Model(null, "share.wizard").get_func("has_share"); + func(instance.connection.uid).pipe(function(res) { if(res) { self.resolve(); } else { diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 5b1d392a592..698ac7c8546 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -49,7 +49,10 @@ Thanks to the double entry management, the inventory controlling is powerful and "depends" : ["product", "account"], "category" : "Warehouse Management", "init_xml" : [], - "demo_xml" : ["stock_demo.xml"], + "demo_xml" : [ + "stock_demo.xml", + "stock_demo_picking.yml", + ], "update_xml" : [ "security/stock_security.xml", "security/ir.model.access.csv", @@ -78,10 +81,12 @@ Thanks to the double entry management, the inventory controlling is powerful and "report/report_stock_view.xml", "board_warehouse_view.xml" ], - 'test': ['test/stock_test.yml', - 'test/stock_report.yml', - 'test/stock_test_wizard.yml', - ], + 'test': [ + 'test/stock_test.yml', + 'test/stock_report.yml', + 'test/stock_test_wizard.yml', + 'test/stock_demo_backorder.yml' + ], 'installable': True, 'active': False, 'certificate': '0055421559965', diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po index 300072882ff..6fa528ba0cb 100644 --- a/addons/stock/i18n/ar.po +++ b/addons/stock/i18n/ar.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po index c58a8e3a173..39436a1bb7c 100644 --- a/addons/stock/i18n/bg.po +++ b/addons/stock/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-03-02 09:07+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4720,6 +4720,9 @@ msgstr "" #~ "Планирана дата за придвижване на продукти, или реална дата, ако " #~ "придвижването е извършено." +#~ msgid "Products Categories" +#~ msgstr "Категории продукти" + #, python-format #~ msgid "Product " #~ msgstr "Продукт " diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po index 9120fda1c3f..4f69f603ecd 100644 --- a/addons/stock/i18n/bs.po +++ b/addons/stock/i18n/bs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po index 1a2a878d742..38e25bfa269 100644 --- a/addons/stock/i18n/ca.po +++ b/addons/stock/i18n/ca.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-10-16 23:07+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:57+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -5041,6 +5041,9 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació." #~ msgid "Stock Variation Account" #~ msgstr "Compte variació d'estoc" +#~ msgid "Products Categories" +#~ msgstr "Categories de productes" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po index 7fccaebfd6c..582cb4504e5 100644 --- a/addons/stock/i18n/cs.po +++ b/addons/stock/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-07-15 19:02+0000\n" +"PO-Revision-Date: 2011-11-07 12:57+0000\n" "Last-Translator: Jiří Hajda <robie@centrum.cz>\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-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" @@ -3972,6 +3972,9 @@ msgstr "Volitelné podrobnosti umístění, pouze pro informační účely" #~ msgid "Stock Variation Account" #~ msgstr "Účet výměny zásob" +#~ msgid "Products Categories" +#~ msgstr "Kategorie výrobků" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po index b0573df0618..b5addddbb17 100644 --- a/addons/stock/i18n/da.po +++ b/addons/stock/i18n/da.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2861,7 +2861,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po index 6d5c8a8f0e0..4933700c1ec 100644 --- a/addons/stock/i18n/de.po +++ b/addons/stock/i18n/de.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-04-03 09:07+0000\n" -"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: Ferdinand-camptocamp <Unknown>\n" "Language-Team: German <kde-i18n-doc@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -5064,6 +5064,9 @@ msgstr "Optionale Lagerort Details, nur als Information" #~ msgid "quantity." #~ msgstr "Anzahl" +#~ msgid "Products Categories" +#~ msgstr "Produkte Kategorien" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po index f6fbbfc46ac..3c9960f64c4 100644 --- a/addons/stock/i18n/el.po +++ b/addons/stock/i18n/el.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-04-01 18:43+0000\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n" "Language-Team: nls@hellug.gr <nls@hellug.gr>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" @@ -4754,6 +4754,9 @@ msgstr "" #~ msgid "Product " #~ msgstr "Προϊόν " +#~ msgid "Products Categories" +#~ msgstr "Κατηγορίες Προϊόντων" + #, python-format #~ msgid "is scheduled" #~ msgstr "είναι προγραμματιζμένο" diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po index d7b2e2a518e..5fa85ed5c32 100644 --- a/addons/stock/i18n/es.po +++ b/addons/stock/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-01-18 09:19+0000\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #~ msgid "Stock Management" @@ -5065,3 +5065,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información." #, python-format #~ msgid "INV: " #~ msgstr "INV: " + +#~ msgid "Products Categories" +#~ msgstr "Categorías de productos" diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po index dcfe33d7fe6..aad9b7746cc 100644 --- a/addons/stock/i18n/es_AR.po +++ b/addons/stock/i18n/es_AR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po index 937c41d36c6..c50359ed1c9 100644 --- a/addons/stock/i18n/es_CL.po +++ b/addons/stock/i18n/es_CL.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3103,7 +3103,7 @@ msgstr "Productos por categoría" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock msgid "Product Categories" -msgstr "Categorías de productos" +msgstr "" #. module: stock #: field:stock.move.memory.in,wizard_id:0 @@ -4226,6 +4226,9 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información." #~ msgid "Stock Variation Account" #~ msgstr "Cuenta variación stock" +#~ msgid "Products Categories" +#~ msgstr "Categorías de productos" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po index 322f2f9628c..9e9fc419b21 100644 --- a/addons/stock/i18n/es_EC.po +++ b/addons/stock/i18n/es_EC.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po index a8379e0dbaf..e208d3ae0db 100644 --- a/addons/stock/i18n/et.po +++ b/addons/stock/i18n/et.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po index 53c5d452f30..1cead46804f 100644 --- a/addons/stock/i18n/fi.po +++ b/addons/stock/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-02-22 08:17+0000\n" -"Last-Translator: Pekka Pylvänäinen <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:43+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Finnish <fi@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: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4818,6 +4818,9 @@ msgstr "" #~ msgid "Stock Variation Account" #~ msgstr "Varastomuutoksen tili" +#~ msgid "Products Categories" +#~ msgstr "Tuotteiden Kategoriat" + #, python-format #~ msgid "is scheduled" #~ msgstr "on aikataulutettu" diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po index 57c108cbdcd..dd80481cfd3 100644 --- a/addons/stock/i18n/fr.po +++ b/addons/stock/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-05-21 12:15+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: hedererjs <hedererjs@asperience.fr>\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-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -5077,3 +5077,6 @@ msgstr "" #, python-format #~ msgid "quantity." #~ msgstr "quantité." + +#~ msgid "Products Categories" +#~ msgstr "Catégories de produits" diff --git a/addons/stock/i18n/gl.po b/addons/stock/i18n/gl.po index 6d6e5e77a08..2f5894f7e3d 100644 --- a/addons/stock/i18n/gl.po +++ b/addons/stock/i18n/gl.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po index 3e62d435c4e..6cf7fb8e71c 100644 --- a/addons/stock/i18n/hr.po +++ b/addons/stock/i18n/hr.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po index 75532227d6f..6a1692196c1 100644 --- a/addons/stock/i18n/hu.po +++ b/addons/stock/i18n/hu.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-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-04-06 14:33+0000\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " "<openerp@novotrade.hu>\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-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4754,6 +4754,9 @@ msgstr "" #~ msgid "Product " #~ msgstr "Termék " +#~ msgid "Products Categories" +#~ msgstr "Termék kategóriák" + #~ msgid "Stock Variation Account" #~ msgstr "Készlet főkönyvi számla" diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po index 604e3656b8b..e7d2d146f56 100644 --- a/addons/stock/i18n/id.po +++ b/addons/stock/i18n/id.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po index 6d8b3a27b9e..8fa44cb6a2a 100644 --- a/addons/stock/i18n/it.po +++ b/addons/stock/i18n/it.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-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-03-30 15:03+0000\n" +"PO-Revision-Date: 2011-11-07 12:57+0000\n" "Last-Translator: Lorenzo Battistini - Agile BG - Domsense " "<lorenzo.battistini@agilebg.com>\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-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4771,6 +4771,9 @@ msgstr "" #~ msgid "Product " #~ msgstr "Prodotto " +#~ msgid "Products Categories" +#~ msgstr "Categorie Prodotti" + #, python-format #~ msgid "is scheduled" #~ msgstr "è pianificato" diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po index 89d2b3a023b..4c1dea3ef7c 100644 --- a/addons/stock/i18n/ko.po +++ b/addons/stock/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po index 14903405d92..d571ac1f273 100644 --- a/addons/stock/i18n/lt.po +++ b/addons/stock/i18n/lt.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" "Language: lt\n" diff --git a/addons/stock/i18n/lv.po b/addons/stock/i18n/lv.po index 09a61e6d3c2..cd2b657e92f 100644 --- a/addons/stock/i18n/lv.po +++ b/addons/stock/i18n/lv.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po index f07c4311d14..13b22a96f6d 100644 --- a/addons/stock/i18n/mn.po +++ b/addons/stock/i18n/mn.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/nb.po b/addons/stock/i18n/nb.po index b03d6968be5..f6e0dde0448 100644 --- a/addons/stock/i18n/nb.po +++ b/addons/stock/i18n/nb.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2867,7 +2867,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po index f42337bfa06..cb8f4e760c5 100644 --- a/addons/stock/i18n/nl.po +++ b/addons/stock/i18n/nl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po index 69f2d8dedd7..690324736bf 100644 --- a/addons/stock/i18n/nl_BE.po +++ b/addons/stock/i18n/nl_BE.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po index 555969b8ce5..81a0764a9ee 100644 --- a/addons/stock/i18n/pl.po +++ b/addons/stock/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-01-22 16:16+0000\n" +"PO-Revision-Date: 2011-11-07 13:05+0000\n" "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4684,3 +4684,6 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji." #, python-format #~ msgid "INV: " #~ msgstr "FAK: " + +#~ msgid "Products Categories" +#~ msgstr "Kategorie produktów" diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po index 14fbe57783b..32e56c8a088 100644 --- a/addons/stock/i18n/pt.po +++ b/addons/stock/i18n/pt.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-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-05-05 13:33+0000\n" -"Last-Translator: João Mouro <Unknown>\n" +"PO-Revision-Date: 2011-11-09 17:23+0000\n" +"Last-Translator: DReis <Unknown>\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-11-05 04:51+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:57+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: stock #: field:product.product,track_outgoing:0 @@ -322,7 +322,7 @@ msgstr "Lote de produção" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action msgid "Units of Measure Categories" -msgstr "" +msgstr "Categorias de unidades de medida" #. module: stock #: help:stock.incoterms,code:0 diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po index 9f75329d1ba..aa4d80d9d8e 100644 --- a/addons/stock/i18n/pt_BR.po +++ b/addons/stock/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-02-09 00:58+0000\n" -"Last-Translator: Emerson <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4498,6 +4498,9 @@ msgstr "Detalhes opcionais do local, apenas em caráter informativo" #~ msgid "Stock Variation Account" #~ msgstr "Conta para Variação de Estoque" +#~ msgid "Products Categories" +#~ msgstr "Categorias de Produtos" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po index 9b76d651ba6..67ee97cb26c 100644 --- a/addons/stock/i18n/ro.po +++ b/addons/stock/i18n/ro.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-03-24 20:19+0000\n" +"PO-Revision-Date: 2011-11-07 12:45+0000\n" "Last-Translator: Dorin <dhongu@gmail.com>\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-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3961,6 +3961,9 @@ msgstr "" #~ msgid "Stock Variation Account" #~ msgstr "Cont variații de stoc" +#~ msgid "Products Categories" +#~ msgstr "Categorii Produse" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po index c9d81a0aceb..6dc91454726 100644 --- a/addons/stock/i18n/ru.po +++ b/addons/stock/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-03-20 08:06+0000\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4710,6 +4710,9 @@ msgstr "Дополнительные подробности локализаци #~ msgid "STOCK_HOME" #~ msgstr "STOCK_HOME" +#~ msgid "Products Categories" +#~ msgstr "Категории ТМЦ" + #~ msgid "Stock Variation Account" #~ msgstr "Счет изменения стоимости ТМЦ" diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po index 2ea1731a526..13c2a31dd9d 100644 --- a/addons/stock/i18n/sl.po +++ b/addons/stock/i18n/sl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po index 92166252764..f65f7de2c87 100644 --- a/addons/stock/i18n/sq.po +++ b/addons/stock/i18n/sq.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po index 8d1dfe6c255..299ec325da4 100644 --- a/addons/stock/i18n/sr.po +++ b/addons/stock/i18n/sr.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/sr@latin.po b/addons/stock/i18n/sr@latin.po index a7ae6bc4d96..df049b3cf76 100644 --- a/addons/stock/i18n/sr@latin.po +++ b/addons/stock/i18n/sr@latin.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po index 2a18e8d7cf8..8b9f5ee0b69 100644 --- a/addons/stock/i18n/sv.po +++ b/addons/stock/i18n/sv.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po index dbcaa4d0ac2..4b572ac43e8 100644 --- a/addons/stock/i18n/th.po +++ b/addons/stock/i18n/th.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po index bdbf29eaab4..659cb6c4a3c 100644 --- a/addons/stock/i18n/tlh.po +++ b/addons/stock/i18n/tlh.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po index 851431f2837..da73cda050e 100644 --- a/addons/stock/i18n/tr.po +++ b/addons/stock/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-06-25 18:52+0000\n" -"Last-Translator: Ayhan KIZILTAN <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4786,6 +4786,9 @@ msgstr "Opsiyonel lokalizasyon ayrıntıları, sadece bilgi amaçlı" #~ msgid "Stock Variation Account" #~ msgstr "Stok Varyasyon Hesabı" +#~ msgid "Products Categories" +#~ msgstr "Ürün Kategorileri" + #, python-format #~ msgid "INV: " #~ msgstr "FAT: " diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po index a41e377200c..8ae9d9f6020 100644 --- a/addons/stock/i18n/uk.po +++ b/addons/stock/i18n/uk.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po index 573f4ebed32..b41880afcb7 100644 --- a/addons/stock/i18n/vi.po +++ b/addons/stock/i18n/vi.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po index 3912a013ddf..dcaa205db9c 100644 --- a/addons/stock/i18n/zh_CN.po +++ b/addons/stock/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-05-04 10:26+0000\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" "Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\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-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -4785,6 +4785,9 @@ msgstr "可选库位，仅供参考" #~ msgid "Stock Variation Account" #~ msgstr "库存变动科目" +#~ msgid "Products Categories" +#~ msgstr "产品分类" + #, python-format #~ msgid "is consumed with" #~ msgstr "是消耗品" diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index 67d3f46c859..193b8a57482 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-09-27 10:25+0000\n" +"PO-Revision-Date: 2011-11-07 13:04+0000\n" "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3933,6 +3933,9 @@ msgstr "" #~ msgid "Product " #~ msgstr "產品 " +#~ msgid "Products Categories" +#~ msgstr "產品分類" + #, python-format #~ msgid "is scheduled" #~ msgstr "已安排" diff --git a/addons/stock/stock.py b/addons/stock/stock.py index ad40dff00e8..09e9119a90d 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2686,7 +2686,7 @@ class stock_warehouse(osv.osv): 'company_id': fields.many2one('res.company', 'Company', required=True, select=True), 'partner_address_id': fields.many2one('res.partner.address', 'Owner Address'), 'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True, domain=[('usage','<>','view')]), - 'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','<>','view')]), + 'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','=','internal')]), 'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage','<>','view')]), } _defaults = { diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index 386a4d60e30..5c5cb776fb3 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -266,13 +266,5 @@ <field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/> <field name="company_id" ref="base.main_company"/> </record> - <record id="stock_picking_1" model="stock.picking"> - <field name="name">PACKO1</field> - <field name="type">out</field> - <field name="move_type">direct</field> - <field name="invoice_state">2binvoiced</field> - <field name="address_id" ref="res_partner_address_fabien0"/> - <field name="company_id" ref="base.main_company"/> - </record> </data> </openerp> diff --git a/addons/stock/stock_demo_picking.yml b/addons/stock/stock_demo_picking.yml new file mode 100644 index 00000000000..6301ab7a0cb --- /dev/null +++ b/addons/stock/stock_demo_picking.yml @@ -0,0 +1,25 @@ +- + !record {model: stock.picking, id: stock_picking_1}: + type: out + company_id: base.main_company + address_id: res_partner_address_fabien0 +- + !record {model: stock.move, id: stock_move_1}: + product_id: product.product_product_cpu1 + product_uom: product.product_uom_unit + product_uos_qty: 5.0 + product_qty: 5.0 + location_dest_id: stock.stock_location_customers + location_id: stock.stock_location_stock + name: CPU1, Processor AMD Athlon XP 1800 + picking_id: stock_picking_1 +- + !record {model: stock.move, id: stock_move_2}: + product_id: product.product_product_cpu3 + product_uom: product.product_uom_unit + product_uos_qty: 5.0 + product_qty: 5.0 + location_dest_id: stock.stock_location_customers + location_id: stock.stock_location_stock + name: CPU3, Processor AMD Athlon XP 1800 + picking_id: stock_picking_1 diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 6452960c2cd..aa1b8b7210f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -6,9 +6,9 @@ groups="group_stock_manager,group_stock_user" sequence="5" web_icon="images/warehouse.png" web_icon_hover="images/warehouse-hover.png"/> - <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/> - <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/> - <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/> + <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/> + <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2" groups="base.group_extended"/> + <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/> <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action" parent="stock.menu_stock_product" sequence="0"/> <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/> @@ -16,7 +16,7 @@ <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1"/> <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/> <menuitem - id="menu_product_in_config_stock" name="Product" + id="menu_product_in_config_stock" name="Products" parent="stock.menu_stock_configuration" sequence="2"/> <menuitem action="product.product_category_action_form" id="menu_product_category_config_stock" diff --git a/addons/stock/test/stock_demo_backorder.yml b/addons/stock/test/stock_demo_backorder.yml new file mode 100644 index 00000000000..986a59c7349 --- /dev/null +++ b/addons/stock/test/stock_demo_backorder.yml @@ -0,0 +1,65 @@ +- + In order to test partial delivery and back orders, I will use a delivery order with 5 CPU1 and 5 CPU3 +- + I confirm and force the availability of all products on the picking OUT001 +- + !python {model: stock.picking}: | + self.draft_force_assign(cr, uid, [ref('stock.stock_picking_1')], {}) + self.force_assign(cr, uid, [ref('stock.stock_picking_1')], {}) +- + After having confirmed the picking and its two lines, I add a new move line in draft state with 7 FAN2 +- + !record {model: stock.move, id: stock_move_3}: + product_id: product.product_product_fan2 + product_uom: product.product_uom_unit + product_uos_qty: 7.0 + product_qty: 7.0 + location_dest_id: stock.stock_location_customers + location_id: stock.stock_location_stock + name: CPU3, Processor AMD Athlon XP 1800 + picking_id: stock_picking_1 +- | + I click on 'Process Now' to process the delivery order and I change quantities to: + 7 CPU1, 0 CPU3, 3 FAN2 and a new product of 4 PC1 +- + !python {model: stock.picking}: | + result = self.action_process(cr, uid, [ref('stock.stock_picking_1')], {})['res_id'] + pick = self.pool.get('stock.partial.picking').browse(cr, uid, result, {}) + lobj = self.pool.get('stock.partial.picking.line') + for line in pick.move_ids: + if line.product_id.id == ref('product.product_product_cpu3'): + lobj.write(cr, uid, [line.id], { + 'quantity': 0.0 + }, {}) + elif line.product_id.id == ref('product.product_product_cpu1'): + lobj.write(cr, uid, [line.id], { + 'quantity': 7.0 + }, {}) + elif line.product_id.id == ref('product.product_product_fan2'): + lobj.write(cr, uid, [line.id], { + 'quantity': 3.0 + }, {}) + lobj.create(cr, uid, { + 'product_id': ref('product.product_product_pc1'), + 'quantity': 2.0, + 'product_uom': ref('product.product_uom_unit'), + 'location_id': ref('stock.stock_location_stock'), + 'location_dest_id': ref('stock.stock_location_customers'), + 'wizard_id': result + }, {}) + self.pool.get('stock.partial.picking').do_partial(cr, uid, [result], {}) +- + I test that the back order contains 5 CPU3, 4 FAN2 and nothing else +- + !python {model: stock.picking}: | + pick = self.browse(cr, uid, ref('stock.stock_picking_1'), {}) + for line in pick.move_lines: + if line.product_id.id == ref('product.product_product_cpu3'): + assert line.product_qty == 5.0, "Wrong quantity %.2f for CPU3 back order" % (line.product_qty,) + elif line.product_id.id == ref('product.product_product_fan2'): + assert line.product_qty == 4.0, "Wrong quantity %.2f for FAN2 back order" % (line.product_qty,) + elif line.product_id.id == ref('product.product_product_pc1'): + assert line.product_qty == 0.0, "Wrong quantity for PC1 back order" + else: + assert line.product_qty == 0.0, "Wrong quantity for %s back order" % (line.product_id.code,) + diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py index d617ea2b5da..f6ecb6511eb 100644 --- a/addons/stock/wizard/stock_partial_picking.py +++ b/addons/stock/wizard/stock_partial_picking.py @@ -88,7 +88,7 @@ class stock_partial_picking(osv.osv_memory): def _partial_move_for(self, cr, uid, move): partial_move = { 'product_id' : move.product_id.id, - 'quantity' : move.state == 'assigned' and move.product_qty or 0, + 'quantity' : move.state in ('assigned','new') and move.product_qty or 0, 'product_uom' : move.product_uom.id, 'prodlot_id' : move.prodlot_id.id, 'move_id' : move.id, @@ -121,7 +121,7 @@ class stock_partial_picking(osv.osv_memory): 'location_dest_id' : move.location_dest_id.id, 'picking_id': partial.picking_id.id },context=context) - stock_move.action_done(cr, uid, [move_id], context) + stock_move.action_confirm(cr, uid, [move_id], context) partial_data['move%s' % (move_id)] = { 'product_id': move.product_id.id, 'product_qty': move.quantity, @@ -134,4 +134,4 @@ class stock_partial_picking(osv.osv_memory): stock_picking.do_partial(cr, uid, [partial.picking_id.id], partial_data, context=context) return {'type': 'ir.actions.act_window_close'} -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po index a88e77396a1..a0879d0ff69 100644 --- a/addons/stock_invoice_directly/i18n/da.po +++ b/addons/stock_invoice_directly/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-03 16:58+0000\n" -"PO-Revision-Date: 2009-11-17 10:52+0000\n" -"Last-Translator: SmartWi <kurt@smartwi.net>\n" +"PO-Revision-Date: 2011-11-08 11:51+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:40+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: stock_invoice_directly #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking msgid "Partial Picking" -msgstr "" +msgstr "Delvis plukning" #. module: stock_invoice_directly #: model:ir.module.module,description:stock_invoice_directly.module_meta_information @@ -34,4 +34,4 @@ msgstr "" #. module: stock_invoice_directly #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information msgid "Invoice Picking Directly" -msgstr "Direkte faktura træk" +msgstr "Direkte faktura plukning" diff --git a/addons/stock_no_autopicking/i18n/da.po b/addons/stock_no_autopicking/i18n/da.po index b2937002baa..bdd4c196c8f 100644 --- a/addons/stock_no_autopicking/i18n/da.po +++ b/addons/stock_no_autopicking/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-03 16:58+0000\n" -"PO-Revision-Date: 2009-11-17 10:53+0000\n" -"Last-Translator: SmartWi <kurt@smartwi.net>\n" +"PO-Revision-Date: 2011-11-08 11:54+0000\n" +"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:32+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: stock_no_autopicking #: model:ir.model,name:stock_no_autopicking.model_product_product msgid "Product" -msgstr "Vare" +msgstr "Produkt" #. module: stock_no_autopicking #: model:ir.module.module,description:stock_no_autopicking.module_meta_information @@ -47,27 +47,27 @@ msgstr "Produktionsordre" #. module: stock_no_autopicking #: field:product.product,auto_pick:0 msgid "Auto Picking" -msgstr "Automatisk træk" +msgstr "Automatisk plukning" #. module: stock_no_autopicking #: help:product.product,auto_pick:0 msgid "Auto picking for raw materials of production orders." -msgstr "Automatisk træk af råmatriale i produktionsordre" +msgstr "Automatisk plukning af råmatriale i produktionsordre" #. module: stock_no_autopicking #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Fejl: Forkert EAN-kode" #. module: stock_no_autopicking #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information msgid "Stock No Auto-Picking" -msgstr "Ingen automatisk lagertræk" +msgstr "Ingen automatisk lagerplukning" #. module: stock_no_autopicking #: constraint:mrp.production:0 msgid "Order quantity cannot be negative or zero !" -msgstr "" +msgstr "Ordre antal kan ikke være negativ eller 0." #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Ugyldig XML for View Architecture!" diff --git a/addons/survey/test/survey00.yml b/addons/survey/test/survey00.yml index fa56e9fac39..ab34f62f65e 100644 --- a/addons/survey/test/survey00.yml +++ b/addons/survey/test/survey00.yml @@ -147,7 +147,7 @@ id = self.create(cr, uid, {'survey_id': ref("survey_partner_0")}) self.action_next(cr, uid, [id], context) - - Give answer of the first and second page in "Partner Feedback" suvey. + Give answer of the first and second page in "Partner Feedback" survey. - !python {model: survey.question.wiz}: | ids = self.create(cr, uid, {str(ref("survey_p_question_0")) +"_single" :'Tiny' , str(ref("survey_p_question_1")) + "_selection" :int(ref("survey_p_1_1"))}, context) diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py index 332b74cc660..f913f922c55 100644 --- a/addons/survey/wizard/survey_answer.py +++ b/addons/survey/wizard/survey_answer.py @@ -42,7 +42,8 @@ class survey_question_wiz(osv.osv_memory): """ Fields View Get method :- generate the new view and display the survey pages of selected survey. """ - + if context is None: + context = {} result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, \ view_type, context, toolbar,submenu) @@ -55,8 +56,7 @@ class survey_question_wiz(osv.osv_memory): que_col_head = self.pool.get('survey.question.column.heading') user_obj = self.pool.get('res.users') mail_message = self.pool.get('mail.message') - if context is None: - context = {} + if view_type in ['form']: wiz_id = 0 sur_name_rec = None @@ -407,21 +407,13 @@ class survey_question_wiz(osv.osv_memory): attachments[survey_data.title + ".pdf"] = file_data file.close() os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf") - user_email = False - resp_email = False - - address_id = user_obj.browse(cr, uid, uid).address_id.id - if address_id: - cr.execute("select email from res_partner_address where id =%s", (address_id,)) - user_email = cr.fetchone()[0] - resp_id = survey_data.responsible_id.address_id - - if resp_id: - cr.execute("select email from res_partner_address where id =%s", (resp_id.id,)) - resp_email = cr.fetchone()[0] + + user_email = user_obj.browse(cr, uid, uid, context).user_email + resp_email = survey_data.responsible_id and survey_data.responsible_id.user_email or False + if user_email and resp_email: user_name = user_obj.browse(cr, uid, uid, context=context).name - mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks," + mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " has given the Response Of " + survey_data.title + " Survey.\nThe Response has been attached herewith.\n\n Thanks." mail_message.schedule_with_attach(cr, uid, user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attachments=attachments, context=context) xml_form = etree.Element('form', {'string': _('Complete Survey Answer')}) @@ -520,9 +512,10 @@ class survey_question_wiz(osv.osv_memory): return value if context.has_key('active') and context.get('active',False): return value - + sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False)) ans_list = [] + for key,val in safe_eval(sur_name_read.get('store_ans',"{}")).items(): for field in fields_list: if field in list(val): @@ -535,8 +528,10 @@ class survey_question_wiz(osv.osv_memory): Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception. """ if context is None: context = {} + + survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, vals, context=context) if context.has_key('active') and context.get('active',False): - return True + return survey_question_wiz_id for key,val in vals.items(): if key.split('_')[0] == "progress": @@ -982,7 +977,7 @@ class survey_question_wiz(osv.osv_memory): if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and que_rec['is_require_answer'] and select_count <= 0: raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])) - return True + return survey_question_wiz_id def action_new_question(self,cr, uid, ids, context=None): """ diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py index a803459899c..82c9fd385ed 100644 --- a/addons/survey/wizard/survey_selection.py +++ b/addons/survey/wizard/survey_selection.py @@ -41,6 +41,7 @@ class survey_name_wiz(osv.osv_memory): 'transfer': 1, 'response': 0, 'survey_id': lambda self,cr,uid,context:context.get('survey_id',False), + 'store_ans': '{}' #Setting the default pattern as '{}' as the field is of type text. The field always gets the value in dict format } def action_next(self, cr, uid, ids, context=None): @@ -68,7 +69,6 @@ class survey_name_wiz(osv.osv_memory): raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance.")) search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')]) - return { 'view_type': 'form', "view_mode": 'form', diff --git a/addons/thunderbird/i18n/da.po b/addons/thunderbird/i18n/da.po index 7d8794fd4ec..f098ae333f9 100644 --- a/addons/thunderbird/i18n/da.po +++ b/addons/thunderbird/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-09-22 20:28+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-09 21:50+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" "Language-Team: Danish <da@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: 2011-11-05 05:41+0000\n" -"X-Generator: Launchpad (build 14231)\n" +"X-Launchpad-Export-Date: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" #. module: thunderbird #: field:thunderbird.installer,plugin_file:0 @@ -50,7 +50,7 @@ msgstr "" #. module: thunderbird #: view:thunderbird.installer:0 msgid "_Close" -msgstr "" +msgstr "_Luk" #. module: thunderbird #: field:thunderbird.installer,pdf_file:0 @@ -65,7 +65,7 @@ msgstr "Beskrivelse:" #. module: thunderbird #: view:thunderbird.installer:0 msgid "title" -msgstr "" +msgstr "titel" #. module: thunderbird #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird @@ -94,7 +94,7 @@ msgstr "" #: field:thunderbird.installer,name:0 #: field:thunderbird.installer,pdf_name:0 msgid "File name" -msgstr "Fil Navn" +msgstr "Filnavn" #. module: thunderbird #: view:thunderbird.installer:0 @@ -104,7 +104,7 @@ msgstr "" #. module: thunderbird #: field:thunderbird.installer,progress:0 msgid "Configuration Progress" -msgstr "" +msgstr "Konfigurationsfremgang" #. module: thunderbird #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py index fad6f7fbe7e..adab3ff892c 100644 --- a/addons/users_ldap/__openerp__.py +++ b/addons/users_ldap/__openerp__.py @@ -50,6 +50,13 @@ anonymous authentication for users, it is only for the master LDAP account that is used to verify if a user exists before attempting to authenticate it. +Securing the connection with STARTTLS is available for LDAP +servers supporting it, by enabling the TLS option in the LDAP +configuration. + +For further options configuring the LDAP settings, refer to the +ldap.conf manpage :manpage:`ldap.conf(5)`. + Security Considerations +++++++++++++++++++++++ Users' LDAP passwords are never stored in the OpenERP database, @@ -78,6 +85,9 @@ OpenERP database (which means no access), the first step always fails and the LDAP server is queried to do the authentication. +Enabling STARTTLS ensures that the authentication query to the +LDAP server is encrypted. + User Template +++++++++++++ In the LDAP configuration on the Company form, it is possible to diff --git a/addons/users_ldap/users_ldap.py b/addons/users_ldap/users_ldap.py index 92ac59b9bb2..1ad1b2df104 100644 --- a/addons/users_ldap/users_ldap.py +++ b/addons/users_ldap/users_ldap.py @@ -18,20 +18,188 @@ # ############################################################################## -from osv import fields, osv -import pooler -import tools -import logging import ldap +import logging from ldap.filter import filter_format import openerp.exceptions - +import pooler +import tools +from osv import fields, osv +from openerp import SUPERUSER_ID class CompanyLDAP(osv.osv): _name = 'res.company.ldap' _order = 'sequence' _rec_name = 'ldap_server' + + def get_ldap_dicts(self, cr, ids=None): + """ + Retrieve res_company_ldap resources from the database in dictionary + format. + + :param list ids: Valid ids of model res_company_ldap. If not \ + specified, process all resources (unlike other ORM methods). + :return: ldap configurations + :rtype: list of dictionaries + """ + + if ids: + id_clause = 'AND id IN (%s)' + args = [tuple(ids)] + else: + id_clause = '' + args = [] + cr.execute(""" + SELECT id, company, ldap_server, ldap_server_port, ldap_binddn, + ldap_password, ldap_filter, ldap_base, "user", create_user, + ldap_tls + FROM res_company_ldap + WHERE ldap_server != '' """ + id_clause + """ ORDER BY sequence + """, args) + return cr.dictfetchall() + + def connect(self, conf): + """ + Connect to an LDAP server specified by an ldap + configuration dictionary. + + :param dict conf: LDAP configuration + :return: an LDAP object + """ + + uri = 'ldap://%s:%d' % (conf['ldap_server'], + conf['ldap_server_port']) + + connection = ldap.initialize(uri) + if conf['ldap_tls']: + connection.start_tls_s() + return connection + + def authenticate(self, conf, login, password): + """ + Authenticate a user against the specified LDAP server. + + In order to prevent an unintended 'unauthenticated authentication', + which is an anonymous bind with a valid dn and a blank password, + check for empty passwords explicitely (:rfc:`4513#section-6.3.1`) + + :param dict conf: LDAP configuration + :param login: username + :param password: Password for the LDAP user + :return: LDAP entry of authenticated user or False + :rtype: dictionary of attributes + """ + + if not password: + return False + + entry = False + filter = filter_format(conf['ldap_filter'], (login,)) + try: + results = self.query(conf, filter) + if results and len(results) == 1: + dn = results[0][0] + conn = self.connect(conf) + conn.simple_bind_s(dn, password) + conn.unbind() + entry = results[0] + except ldap.INVALID_CREDENTIALS: + return False + except ldap.LDAPError, e: + logger = logging.getLogger('orm.ldap') + logger.error('An LDAP exception occurred: %s', e) + return entry + + def query(self, conf, filter, retrieve_attributes=None): + """ + Query an LDAP server with the filter argument and scope subtree. + + Allow for all authentication methods of the simple authentication + method: + + - authenticated bind (non-empty binddn + valid password) + - anonymous bind (empty binddn + empty password) + - unauthenticated authentication (non-empty binddn + empty password) + + .. seealso:: + :rfc:`4513#section-5.1` - LDAP: Simple Authentication Method. + + :param dict conf: LDAP configuration + :param filter: valid LDAP filter + :param list retrieve_attributes: LDAP attributes to be retrieved. \ + If not specified, return all attributes. + :return: ldap entries + :rtype: list of tuples (dn, attrs) + + """ + + results = [] + logger = logging.getLogger('orm.ldap') + try: + conn = self.connect(conf) + conn.simple_bind_s(conf['ldap_binddn'] or '', + conf['ldap_password'] or '') + results = conn.search_st(conf['ldap_base'], ldap.SCOPE_SUBTREE, + filter, retrieve_attributes, timeout=60) + conn.unbind() + except ldap.INVALID_CREDENTIALS: + logger.error('LDAP bind failed.') + except ldap.LDAPError, e: + logger.error('An LDAP exception occurred: %s', e) + return results + + def map_ldap_attributes(self, cr, uid, conf, login, ldap_entry): + """ + Compose values for a new resource of model res_users, + based upon the retrieved ldap entry and the LDAP settings. + + :param dict conf: LDAP configuration + :param login: the new user's login + :param tuple ldap_entry: single LDAP result (dn, attrs) + :return: parameters for a new resource of model res_users + :rtype: dict + """ + + values = { 'name': ldap_entry[1]['cn'][0], + 'login': login, + 'company_id': conf['company'] + } + return values + + def get_or_create_user(self, cr, uid, conf, login, ldap_entry, + context=None): + """ + Retrieve an active resource of model res_users with the specified + login. Create the user if it is not initially found. + + :param dict conf: LDAP configuration + :param login: the user's login + :param tuple ldap_entry: single LDAP result (dn, attrs) + :return: res_users id + :rtype: int + """ + + user_id = False + login = tools.ustr(login) + cr.execute("SELECT id, active FROM res_users WHERE login=%s", (login,)) + res = cr.fetchone() + if res: + if res[1]: + user_id = res[0] + elif conf['create_user']: + logger = logging.getLogger('orm.ldap') + logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login) + user_obj = self.pool.get('res.users') + values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry) + if conf['user']: + user_id = user_obj.copy(cr, SUPERUSER_ID, conf['user'], + default={'active': True}) + user_obj.write(cr, SUPERUSER_ID, user_id, values) + else: + user_id = user_obj.create(cr, SUPERUSER_ID, values) + return user_id + _columns = { 'sequence': fields.integer('Sequence'), 'company': fields.many2one('res.company', 'Company', required=True, @@ -50,12 +218,16 @@ class CompanyLDAP(osv.osv): help="Model used for user creation"), 'create_user': fields.boolean('Create user', help="Create the user if not in database"), + 'ldap_tls': fields.boolean('Use TLS', + help="Request secure TLS/SSL encryption when connecting to the LDAP server. " + "This option requires a server with STARTTLS enabled, " + "otherwise all authentication attempts will fail."), } _defaults = { - 'ldap_server': lambda *a: '127.0.0.1', - 'ldap_server_port': lambda *a: 389, - 'sequence': lambda *a: 10, - 'create_user': lambda *a: True, + 'ldap_server': '127.0.0.1', + 'ldap_server_port': 389, + 'sequence': 10, + 'create_user': True, } CompanyLDAP() @@ -64,87 +236,32 @@ CompanyLDAP() class res_company(osv.osv): _inherit = "res.company" _columns = { - 'ldaps': fields.one2many('res.company.ldap', 'company', 'LDAP Parameters'), + 'ldaps': fields.one2many( + 'res.company.ldap', 'company', 'LDAP Parameters'), } res_company() + class users(osv.osv): _inherit = "res.users" def login(self, db, login, password): - - if not password: - # empty passwords are disallowed for obvious security reasons - return False - - ret = super(users,self).login(db, login, password) - if ret: - return ret - logger = logging.getLogger('orm.ldap') - pool = pooler.get_pool(db) + user_id = super(users, self).login(db, login, password) + if user_id: + return user_id cr = pooler.get_db(db).cursor() - action_obj = pool.get('ir.actions.actions') - cr.execute(""" - SELECT id, company, ldap_server, ldap_server_port, ldap_binddn, ldap_password, - ldap_filter, ldap_base, "user", create_user - FROM res_company_ldap - WHERE ldap_server != '' ORDER BY sequence""") - for res_company_ldap in cr.dictfetchall(): - logger.debug(res_company_ldap) - try: - l = ldap.open(res_company_ldap['ldap_server'], res_company_ldap['ldap_server_port']) - # An empty binddn means anonymous auth, so it should be replaced w/ an empty string - # See LDAP RFC 4513, Section 5.1.1 - if l.simple_bind_s(res_company_ldap['ldap_binddn'] or '', - res_company_ldap['ldap_password'] or ''): - base = res_company_ldap['ldap_base'] - scope = ldap.SCOPE_SUBTREE - filter = filter_format(res_company_ldap['ldap_filter'], (login,)) - retrieve_attributes = None - result_id = l.search(base, scope, filter, retrieve_attributes) - timeout = 60 - result_type, result_data = l.result(result_id, timeout) - if not result_data: - continue - if result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1: - dn = result_data[0][0] - logger.debug(dn) - name = result_data[0][1]['cn'][0] - if l.bind_s(dn, password): - l.unbind() - cr.execute("SELECT id FROM res_users WHERE login=%s",(tools.ustr(login),)) - res = cr.fetchone() - logger.debug(res) - if res: - cr.close() - return res[0] - if not res_company_ldap['create_user']: - continue - action_id = action_obj.search(cr, 1, [('usage', '=', 'menu')])[0] - if res_company_ldap['user']: - res = self.copy(cr, 1, res_company_ldap['user'], - default={'active': True}) - self.write(cr, 1, res, { - 'name': name, - 'login': login.encode('utf-8'), - 'company_id': res_company_ldap['company'], - }) - else: - res = self.create(cr, 1, { - 'name': name, - 'login': login.encode('utf-8'), - 'company_id': res_company_ldap['company'], - 'action_id': action_id, - 'menu_id': action_id, - }) - cr.commit() - cr.close() - return res - l.unbind() - except Exception: - logger.warning("Cannot auth", exc_info=True) - continue + ldap_obj = pooler.get_pool(db).get('res.company.ldap') + for conf in ldap_obj.get_ldap_dicts(cr): + entry = ldap_obj.authenticate(conf, login, password) + if entry: + user_id = ldap_obj.get_or_create_user( + cr, SUPERUSER_ID, conf, login, entry) + if user_id: + cr.execute('UPDATE res_users SET date=now() WHERE ' + 'login=%s', (tools.ustr(login),)) + cr.commit() + break cr.close() - return False + return user_id def check(self, db, uid, passwd): try: @@ -152,44 +269,19 @@ class users(osv.osv): except openerp.exceptions.AccessDenied: pass - if not passwd: - # empty passwords disallowed for obvious security reasons - raise openerp.exceptions.AccessDenied() - cr = pooler.get_db(db).cursor() - user = self.browse(cr, 1, uid) - logger = logging.getLogger('orm.ldap') - if user and user.company_id.ldaps: - for res_company_ldap in user.company_id.ldaps: - try: - l = ldap.open(res_company_ldap.ldap_server, res_company_ldap.ldap_server_port) - # An empty binddn means anonymous auth, so it should be replaced w/ an empty string - # See LDAP RFC 4513, Section 5.1.1 - if l.simple_bind_s(res_company_ldap.ldap_binddn or '', - res_company_ldap.ldap_password or ''): - base = res_company_ldap.ldap_base - scope = ldap.SCOPE_SUBTREE - filter = filter_format(res_company_ldap.ldap_filter, (user.login,)) - retrieve_attributes = None - result_id = l.search(base, scope, filter, retrieve_attributes) - timeout = 60 - result_type, result_data = l.result(result_id, timeout) - if result_data and result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1: - dn = result_data[0][0] - # some LDAP servers allow anonymous binding with blank passwords, - # but these have been rejected above, so we're safe to use bind() - if l.bind_s(dn, passwd): - l.unbind() - self._uid_cache.setdefault(db, {})[uid] = passwd - cr.close() - return True - l.unbind() - except Exception: - logger.warning('cannot check', exc_info=True) - pass + cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE', + (int(uid),)) + res = cr.fetchone() + if res: + ldap_obj = pooler.get_pool(db).get('res.company.ldap') + for conf in ldap_obj.get_ldap_dicts(cr): + if ldap_obj.authenticate(conf, res[0], passwd): + self._uid_cache.setdefault(db, {})[uid] = passwd + cr.close() + return True cr.close() raise openerp.exceptions.AccessDenied() users() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml index b055ef2938d..caece7efe8f 100644 --- a/addons/users_ldap/users_ldap_view.xml +++ b/addons/users_ldap/users_ldap_view.xml @@ -20,6 +20,7 @@ <field name="user"/> <newline/> <field name="sequence"/> + <field name="ldap_tls"/> </form> <tree string="LDAP Configuration"> <field name="sequence"/> diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py index 0731b003dbc..750c4ca7ec5 100644 --- a/addons/web_livechat/__openerp__.py +++ b/addons/web_livechat/__openerp__.py @@ -39,6 +39,9 @@ Add "Support" button in header from where you can access OpenERP Support. 'css' : [ 'static/src/css/lc.css', ], + 'qweb' : [ + "static/src/xml/*.xml", + ], 'installable': True, 'active': False, 'certificate': '0013762192410413', diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js index 6fed859449c..13c4bbe28d4 100644 --- a/addons/web_livechat/static/src/js/web_livechat.js +++ b/addons/web_livechat/static/src/js/web_livechat.js @@ -22,29 +22,6 @@ var __lc_buttons = []; openerp.web_livechat = function (openerp) { -var QWeb = openerp.web.qweb; -QWeb.add_template('/web_livechat/static/src/xml/web_livechat.xml'); - - -// tracking code from LiveChat -var license = '1035052', - params = '', - lang = 'en', - skill = '0'; -__lc_load = function (p) { if (typeof __lc_loaded != 'function') - if (p) { var d = document, l = d.createElement('script'), s = - d.getElementsByTagName('script')[0], a = unescape('%26'), - h = ('https:' == d.location.protocol ? 'https://' : 'http://'); l.type = 'text/javascript'; l.async = true; - l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load'; - if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) { - l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill; - l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params)); s.parentNode.insertBefore(l, s); - } else setTimeout(__lc_load, 1000); if(typeof __lc_serv != 'string'){ s.parentNode.insertBefore(l, s);} - } else __lc_load(Math.ceil(Math.random()*5)); } -__lc_load(); - - - openerp.web_livechat.Livechat = openerp.web.Widget.extend({ template: 'Header-LiveChat', @@ -94,7 +71,27 @@ openerp.web_livechat.Livechat = openerp.web.Widget.extend({ } }); -openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient); -openerp.webclient.livechat.prependTo('div.header_corner'); +if (openerp.webclient) { + // tracking code from LiveChat + var license = '1035052', + params = '', + lang = 'en', + skill = '0'; + __lc_load = function (p) { if (typeof __lc_loaded != 'function') + if (p) { var d = document, l = d.createElement('script'), s = + d.getElementsByTagName('script')[0], a = unescape('%26'), + h = ('https:' == d.location.protocol ? 'https://' : 'http://'); l.type = 'text/javascript'; l.async = true; + l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load'; + if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) { + l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill; + l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params)); s.parentNode.insertBefore(l, s); + } else setTimeout(__lc_load, 1000); if(typeof __lc_serv != 'string'){ s.parentNode.insertBefore(l, s);} + } else __lc_load(Math.ceil(Math.random()*5)); } + __lc_load(); + + // and add widget to webclient + openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient); + openerp.webclient.livechat.prependTo('div.header_corner'); +} }; diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py index 65f953ed3d1..64b443be3e2 100644 --- a/addons/web_uservoice/__openerp__.py +++ b/addons/web_uservoice/__openerp__.py @@ -39,5 +39,8 @@ Invite OpenERP user feedback, powered by uservoice. 'js': ['static/src/js/web_uservoice.js'], 'css': ['static/src/css/uservoice.css'], + 'qweb' : [ + "static/src/xml/*.xml", + ], 'images': ['static/src/img/submit_an_idea.jpeg', 'static/src/img/web_uservoice_feedback.jpeg'], } diff --git a/addons/web_uservoice/static/src/js/web_uservoice.js b/addons/web_uservoice/static/src/js/web_uservoice.js index a574652686f..4110f149300 100644 --- a/addons/web_uservoice/static/src/js/web_uservoice.js +++ b/addons/web_uservoice/static/src/js/web_uservoice.js @@ -1,15 +1,6 @@ openerp.web_uservoice = function(instance) { -var QWeb = instance.web.qweb; -QWeb.add_template('/web_uservoice/static/src/xml/web_uservoice.xml'); - -$(function() { - var src = ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js"; - $.getScript(src); -}); - - instance.web_uservoice.UserVoice = instance.web.Widget.extend({ template: 'Header-UserVoice', default_forum: '77459', @@ -73,8 +64,15 @@ instance.web_uservoice.UserVoice = instance.web.Widget.extend({ }); -instance.webclient.uservoice = new instance.web_uservoice.UserVoice(instance.webclient); -instance.webclient.uservoice.prependTo('div.header_corner'); +if (instance.webclient) { + $(function() { + var src = ("https:" == document.location.protocol ? "https://" : "http://") + "cdn.uservoice.com/javascripts/widgets/tab.js"; + $.getScript(src); + }); + + instance.webclient.uservoice = new instance.web_uservoice.UserVoice(instance.webclient); + instance.webclient.uservoice.prependTo('div.header_corner'); +} }; diff --git a/addons/wiki_sale_faq/i18n/da.po b/addons/wiki_sale_faq/i18n/da.po new file mode 100644 index 00000000000..6a60c08ca2c --- /dev/null +++ b/addons/wiki_sale_faq/i18n/da.po @@ -0,0 +1,70 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:16+0000\n" +"PO-Revision-Date: 2011-11-09 20:09+0000\n" +"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n" +"Language-Team: Danish <da@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: 2011-11-10 04:58+0000\n" +"X-Generator: Launchpad (build 14263)\n" + +#. module: wiki_sale_faq +#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form +#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files +#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales +msgid "Documents" +msgstr "Dokumenter" + +#. module: wiki_sale_faq +#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test +msgid "Wiki Pages" +msgstr "" + +#. module: wiki_sale_faq +#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki +msgid "FAQ" +msgstr "FAQ" + +#. module: wiki_sale_faq +#: model:ir.module.module,description:wiki_sale_faq.module_meta_information +msgid "" +"This module provides a wiki FAQ Template\n" +" " +msgstr "" +"Dette modul leverer en wiki FAQ skabelon\n" +" " + +#. module: wiki_sale_faq +#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test +msgid "" +"Wiki pages allow you to share ideas and questions with coworkers. You can " +"create a new document that can be linked to one or several applications " +"(specifications of a project, FAQ for sales teams, etc.). Keywords can be " +"used to easily tag wiki pages. You should use this application with the " +"OpenERP web client interface." +msgstr "" + +#. module: wiki_sale_faq +#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information +msgid "Wiki -Sale - FAQ" +msgstr "" + +#. module: wiki_sale_faq +#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form +msgid "" +"Documents give you access to all files attached to any record. It is a " +"repository of all documents such as emails, project-related attachments or " +"any other documents. From this view, you can search through the content of " +"the documents. OpenERP automatically assign meta data based on the record " +"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW " +"and .PDF documents." +msgstr "" |