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

[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2

Browse Source 
bzr revid: rpa@tinyerp.com-20110113130850-iysr1o4hbv8y4cnl
This commit is contained in:
rpa (Open ERP)
2011-01-13 18:38:50 +05:30
parent ac2ea5c23e a93a488745
commit df1ed0e10a
47 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/tr.po
+1 -1
View File
@@ -14292,7 +14292,7 @@ msgstr ""
#~ msgid "Sales Application Configuration"
#~ msgstr "Sales Application Configuration"
#~ msgid "Weigths"
#~ msgid "Weights"
#~ msgstr "Ağırlık Bilgisi"
#~ msgid ""
addons/product/i18n/ar.po
+1 -1
View File
@@ -1966,7 +1966,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "الأوزان"
#. module: product
addons/product/i18n/bg.po
+1 -1
View File
@@ -1965,7 +1965,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/bs.po
+1 -1
View File
@@ -1994,7 +1994,7 @@ msgstr "Kompletan PC sa periferijama"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Težina"
#. module: product
addons/product/i18n/ca.po
+1 -1
View File
@@ -1997,7 +1997,7 @@ msgstr "PC complert amb perifèrics"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Pesos"
#. module: product
addons/product/i18n/cs.po
+1 -1
View File
@@ -1965,7 +1965,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/de.po
+1 -1
View File
@@ -2127,7 +2127,7 @@ msgstr "Complete PC With Peripherals"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Gewichte"
#. module: product
addons/product/i18n/el.po
+1 -1
View File
@@ -2022,7 +2022,7 @@ msgstr "Ολοκληρωμένος Η/Υ με Περιφερειακά"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Βάρη"
#. module: product
addons/product/i18n/es.po
+1 -1
View File
@@ -2110,7 +2110,7 @@ msgstr "PC completo con periféricos"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Pesos"
#. module: product
addons/product/i18n/es_AR.po
+1 -1
View File
@@ -2000,7 +2000,7 @@ msgstr "PC completo con periféricos"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Pesos"
#. module: product
addons/product/i18n/es_EC.po
+1 -1
View File
@@ -2002,7 +2002,7 @@ msgstr "PC completo con periféricos"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Pesos"
#. module: product
addons/product/i18n/et.po
+1 -1
View File
@@ -1991,7 +1991,7 @@ msgstr "Täielik PC koos välisseadmetega"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Kaalud"
#. module: product
addons/product/i18n/eu.po
+1 -1
View File
@@ -1968,7 +1968,7 @@ msgstr "PC Osoa Periferikoekin"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Pisuak"
#. module: product
addons/product/i18n/fi.po
+1 -1
View File
@@ -1994,7 +1994,7 @@ msgstr "Kokonainen PC lisälaitteineen"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Painot"
#. module: product
addons/product/i18n/fr.po
+1 -1
View File
@@ -2137,7 +2137,7 @@ msgstr "PC complet avec périphériques"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Poids"
#. module: product
addons/product/i18n/gl.po
+1 -1
View File
@@ -1966,7 +1966,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/hr.po
+1 -1
View File
@@ -1994,7 +1994,7 @@ msgstr "Računalo s periferijama"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Težine"
#. module: product
addons/product/i18n/hu.po
+1 -1
View File
@@ -1978,7 +1978,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Súlyok"
#. module: product
addons/product/i18n/id.po
+1 -1
View File
@@ -1965,7 +1965,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/it.po
+1 -1
View File
@@ -2115,7 +2115,7 @@ msgstr "PC Completo con Periferiche"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Pesi"
#. module: product
addons/product/i18n/ko.po
+1 -1
View File
@@ -1970,7 +1970,7 @@ msgstr "주변기기를 갖춘 완전한 PC 세트"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "중량"
#. module: product
addons/product/i18n/lt.po
+1 -1
View File
@@ -1991,7 +1991,7 @@ msgstr "Pilnas PK su papildoma įranga"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Gabenimo matai"
#. module: product
addons/product/i18n/lv.po
+1 -1
View File
@@ -1966,7 +1966,7 @@ msgstr "Complete PC With Peripherals"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Svari"
#. module: product
addons/product/i18n/mn.po
+1 -1
View File
@@ -2024,7 +2024,7 @@ msgstr "Иж бүрэн PC"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Жин"
#. module: product
addons/product/i18n/nb.po
+1 -1
View File
@@ -1968,7 +1968,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Vekt"
#. module: product
addons/product/i18n/nb_NB.po
+1 -1
View File
@@ -235,7 +235,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Vekt"
#. module: product
addons/product/i18n/nl.po
+1 -1
View File
@@ -1998,7 +1998,7 @@ msgstr "Complete PC met randapparatuur"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Gewichten"
#. module: product
addons/product/i18n/nl_BE.po
+1 -1
View File
@@ -1966,7 +1966,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/pl.po
+1 -1
View File
@@ -2010,7 +2010,7 @@ msgstr "Kompletny PC z urządzeniami zewnętrznymi"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Wagi"
#. module: product
addons/product/i18n/pt.po
+1 -1
View File
@@ -1996,7 +1996,7 @@ msgstr "PC Completo Com Periféricos"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Pesos"
#. module: product
addons/product/i18n/pt_BR.po
+1 -1
View File
@@ -2115,7 +2115,7 @@ msgstr "PC Complet com periféricos"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Pesos"
#. module: product
addons/product/i18n/ro.po
+1 -1
View File
@@ -1967,7 +1967,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/ru.po
+1 -1
View File
@@ -2026,7 +2026,7 @@ msgstr "Комплектовать ПК периферией"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Вес"
#. module: product
addons/product/i18n/sk.po
+1 -1
View File
@@ -1999,7 +1999,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Miery"
#. module: product
addons/product/i18n/sl.po
+1 -1
View File
@@ -1977,7 +1977,7 @@ msgstr "Kompleten PC s perifernimi enotami"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Teže"
#. module: product
addons/product/i18n/sq.po
+1 -1
View File
@@ -1966,7 +1966,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/sr.po
+1 -1
View File
@@ -2033,7 +2033,7 @@ msgstr "Kompletan PC sa periferijama"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Težina"
#. module: product
addons/product/i18n/sr@latin.po
+1 -1
View File
@@ -2033,7 +2033,7 @@ msgstr "Kompletan PC sa periferijama"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Težina"
#. module: product
addons/product/i18n/sv.po
+1 -1
View File
@@ -2016,7 +2016,7 @@ msgstr "Komplett dator med periferiutrustning"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Mått"
#. module: product
addons/product/i18n/tlh.po
+1 -1
View File
@@ -1965,7 +1965,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/tr.po
+1 -1
View File
@@ -1985,7 +1985,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Ağırlık Bilgisi"
#. module: product
addons/product/i18n/uk.po
+1 -1
View File
@@ -1970,7 +1970,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/i18n/vi.po
+1 -1
View File
@@ -1996,7 +1996,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "Khối lượng"
#. module: product
addons/product/i18n/zh_CN.po
+1 -1
View File
@@ -1974,7 +1974,7 @@ msgstr "完整的电脑外设"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr "重量"
#. module: product
addons/product/i18n/zh_TW.po
+1 -1
View File
@@ -1965,7 +1965,7 @@ msgstr ""
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
msgid "Weights"
msgstr ""
#. module: product
addons/product/product_view.xml
+2 -2
View File
@@ -101,7 +101,7 @@
</group>
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Weigths" colspan="2"/>
<separator string="Weights" colspan="2"/>
<field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
<field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
<field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
@@ -567,7 +567,7 @@
</group>
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Weigths" colspan="2"/>
<separator string="Weights" colspan="2"/>
<field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
<field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
<field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
addons/stock/wizard/stock_change_product_qty.py
+14 -1
View File
@@ -28,10 +28,23 @@ class stock_change_product_qty(osv.osv_memory):
_columns = {
'product_id' : fields.many2one('product.product', 'Product'),
'new_quantity': fields.float('Quantity', required=True, help='This quantity is expressed in the Default UoM of the product.'),
'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', required=True,domain="[('product_id','=',product_id)]"),
'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
result = super(stock_change_product_qty, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
product_id = context and context.get('active_id', False) or False
if (context.get('active_model') == 'product.product') and product_id:
prod_obj = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
fields = result.get('fields', {})
if fields and (prod_obj.track_production == True) and (fields.get('prodlot_id')):
result['fields']['prodlot_id']['required'] = True
else:
result['fields']['prodlot_id']['required'] = False
return result
def default_get(self, cr, uid, fields, context):
""" To get default values for the object.
@param self: The object pointer.