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

[MERGE] merged with main trunk

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20120702092449-2bske1no2mq6n5zf
This commit is contained in:
Quentin (OpenERP)
2012-07-02 11:24:49 +02:00
parent fae0317a6f 9c9141cc65
commit e9b2abb138
64 changed files with 1698 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_invoice_report_view.xml
+9 -4
View File
@@ -56,6 +56,11 @@
<field name="arch" type="xml">
<search string="Invoices Analysis">
<group>
<filter icon="terp-go-year" string="Year"
name="year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
help="year"/>
<separator orientation="vertical"/>
<field name="date"/>
<separator orientation="vertical"/>
<filter string="Draft"
@@ -98,6 +103,9 @@
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
<separator orientation="vertical"/>
@@ -106,15 +114,12 @@
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
<separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
<filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
<filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
</group>
</search>
</field>
addons/google_map/i18n/ar.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/bg.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/br.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/bs.po
+4 -4
View File
@@ -13,18 +13,18 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
msgid "Map"
msgstr ""
msgstr "Mapa"
#. module: google_map
#: model:ir.model,name:google_map.model_res_partner_address
msgid "Partner Addresses"
msgstr ""
msgstr "Adrese partnera"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/ca.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/cs.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/da.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/de.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/el.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/en_GB.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/es.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/es_AR.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/es_CR.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-14 05:43+0000\n"
"X-Generator: Launchpad (build 14781)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
"Language: \n"
#. module: google_map
addons/google_map/i18n/es_EC.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/es_PY.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/et.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/eu.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/fi.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/fr.po
+3 -3
View File
@@ -14,13 +14,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
msgid "Map"
msgstr "Carte"
msgstr "Plan/Carte"
#. module: google_map
#: model:ir.model,name:google_map.model_res_partner_address
addons/google_map/i18n/gl.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/gu.po
+5 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-03-07 05:13+0000\n"
"X-Generator: Launchpad (build 14907)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
@@ -31,3 +31,6 @@ msgstr ""
#: view:res.partner:0
msgid "Street2 : "
msgstr ""
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "દ્રશ્ય બંધારણ માટે અમાન્ય એક્સ.એમ.એલ!"
addons/google_map/i18n/hi.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/hr.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/hu.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/id.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/it.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/ja.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-02 04:37+0000\n"
"X-Generator: Launchpad (build 15032)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/ko.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/lo.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/lt.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/lv.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/mk.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/mn.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/nb.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/nl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/nl_BE.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/oc.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/pl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/pt.po
+14 -11
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
@@ -24,23 +24,26 @@ msgstr "Mapa"
#. module: google_map
#: model:ir.model,name:google_map.model_res_partner_address
msgid "Partner Addresses"
msgstr "Endereços do Terceiro"
msgstr "Endereços do Parceiro"
#. module: google_map
#: view:res.partner:0
msgid "Street2 : "
msgstr "Rua2 : "
#~ msgid ""
#~ "The module adds google map field in partner address\n"
#~ "so that we can directly open google map from the\n"
#~ "url widget."
#~ msgstr ""
#~ "Este modulo adiciona o campo google map no endereço do terceiro\n"
#~ "assim é possivel abrir directamente o googe mapa a partir de um url widget."
#~ msgid "Launch Google Map"
#~ msgstr "Iniciar Google Map"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML inválido para a arquitectura da vista!"
#~ msgid "Google Map"
#~ msgstr "Mapa Google"
#~ msgid ""
#~ "The module adds google map field in partner address\n"
#~ "so that we can directly open google map from the\n"
#~ "url widget."
#~ msgstr ""
#~ "Este módulo adiciona o campo google map no endereço do parceiro\n"
#~ "assim é possivel abrir diretamente o google mapa a partir de um url widget."
addons/google_map/i18n/pt_BR.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/ro.po
+4 -4
View File
@@ -13,13 +13,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
msgid "Map"
msgstr "Hartă"
msgstr "Harta"
#. module: google_map
#: model:ir.model,name:google_map.model_res_partner_address
@@ -29,7 +29,7 @@ msgstr "Adresele partenerului"
#. module: google_map
#: view:res.partner:0
msgid "Street2 : "
msgstr "Stradă2 "
msgstr "Strada2 "
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
addons/google_map/i18n/ru.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/sk.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/sl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/sq.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/sr.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/sr@latin.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/sv.po
+4 -4
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
@@ -24,12 +24,12 @@ msgstr "Karta"
#. module: google_map
#: model:ir.model,name:google_map.model_res_partner_address
msgid "Partner Addresses"
msgstr "Partner Adress"
msgstr "Företagsadress"
#. module: google_map
#: view:res.partner:0
msgid "Street2 : "
msgstr "Adress2: "
msgstr "Gata 2: "
#~ msgid "Launch Google Map"
#~ msgstr "Starta Google Map"
addons/google_map/i18n/tlh.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/tr.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/uk.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/vi.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/zh_CN.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/google_map/i18n/zh_TW.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-06-30 05:08+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: google_map
#: view:res.partner:0
addons/hr_recruitment/hr_recruitment_view.xml
+50 -60
View File
@@ -257,7 +257,6 @@
<field name="arch" type="xml">
<kanban default_group_by="stage_id">
<field name="color"/>
<field name="state" groups="base.group_no_one"/>
<field name="priority"/>
<field name="survey"/>
<field name="user_id"/>
@@ -265,68 +264,59 @@
<field name="partner_name"/>
<field name="type_id"/>
<field name="job_id"/>
<field name="title_action"/>
<templates>
<t t-name="kanban-box">
<t t-if="record.priority.raw_value == '1'" t-set="border">oe_kanban_color_green</t>
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<li><a type="edit">Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
<field name="title_action"/>
<field name="department_id"/>
<templates>
<t t-name="kanban-tooltip">
<ul class="oe_kanban_tooltip">
<li t-if="record.type_id.raw_value"><b>Degree:</b> <field name="type_id"/></li>
<li t-if="record.partner_id.raw_value"><b>Contact:</b> <field name="partner_id"/></li>
<li t-if="record.department_id.raw_value"><b>Departement:</b> <field name="department_id"/></li>
</ul>
</t>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<li><a type="edit">Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
</div>
<div class="oe_kanban_content" tooltip="kanban-tooltip">
<div>
<b><field name="name"/></b><br/>
<field name="job_id"/><br/>
<t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
<t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
<field name="date_action"/>
</div>
<div class="oe_kanban_content" >
<h3 class="oe_kanban_ellipsis"><field name="name"/>
</h3>
<div style="margin-bottom:2;padding-top:5px;white-space: nowrap;" >
<field name="partner_name"/>
<div class="oe_kanban_right">
<span class="oe_kanban_highlight">
<t t-set="priority" t-value="record.priority.raw_value || 5"/>
<a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
<img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
</a>
<a type="object" name="set_priority" args="['5']" t-if="priority lte 3">
<img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
</a>
<a type="object" name="set_priority" args="['2']">
<img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
</a>
<a type="object" name="set_priority" args="['1']">
<img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
</a>
</span>
</div>
</div>
<div style="white-space: nowrap;" >
<div t-if="record.type_id.raw_value">
(<field name="type_id"/>)
</div>
</div>
<div style="padding-top:5px;white-space: nowrap;" >
<t t-if="record.job_id.raw_value">Applied for <field name="job_id" /></t>
</div>
<div style="padding-top:5px;white-space: nowrap;" >
<t t-if="record.title_action.raw_value">
<field name="title_action" /> on
<field name="date_action" />
</t>
</div>
<div align="left" width="22" style="padding-top:5px;white-space: nowrap;" >
<div align="right">
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
</div>
</div>
<div class="oe_kanban_right">
<t t-set="priority" t-value="record.priority.raw_value || 5"/>
<a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
<img src="/web/static/src/img/icons/star-off.png" width="16" height="16" title="Good"/>
</a>
<a type="object" name="set_priority" args="['5']" t-if="priority lte 3">
<img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16" title="Good"/>
</a>
<a type="object" name="set_priority" args="['2']">
<img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16" title="Very Good"/>
</a>
<a type="object" name="set_priority" args="['1']">
<img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16" title="Excellent"/>
</a>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
</div>
</div>
</t>
</templates>
</kanban>
</field>
</record>
<div class="oe_clear"></div>
</div>
</t>
</templates>
</kanban>
</field>
</record>
# ------------------------------------------------------
# HR Job
addons/project/project.py
+4 -1
View File
@@ -768,7 +768,7 @@ class task(base_stage, osv.osv):
_order = "priority, sequence, date_start, name, id"
def set_priority(self, cr, uid, ids, priority):
def set_priority(self, cr, uid, ids, priority, *args):
"""Set task priority
"""
return self.write(cr, uid, ids, {'priority' : priority})
@@ -1050,12 +1050,15 @@ class task(base_stage, osv.osv):
def set_kanban_state_blocked(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context)
return False
def set_kanban_state_normal(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context)
return False
def set_kanban_state_done(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context)
return False
def _store_history(self, cr, uid, ids, context=None):
for task in self.browse(cr, uid, ids, context=context):
addons/project/project_view.xml
+39 -58
View File
@@ -441,40 +441,30 @@
<field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
<field name="date_deadline"/>
<templates>
<t t-name="task_details">
<ul class="oe_kanban_tooltip" t-if="record.project_id.raw_value">
<li><b>Project:</b> <field name="project_id"/></li>
</ul>
</t>
<t t-name="kanban-box">
<t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.str.underscored(_.str.trim(record.name.raw_value))"/></t>
<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>
<td align="left" valign="middle" width="16">
<a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
<a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
</td>
<td align="left" valign="middle" class="oe_kanban_title" tooltip="task_details">
<field name="name"/>
</td>
<td valign="top" width="22">
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value"
width="22" height="22" class="oe_kanban_gravatar"/>
</td>
</tr>
</table>
<div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
<div class="oe_kanban_description">
<t t-esc="kanban_text_ellipsis(record.description.value, 160)"/>
<i t-if="record.date_deadline.raw_value">
<t t-if="record.description.raw_value">, </t>
<field name="date_deadline"/>
</i>
<span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
</div>
<div class="oe_kanban_content">
<div>
<a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
<a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
<b><field name="name"/></b>
</div>
<div>
<field name="partner_id"/>
</div>
<div>
<field name="project_id"/>
<t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
<i><field name="date_deadline"/></i>
<span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
<t t-set="hours" t-value="record.remaining_hours.raw_value"/>
<t t-set="times" t-value="[
[1, (hours gte 1 and hours lt 2)]
@@ -482,33 +472,24 @@
,[5, (hours gte 5 and hours lt 10)]
,[10, (hours gte 10)]
]"/>
<t t-foreach="times" t-as="time"
><a t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}"
type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
></t>
<a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
</span>
</div>
<div class="oe_kanban_clear"/>
</div>
<div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
<div class="oe_kanban_left">
<a string="Edit" icon="gtk-edit" type="edit"/>
<a string="Change Color" icon="color-picker" type="color" name="color"/>
<a name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
<a name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close"/>
</div>
<div class="oe_kanban_right">
<a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object" icon="kanban-stop"/>
<a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object" icon="gtk-media-play"/>
<a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object" icon="kanban-apply"/>
</div>
<div class="oe_kanban_clear"/>
<t t-foreach="times" t-as="time"><a
t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}" type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a><b
t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b></t>
<a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
</span>
</div>
<div class="oe_kanban_footer_left" style="margin-top:5px;">
<div class="oe_right">
<a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="" name="set_kanban_state_done" class="oe_kanban_status"> </a>
<a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
<a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
</div>
</div>
</div>
</t>
<div class="oe_clear"></div>
</div>
</t>
</templates>
</kanban>
</field>
addons/project_issue/project_issue.py
+1 -1
View File
@@ -288,7 +288,7 @@ class project_issue(base_stage, osv.osv):
'stage_id': _read_group_stage_ids
}
def set_priority(self, cr, uid, ids, priority):
def set_priority(self, cr, uid, ids, priority, *args):
"""Set lead priority
"""
return self.write(cr, uid, ids, {'priority' : priority})
addons/project_issue/project_issue_view.xml
+45 -46
View File
@@ -220,55 +220,58 @@
<field name="arch" type="xml">
<kanban default_group_by="stage_id">
<field name="color"/>
<field name="state" groups="base.group_no_one"/>
<field name="priority" groups="base.group_user"/>
<field name="priority"/>
<field name="user_email"/>
<field name="user_id"/>
<field name="date_deadline"/>
<templates>
<t t-name="kanban-tooltip">
<ul class="oe_kanban_tooltip">
<li><b>Project:</b> <field name="project_id"/></li>
<li><b>Category:</b> <field name="categ_id"/></li>
</ul>
</t>
<t t-name="kanban-box">
<t t-set="color" t-value="kanban_color(record.color.raw_value || record.state.raw_value)"/>
<div t-att-class="color + (record.priority.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
<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>
<td align="left" valign="middle" width="16">
<a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
<a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
</td>
<td align="left" valign="middle" class="oe_kanban_title">
<field name="name"/>
</td>
<td valign="top" width="22">
<img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>
</td>
</tr>
</table>
<div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
<div t-if="record.partner_id.raw_value">
<field name="partner_id"/>
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
</div>
<div class="oe_kanban_content" tooltip="kanban-tooltip">
<div>
<b><field name="name"/></b> <br/>
<field name="partner_id"/> <br/>
<field name="version_id"/>
</div>
<div class="oe_kanban_footer_left">
<div class="oe_right">
<span class="oe_kanban_highlight">
<t t-set="priority" t-value="record.priority.raw_value || 5"/>
<a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
<img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
</a>
<a type="object" name="set_priority" args="['5']" t-if="priority lte 3" title="Normal Priority">
<img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
</a>
<a type="object" name="set_priority" args="['2']" title="High Priority">
<img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
</a>
<a type="object" name="set_priority" args="['1']" title="Highest Priority">
<img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
</a>
</span>
<t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())">
<span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span>
</t>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
</div>
<div t-if="record.project_id.raw_value">
<field name="project_id"/>
</div>
<div t-if="record.version_id.raw_value">
<i><field name="version_id"/></i>
</div>
</div>
<div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
<div class="oe_kanban_left">
<a string="Edit" icon="gtk-edit" type="edit"/>
<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="Escalate" name="case_escalate" icon="gtk-go-up" type="object"/>
<a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
</div>
<div class="oe_kanban_right">
<a name="case_open" string="Open" states="draft,pending" type="object" icon="kanban-apply"/>
<a name="case_close" string="Close" states="open,draft,pending" type="object" icon="kanban-stop"/>
</div>
<div class="oe_kanban_clear"/>
</div>
</div>
<div class="oe_clear"></div>
</div>
</t>
</templates>
@@ -277,10 +280,6 @@
</record>
# ------------------------------------------------------
# Feature Requests
# ------------------------------------------------------
addons/share/i18n/ja.po
+8 -8
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-06-21 21:29+0000\n"
"PO-Revision-Date: 2012-06-29 23:24+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
"X-Generator: Launchpad (build 15505)\n"
"X-Launchpad-Export-Date: 2012-07-01 04:40+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: share
#: field:share.wizard,embed_option_title:0
@@ -35,7 +35,7 @@ msgstr "共有方法"
#. module: share
#: view:share.wizard:0
msgid "Share with these People (one email per line)"
msgstr ""
msgstr "共有する人々（行毎に１Eメール）"
#. module: share
#: field:share.wizard,name:0
@@ -361,7 +361,7 @@ msgstr "またはドキュメントを埋め込みたい場所に、次のコー
msgid ""
"An email notification with instructions has been sent to the following "
"people:"
msgstr ""
msgstr "指示に従いEメールの通知は次の人に送信されました："
#. module: share
#: model:ir.model,name:share.model_share_wizard_result_line
@@ -392,7 +392,7 @@ msgstr "編集可能"
#: help:share.wizard,message:0
msgid ""
"An optional personal message, to be included in the email notification."
msgstr ""
msgstr "Eメールの通知似含まれるオプションの個人的なメッセージ"
#. module: share
#: model:ir.model,name:share.model_res_users
@@ -462,7 +462,7 @@ msgstr "検索ビューを表示"
#: code:addons/share/wizard/share_wizard.py:197
#, python-format
msgid "No email address configured"
msgstr ""
msgstr "Eメールアドレスが設定されていません。"
#. module: share
#: field:share.wizard,message:0
@@ -503,7 +503,7 @@ msgstr "共有操作"
msgid ""
"You must configure your email address in the user preferences before using "
"the Share button."
msgstr ""
msgstr "共有ボタンを使用する前にユーザ設定であなたのEメールアドレスを設定する必要があります。"
#. module: share
#: help:share.wizard,access_mode:0
addons/stock/i18n/ja.po
+167 -144
View File
File diff suppressed because it is too large Load Diff
addons/stock_location/i18n/ja.po
+70 -67
View File
@@ -8,25 +8,25 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-06-21 22:13+0000\n"
"PO-Revision-Date: 2012-06-30 02:46+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-07-01 04:40+0000\n"
"X-Generator: Launchpad (build 15520)\n"
#. module: stock_location
#: selection:product.pulled.flow,picking_type:0
#: selection:stock.location.path,picking_type:0
msgid "Sending Goods"
msgstr "送付商品"
msgstr "送付製品"
#. module: stock_location
#: view:product.product:0
msgid "Pulled Paths"
msgstr ""
msgstr "プル型パス"
#. module: stock_location
#: selection:product.pulled.flow,type_proc:0
@@ -36,17 +36,17 @@ msgstr "移動"
#. module: stock_location
#: model:ir.model,name:stock_location.model_stock_location_path
msgid "Pushed Flows"
msgstr ""
msgstr "プッシュ型フロー"
#. module: stock_location
#: selection:stock.location.path,auto:0
msgid "Automatic No Step Added"
msgstr ""
msgstr "自動段階追加なし"
#. module: stock_location
#: view:product.product:0
msgid "Parameters"
msgstr ""
msgstr "パラメータ"
#. module: stock_location
#: field:product.pulled.flow,location_src_id:0
@@ -57,13 +57,13 @@ msgstr "元の場所"
#. module: stock_location
#: help:product.pulled.flow,cancel_cascade:0
msgid "Allow you to cancel moves related to the product pull flow"
msgstr ""
msgstr "プル型フロー製品"
#. module: stock_location
#: model:ir.model,name:stock_location.model_product_pulled_flow
#: field:product.product,flow_pull_ids:0
msgid "Pulled Flows"
msgstr ""
msgstr "プル型フロー"
#. module: stock_location
#: constraint:stock.move:0
@@ -73,13 +73,13 @@ msgstr "この製品に製造ロットを割り当てる必要があります。
#. module: stock_location
#: help:product.pulled.flow,location_src_id:0
msgid "Location used by Destination Location to supply"
msgstr ""
msgstr "供給する宛先の場所により使用される場所"
#. module: stock_location
#: selection:product.pulled.flow,picking_type:0
#: selection:stock.location.path,picking_type:0
msgid "Internal"
msgstr ""
msgstr "内部"
#. module: stock_location
#: code:addons/stock_location/procurement_pull.py:98
@@ -87,18 +87,18 @@ msgstr ""
msgid ""
"Pulled procurement coming from original location %s, pull rule %s, via "
"original Procurement %s (#%d)"
msgstr ""
msgstr "プル型調達は元の場所 %s から来ます。プルのルールは %s です。元の調達 %s（番号 %d）経由です。"
#. module: stock_location
#: model:ir.model,name:stock_location.model_stock_location
msgid "Location"
msgstr ""
msgstr "場所"
#. module: stock_location
#: field:product.pulled.flow,invoice_state:0
#: field:stock.location.path,invoice_state:0
msgid "Invoice Status"
msgstr ""
msgstr "請求書の状態"
#. module: stock_location
#: help:stock.location.path,auto:0
@@ -110,151 +110,154 @@ msgid ""
"move has to be validated by a worker. With 'Automatic No Step Added', the "
"location is replaced in the original move."
msgstr ""
"これは場所ツリーの中に従わねばならない製品のパスを定義するために使用されます。\n"
"自動移動は、現在のものの検証が自動的に行われた後に在庫移動を作成します。手動操作は、在庫移動は作業者によって確認される必要があります。段階的追加なしの自動"
"は、場所がオリジナルの移動で置き換えられます。"
#. module: stock_location
#: view:product.product:0
msgid "Conditions"
msgstr ""
msgstr "条件"
#. module: stock_location
#: model:stock.location,name:stock_location.location_pack_zone
msgid "Pack Zone"
msgstr ""
msgstr "梱包地のゾーン"
#. module: stock_location
#: model:stock.location,name:stock_location.location_gate_b
msgid "Gate B"
msgstr ""
msgstr "ゲートB"
#. module: stock_location
#: model:stock.location,name:stock_location.location_gate_a
msgid "Gate A"
msgstr ""
msgstr "ゲートA"
#. module: stock_location
#: selection:product.pulled.flow,type_proc:0
msgid "Buy"
msgstr ""
msgstr "購入"
#. module: stock_location
#: view:product.product:0
msgid "Pushed flows"
msgstr ""
msgstr "プッシュ型フロー"
#. module: stock_location
#: model:stock.location,name:stock_location.location_dispatch_zone
msgid "Dispatch Zone"
msgstr ""
msgstr "割当ゾーン"
#. module: stock_location
#: model:ir.model,name:stock_location.model_stock_move
msgid "Stock Move"
msgstr ""
msgstr "在庫移動"
#. module: stock_location
#: view:product.product:0
msgid "Pulled flows"
msgstr ""
msgstr "プル型フロー"
#. module: stock_location
#: field:product.pulled.flow,company_id:0
#: field:stock.location.path,company_id:0
msgid "Company"
msgstr ""
msgstr "会社"
#. module: stock_location
#: view:product.product:0
msgid "Logistics Flows"
msgstr ""
msgstr "物流フロー"
#. module: stock_location
#: help:stock.move,cancel_cascade:0
msgid "If checked, when this move is cancelled, cancel the linked move too"
msgstr ""
msgstr "チェックした場合、この移動がキャンセルされる時に、関連する移動もキャンセルされます。"
#. module: stock_location
#: selection:product.pulled.flow,type_proc:0
msgid "Produce"
msgstr ""
msgstr "製造"
#. module: stock_location
#: selection:product.pulled.flow,procure_method:0
msgid "Make to Order"
msgstr ""
msgstr "オーダーの作成"
#. module: stock_location
#: selection:product.pulled.flow,procure_method:0
msgid "Make to Stock"
msgstr ""
msgstr "在庫の作成"
#. module: stock_location
#: field:product.pulled.flow,partner_address_id:0
msgid "Partner Address"
msgstr ""
msgstr "パートナの住所"
#. module: stock_location
#: selection:product.pulled.flow,invoice_state:0
#: selection:stock.location.path,invoice_state:0
msgid "To Be Invoiced"
msgstr ""
msgstr "請求対象"
#. module: stock_location
#: help:stock.location.path,delay:0
msgid "Number of days to do this transition"
msgstr ""
msgstr "この遷移の実行に要する日数"
#. module: stock_location
#: help:product.pulled.flow,name:0
msgid "This field will fill the packing Origin and the name of its moves"
msgstr ""
msgstr "この項目は梱包の起点と移動の名称を満たします。"
#. module: stock_location
#: field:product.pulled.flow,type_proc:0
msgid "Type of Procurement"
msgstr ""
msgstr "調達のタイプ"
#. module: stock_location
#: help:product.pulled.flow,company_id:0
msgid "Is used to know to which company belong packings and moves"
msgstr ""
msgstr "これはどの会社に梱包と移動が属していたかを知るために使用されます。"
#. module: stock_location
#: field:product.pulled.flow,name:0
msgid "Name"
msgstr ""
msgstr "名称"
#. module: stock_location
#: help:product.product,path_ids:0
msgid ""
"These rules set the right path of the product in the whole location tree."
msgstr ""
msgstr "これらの規則は全体の場所のツリーの中の製品の正しいパスを設定します。"
#. module: stock_location
#: constraint:stock.move:0
msgid "You can not move products from or to a location of the type view."
msgstr ""
msgstr "タイプビューの場所から、あるいは場所へは製品を動かすことはできません。"
#. module: stock_location
#: selection:stock.location.path,auto:0
msgid "Manual Operation"
msgstr ""
msgstr "手動操作"
#. module: stock_location
#: model:ir.model,name:stock_location.model_product_product
#: field:product.pulled.flow,product_id:0
msgid "Product"
msgstr ""
msgstr "製品"
#. module: stock_location
#: field:product.pulled.flow,procure_method:0
msgid "Procure Method"
msgstr ""
msgstr "調達方法"
#. module: stock_location
#: field:product.pulled.flow,picking_type:0
#: field:stock.location.path,picking_type:0
msgid "Shipping Type"
msgstr ""
msgstr "出荷タイプ"
#. module: stock_location
#: help:product.pulled.flow,procure_method:0
@@ -262,39 +265,39 @@ msgid ""
"'Make to Stock': When needed, take from the stock or wait until re-"
"supplying. 'Make to Order': When needed, purchase or produce for the "
"procurement request."
msgstr ""
msgstr "在庫する：必要な時に在庫から取り出すか再供給まで待ちます。オーダーする：必要な時に調達要求のために発注するか製造するかします。"
#. module: stock_location
#: help:product.pulled.flow,location_id:0
msgid "Is the destination location that needs supplying"
msgstr ""
msgstr "供給を必要とする宛先の場所です。"
#. module: stock_location
#: field:stock.location.path,product_id:0
msgid "Products"
msgstr ""
msgstr "製品"
#. module: stock_location
#: code:addons/stock_location/procurement_pull.py:118
#, python-format
msgid "Pulled from another location via procurement %d"
msgstr ""
msgstr "調達 %d によって他の場所から引き出されました。"
#. module: stock_location
#: model:stock.location,name:stock_location.stock_location_qualitytest0
msgid "Quality Control"
msgstr ""
msgstr "品質管理"
#. module: stock_location
#: selection:product.pulled.flow,invoice_state:0
#: selection:stock.location.path,invoice_state:0
msgid "Not Applicable"
msgstr ""
msgstr "適用不可"
#. module: stock_location
#: field:stock.location.path,delay:0
msgid "Delay (days)"
msgstr ""
msgstr "遅延（日数）"
#. module: stock_location
#: code:addons/stock_location/procurement_pull.py:67
@@ -302,12 +305,12 @@ msgstr ""
msgid ""
"Picking for pulled procurement coming from original location %s, pull rule "
"%s, via original Procurement %s (#%d)"
msgstr ""
msgstr "オリジナルの場所 %s から来るプル型調達のための集荷、プルのルール %s、オリジナルの調達 %s（番号 %d）"
#. module: stock_location
#: field:product.product,path_ids:0
msgid "Pushed Flow"
msgstr ""
msgstr "プッシュ型フロー"
#. module: stock_location
#: code:addons/stock_location/procurement_pull.py:89
@@ -315,45 +318,45 @@ msgstr ""
msgid ""
"Move for pulled procurement coming from original location %s, pull rule %s, "
"via original Procurement %s (#%d)"
msgstr ""
msgstr "オリジナルの場所 %s から来るプル型調達のための移動、プルのルール %s、オリジナルの調達 %s（番号 %d）"
#. module: stock_location
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product"
msgstr ""
msgstr "違う製品のロットを割り当てることはできません。"
#. module: stock_location
#: model:ir.model,name:stock_location.model_procurement_order
msgid "Procurement"
msgstr ""
msgstr "調達"
#. module: stock_location
#: field:product.pulled.flow,location_id:0
#: field:stock.location.path,location_dest_id:0
msgid "Destination Location"
msgstr ""
msgstr "宛先場所"
#. module: stock_location
#: field:stock.location.path,auto:0
#: selection:stock.location.path,auto:0
msgid "Automatic Move"
msgstr ""
msgstr "自動移動"
#. module: stock_location
#: selection:product.pulled.flow,picking_type:0
#: selection:stock.location.path,picking_type:0
msgid "Getting Goods"
msgstr ""
msgstr "製品の取得"
#. module: stock_location
#: view:product.product:0
msgid "Action Type"
msgstr ""
msgstr "アクションタイプ"
#. module: stock_location
#: constraint:product.product:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "エラー：無効な商品識別番号です。"
#. module: stock_location
#: help:product.pulled.flow,picking_type:0
@@ -361,37 +364,37 @@ msgstr ""
msgid ""
"Depending on the company, choose whatever you want to receive or send "
"products"
msgstr ""
msgstr "会社によります。受信あるいは送信したい製品を選択して下さい。"
#. module: stock_location
#: model:stock.location,name:stock_location.location_order
msgid "Order Processing"
msgstr ""
msgstr "オーダー処理"
#. module: stock_location
#: field:stock.location.path,name:0
msgid "Operation"
msgstr ""
msgstr "操作"
#. module: stock_location
#: view:stock.location.path:0
msgid "Location Paths"
msgstr ""
msgstr "場所のパス"
#. module: stock_location
#: field:product.pulled.flow,journal_id:0
#: field:stock.location.path,journal_id:0
msgid "Journal"
msgstr ""
msgstr "仕訳帳"
#. module: stock_location
#: field:product.pulled.flow,cancel_cascade:0
#: field:stock.move,cancel_cascade:0
msgid "Cancel Cascade"
msgstr ""
msgstr "連続をキャンセル"
#. module: stock_location
#: selection:product.pulled.flow,invoice_state:0
#: selection:stock.location.path,invoice_state:0
msgid "Invoiced"
msgstr ""
msgstr "請求済"
addons/stock_planning/i18n/ja.po
+1175
View File
File diff suppressed because it is too large Load Diff