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

[MERGE] Sync with trunk

Browse Source 
bzr revid: tde@openerp.com-20130515103540-7q9hjsjq0kckwyef
This commit is contained in:
Thibault Delavallée
2013-05-15 12:35:40 +02:00
parent 0525c965a9 b5b6dfbbf0
commit 8d312b85ba
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/portal/i18n/ko.po
+1 -1
View File
@@ -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: 2013-05-14 05:30+0000\n"
"X-Launchpad-Export-Date: 2013-05-15 05:15+0000\n"
"X-Generator: Launchpad (build 16617)\n"
#. module: portal
addons/product/product_view.xml
+1
View File
@@ -88,6 +88,7 @@
<div name="ean">
<field name="ean13" placeholder="e.g. 5901234123457"/>
</div>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</group>
<field name="description" placeholder="describe the product characteristics..."/>
addons/stock/product_view.xml
+5 -6
View File
@@ -110,12 +110,11 @@
</group>
</group>
<group name="status" position="after" version="7.0">
<group name="store" string="Storage Location">
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
<field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
<field name="loc_case" attrs="{'invisible':[('type','=','service')]}"/>
</group>
<group name="store" string="Storage Location" attrs="{'invisible':[('type','=','service')]}">
<field name="loc_rack"/>
<field name="loc_row"/>
<field name="loc_case"/>
</group>
</group>
<group name="Weights" position="after">
<group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">