pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port of branch 8.0 up to 591e329

Browse Source
This commit is contained in:
Christophe Simonis
2014-12-02 16:18:08 +01:00
parent 7878b2fd0c 591e329bb0
commit 1d3f8eba87
881 changed files with 219811 additions and 20608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/analytic_user_function/analytic_user_function_view.xml
+2 -2
View File
@@ -65,8 +65,8 @@
<field name="priority" eval="18"/>
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" context="{'default_invoice_on_timesheets': 1}"/>
<xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="attributes">
<attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute>
</xpath>
</field>
</record>
addons/analytic_user_function/i18n/mk.po
+11 -11
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-08-14 13:08+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2014-11-07 14:51+0000\n"
"Last-Translator: Tome Barbov <tome.barbov@eskon.com.mk>\n"
"Language-Team: Macedonian <mk@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: 2014-08-15 06:54+0000\n"
"X-Generator: Launchpad (build 17156)\n"
"X-Launchpad-Export-Date: 2014-11-08 06:21+0000\n"
"X-Generator: Launchpad (build 17231)\n"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,account_id:0
@@ -31,12 +31,12 @@ msgstr "Аналитичка ставка"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,create_uid:0
msgid "Created by"
msgstr ""
msgstr "Креирано од"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,create_date:0
msgid "Created on"
msgstr ""
msgstr "Креирано на"
#. module: analytic_user_function
#: view:account.analytic.account:analytic_user_function.view_account_analytic_account_form_inherit
@@ -63,12 +63,12 @@ msgstr "Грешка!"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,id:0
msgid "ID"
msgstr ""
msgstr "ID"
#. module: analytic_user_function
#: view:account.analytic.account:analytic_user_function.view_account_analytic_account_form_inherit
msgid "Invoice Price Rate per User"
msgstr ""
msgstr "Стапка на фактурирана цена по корисник"
#. module: analytic_user_function
#: view:analytic.user.funct.grid:analytic_user_function.analytic_user_funct_grid_form
@@ -79,12 +79,12 @@ msgstr "Податоци за фактурирање"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,write_uid:0
msgid "Last Updated by"
msgstr ""
msgstr "Последно ажурирање од"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,write_date:0
msgid "Last Updated on"
msgstr ""
msgstr "Последно ажурирање на"
#. module: analytic_user_function
#: view:account.analytic.account:analytic_user_function.view_account_analytic_account_form_inherit
@@ -121,7 +121,7 @@ msgstr "Услуга"
#: code:addons/analytic_user_function/analytic_user_function.py:138
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
msgstr "Нема дефинирано сметка за трошоци за овој производ: \"%s\" (id:%d)"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
addons/analytic_user_function/i18n/tr.po
+14 -10
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-08-14 13:08+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2014-10-13 18:25+0000\n"
"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
"Language-Team: Turkish <tr@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: 2014-08-15 06:54+0000\n"
"X-Generator: Launchpad (build 17156)\n"
"X-Launchpad-Export-Date: 2014-10-15 20:29+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,account_id:0
@@ -31,12 +31,12 @@ msgstr "Analiz Kaleml"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,create_uid:0
msgid "Created by"
msgstr ""
msgstr "Oluşturan"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,create_date:0
msgid "Created on"
msgstr ""
msgstr "Oluşturma"
#. module: analytic_user_function
#: view:account.analytic.account:analytic_user_function.view_account_analytic_account_form_inherit
@@ -62,7 +62,7 @@ msgstr "Hata!"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,id:0
msgid "ID"
msgstr ""
msgstr "ID"
#. module: analytic_user_function
#: view:account.analytic.account:analytic_user_function.view_account_analytic_account_form_inherit
@@ -78,12 +78,12 @@ msgstr "Faturalama Tarihi"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,write_uid:0
msgid "Last Updated by"
msgstr ""
msgstr "Son Güncelleyen"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,write_date:0
msgid "Last Updated on"
msgstr ""
msgstr "Son Güncelleme"
#. module: analytic_user_function
#: view:account.analytic.account:analytic_user_function.view_account_analytic_account_form_inherit
@@ -94,6 +94,10 @@ msgid ""
" specific user. This allows to set invoicing\n"
" conditions for a group of contracts."
msgstr ""
"Odoo belirli bir kullanıcı için belirli koşulların tanımlanıp\n"
" tanımlanmadığını ana hesaplarda yinelemeli\n"
" olarak arayacaktır. Bu bir grup sözleşme için\n"
" fatura ayarlanmasını sağlayacaktır."
#. module: analytic_user_function
#: field:analytic.user.funct.grid,price:0
@@ -120,7 +124,7 @@ msgstr "Hizmet"
#: code:addons/analytic_user_function/analytic_user_function.py:138
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
msgstr "Bu ürün için gider hesabı tanımlanmamıştır: \"%s\" (id:%d)"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
addons/analytic_user_function/i18n/zh_CN.po
+6 -6
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-08-14 13:08+0000\n"
"PO-Revision-Date: 2014-08-14 16:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2014-11-10 04:59+0000\n"
"Last-Translator: 卓忆科技 <zhanghao@jointd.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@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: 2014-08-15 06:54+0000\n"
"X-Generator: Launchpad (build 17156)\n"
"X-Launchpad-Export-Date: 2014-11-11 07:37+0000\n"
"X-Generator: Launchpad (build 17241)\n"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,account_id:0
@@ -31,12 +31,12 @@ msgstr "辅助核算明细"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,create_uid:0
msgid "Created by"
msgstr ""
msgstr "创建者"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,create_date:0
msgid "Created on"
msgstr ""
msgstr "创建于"
#. module: analytic_user_function
#: view:account.analytic.account:analytic_user_function.view_account_analytic_account_form_inherit