Rohan Nayani(openerp) has proposed merging lp:~openerp-dev/openobject-addons/ron-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.
Requested reviews: OpenERP Core Team (openerp) Related bugs: #606325 EAN code validation fails https://bugs.launchpad.net/bugs/606325 #627936 mrp: procurement from orderpoints is generated for non-active, non-purchasable products (5.0) https://bugs.launchpad.net/bugs/627936 #634856 [mrp] constraint needed for orderpoints (5.0) https://bugs.launchpad.net/bugs/634856 #663890 Creating invoices and grouping multiplies services https://bugs.launchpad.net/bugs/663890 #666362 [6.0RC1] sale Invoice Control "Not from Picking" is bad wording https://bugs.launchpad.net/bugs/666362 #667246 Wrong Journals when creating an invoice from picking https://bugs.launchpad.net/bugs/667246 #667324 invoicing control in purchase orders https://bugs.launchpad.net/bugs/667324 #669210 [trunk][mrp] stock_move.action_consume raises exception https://bugs.launchpad.net/bugs/669210 #670056 [6.0RC1] stock moves - missing search field "Reference" https://bugs.launchpad.net/bugs/670056 #670652 Demo data of purchase order is not relevant in terms of supplier address https://bugs.launchpad.net/bugs/670652 #670921 Purchase module : problems in group by in seach view https://bugs.launchpad.net/bugs/670921 #671172 Return packingnumber hardcoded {'name':'%s (return)' % pick.name https://bugs.launchpad.net/bugs/671172 #671386 PO Line description doesn't take Supplier Product Name or Code in Product's Suppliers Tab https://bugs.launchpad.net/bugs/671386 #673572 [6.0 RC1] Stock move in done state add a pack and production lot https://bugs.launchpad.net/bugs/673572 #677429 [6.0RC1][purchase]Invoice journal(s) not loaded properly https://bugs.launchpad.net/bugs/677429 #690115 A "Purchase / Manager" does not have more rights than a "Purchase / User". Statistics report should not be allow for "Purchase/User" group. https://bugs.launchpad.net/bugs/690115 #690228 shouldn't be able to change the company after have vaidated an inventory https://bugs.launchpad.net/bugs/690228 #690581 Stock_planning : Unable to create Forecasting periods. https://bugs.launchpad.net/bugs/690581 #690763 PRODUCT V6 : the ean13 check is incorrect https://bugs.launchpad.net/bugs/690763 #691012 [trunk][mrp] bugfix on consuming materials introduced two new bugs https://bugs.launchpad.net/bugs/691012 #691709 procurement exception when there is stock https://bugs.launchpad.net/bugs/691709 #692827 Procurement Module view arch missing some fields in tree https://bugs.launchpad.net/bugs/692827 #692913 [6.0] PO - Button "Approved" shows approved AND done https://bugs.launchpad.net/bugs/692913 #693056 price_multi_get() is comparing pricelist_ids to pricelist_version_ids https://bugs.launchpad.net/bugs/693056 #693806 Invalid literal for int() in sequence with prefix https://bugs.launchpad.net/bugs/693806 #697085 Backorder Cannot be create on Incoming Shipment https://bugs.launchpad.net/bugs/697085 #697142 Unicode encoding problem on stock module https://bugs.launchpad.net/bugs/697142 #697209 Belgium not defined as an Intrastat member by default https://bugs.launchpad.net/bugs/697209 #700963 Update button at product form: Stock update without production lot possible: Tracking production lot wanted https://bugs.launchpad.net/bugs/700963 #702198 [trunk]product][account] Typo Weigths https://bugs.launchpad.net/bugs/702198 For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/ron-dev-addons2/+merge/46119 https://launchpad.net/bugs/702198 https://launchpad.net/bugs/700963 -- https://code.launchpad.net/~openerp-dev/openobject-addons/ron-dev-addons2/+merge/46119 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/ron-dev-addons2.
=== modified file 'account/i18n/tr.po' --- account/i18n/tr.po 2011-01-12 04:58:46 +0000 +++ account/i18n/tr.po 2011-01-13 12:13:57 +0000 @@ -14292,7 +14292,7 @@ #~ msgid "Sales Application Configuration" #~ msgstr "Sales Application Configuration" -#~ msgid "Weigths" +#~ msgid "weights" #~ msgstr "AÄırlık Bilgisi" #~ msgid "" === modified file 'product/i18n/ar.po' --- product/i18n/ar.po 2011-01-06 05:38:49 +0000 +++ product/i18n/ar.po 2011-01-13 12:13:57 +0000 @@ -1966,7 +1966,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "اÙØ£ÙزاÙ" #. module: product === modified file 'product/i18n/bg.po' --- product/i18n/bg.po 2011-01-06 05:38:49 +0000 +++ product/i18n/bg.po 2011-01-13 12:13:57 +0000 @@ -1965,7 +1965,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/bs.po' --- product/i18n/bs.po 2011-01-06 05:38:49 +0000 +++ product/i18n/bs.po 2011-01-13 12:13:57 +0000 @@ -1994,7 +1994,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Težina" #. module: product === modified file 'product/i18n/ca.po' --- product/i18n/ca.po 2011-01-06 05:38:49 +0000 +++ product/i18n/ca.po 2011-01-13 12:13:57 +0000 @@ -1997,7 +1997,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Pesos" #. module: product === modified file 'product/i18n/cs.po' --- product/i18n/cs.po 2011-01-06 05:38:49 +0000 +++ product/i18n/cs.po 2011-01-13 12:13:57 +0000 @@ -1965,7 +1965,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/de.po' --- product/i18n/de.po 2011-01-11 05:03:13 +0000 +++ product/i18n/de.po 2011-01-13 12:13:57 +0000 @@ -2127,7 +2127,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Gewichte" #. module: product === modified file 'product/i18n/el.po' --- product/i18n/el.po 2011-01-06 05:38:49 +0000 +++ product/i18n/el.po 2011-01-13 12:13:57 +0000 @@ -2022,7 +2022,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "ÎάÏη" #. module: product === modified file 'product/i18n/es.po' --- product/i18n/es.po 2011-01-12 04:58:46 +0000 +++ product/i18n/es.po 2011-01-13 12:13:57 +0000 @@ -2110,7 +2110,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Pesos" #. module: product === modified file 'product/i18n/es_AR.po' --- product/i18n/es_AR.po 2011-01-06 05:38:49 +0000 +++ product/i18n/es_AR.po 2011-01-13 12:13:57 +0000 @@ -2000,7 +2000,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Pesos" #. module: product === modified file 'product/i18n/es_EC.po' --- product/i18n/es_EC.po 2011-01-06 05:38:49 +0000 +++ product/i18n/es_EC.po 2011-01-13 12:13:57 +0000 @@ -2002,7 +2002,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Pesos" #. module: product === modified file 'product/i18n/et.po' --- product/i18n/et.po 2011-01-06 05:38:49 +0000 +++ product/i18n/et.po 2011-01-13 12:13:57 +0000 @@ -1991,7 +1991,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Kaalud" #. module: product === modified file 'product/i18n/eu.po' --- product/i18n/eu.po 2011-01-06 05:38:49 +0000 +++ product/i18n/eu.po 2011-01-13 12:13:57 +0000 @@ -1968,7 +1968,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Pisuak" #. module: product === modified file 'product/i18n/fi.po' --- product/i18n/fi.po 2011-01-06 05:38:49 +0000 +++ product/i18n/fi.po 2011-01-13 12:13:57 +0000 @@ -1994,7 +1994,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Painot" #. module: product === modified file 'product/i18n/fr.po' --- product/i18n/fr.po 2011-01-12 04:58:46 +0000 +++ product/i18n/fr.po 2011-01-13 12:13:57 +0000 @@ -2137,7 +2137,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Poids" #. module: product === modified file 'product/i18n/gl.po' --- product/i18n/gl.po 2011-01-06 05:38:49 +0000 +++ product/i18n/gl.po 2011-01-13 12:13:57 +0000 @@ -1966,7 +1966,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/hr.po' --- product/i18n/hr.po 2011-01-06 05:38:49 +0000 +++ product/i18n/hr.po 2011-01-13 12:13:57 +0000 @@ -1994,7 +1994,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Težine" #. module: product === modified file 'product/i18n/hu.po' --- product/i18n/hu.po 2011-01-12 04:58:46 +0000 +++ product/i18n/hu.po 2011-01-13 12:13:57 +0000 @@ -1978,7 +1978,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Súlyok" #. module: product === modified file 'product/i18n/id.po' --- product/i18n/id.po 2011-01-06 05:38:49 +0000 +++ product/i18n/id.po 2011-01-13 12:13:57 +0000 @@ -1965,7 +1965,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/it.po' --- product/i18n/it.po 2011-01-08 05:02:08 +0000 +++ product/i18n/it.po 2011-01-13 12:13:57 +0000 @@ -2115,7 +2115,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Pesi" #. module: product === modified file 'product/i18n/ko.po' --- product/i18n/ko.po 2011-01-06 05:38:49 +0000 +++ product/i18n/ko.po 2011-01-13 12:13:57 +0000 @@ -1970,7 +1970,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "ì¤ë" #. module: product === modified file 'product/i18n/lt.po' --- product/i18n/lt.po 2011-01-06 05:38:49 +0000 +++ product/i18n/lt.po 2011-01-13 12:13:57 +0000 @@ -1991,7 +1991,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Gabenimo matai" #. module: product === modified file 'product/i18n/lv.po' --- product/i18n/lv.po 2011-01-06 05:38:49 +0000 +++ product/i18n/lv.po 2011-01-13 12:13:57 +0000 @@ -1966,7 +1966,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Svari" #. module: product === modified file 'product/i18n/mn.po' --- product/i18n/mn.po 2011-01-06 05:38:49 +0000 +++ product/i18n/mn.po 2011-01-13 12:13:57 +0000 @@ -2024,7 +2024,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Ðин" #. module: product === modified file 'product/i18n/nb.po' --- product/i18n/nb.po 2011-01-06 05:38:49 +0000 +++ product/i18n/nb.po 2011-01-13 12:13:57 +0000 @@ -1968,7 +1968,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Vekt" #. module: product === modified file 'product/i18n/nb_NB.po' --- product/i18n/nb_NB.po 2010-12-28 17:07:18 +0000 +++ product/i18n/nb_NB.po 2011-01-13 12:13:57 +0000 @@ -235,7 +235,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Vekt" #. module: product === modified file 'product/i18n/nl.po' --- product/i18n/nl.po 2011-01-06 05:38:49 +0000 +++ product/i18n/nl.po 2011-01-13 12:13:57 +0000 @@ -1998,7 +1998,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Gewichten" #. module: product === modified file 'product/i18n/nl_BE.po' --- product/i18n/nl_BE.po 2011-01-06 05:38:49 +0000 +++ product/i18n/nl_BE.po 2011-01-13 12:13:57 +0000 @@ -1966,7 +1966,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/pl.po' --- product/i18n/pl.po 2011-01-06 05:38:49 +0000 +++ product/i18n/pl.po 2011-01-13 12:13:57 +0000 @@ -2010,7 +2010,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Wagi" #. module: product === modified file 'product/i18n/pt.po' --- product/i18n/pt.po 2011-01-06 05:38:49 +0000 +++ product/i18n/pt.po 2011-01-13 12:13:57 +0000 @@ -1996,7 +1996,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Pesos" #. module: product === modified file 'product/i18n/pt_BR.po' --- product/i18n/pt_BR.po 2011-01-10 05:19:37 +0000 +++ product/i18n/pt_BR.po 2011-01-13 12:13:57 +0000 @@ -2115,7 +2115,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Pesos" #. module: product === modified file 'product/i18n/ro.po' --- product/i18n/ro.po 2011-01-06 05:38:49 +0000 +++ product/i18n/ro.po 2011-01-13 12:13:57 +0000 @@ -1967,7 +1967,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/ru.po' --- product/i18n/ru.po 2011-01-08 05:02:08 +0000 +++ product/i18n/ru.po 2011-01-13 12:13:57 +0000 @@ -2026,7 +2026,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "ÐеÑ" #. module: product === modified file 'product/i18n/sk.po' --- product/i18n/sk.po 2011-01-06 05:38:49 +0000 +++ product/i18n/sk.po 2011-01-13 12:13:57 +0000 @@ -1999,7 +1999,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Miery" #. module: product === modified file 'product/i18n/sl.po' --- product/i18n/sl.po 2011-01-10 05:19:37 +0000 +++ product/i18n/sl.po 2011-01-13 12:13:57 +0000 @@ -1977,7 +1977,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Teže" #. module: product === modified file 'product/i18n/sq.po' --- product/i18n/sq.po 2011-01-06 05:38:49 +0000 +++ product/i18n/sq.po 2011-01-13 12:13:57 +0000 @@ -1966,7 +1966,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/sr.po' --- product/i18n/sr.po 2011-01-06 05:38:49 +0000 +++ product/i18n/sr.po 2011-01-13 12:13:57 +0000 @@ -2033,7 +2033,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Težina" #. module: product === modified file 'product/i18n/[email protected]' --- product/i18n/[email protected] 2011-01-06 05:38:49 +0000 +++ product/i18n/[email protected] 2011-01-13 12:13:57 +0000 @@ -2033,7 +2033,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Težina" #. module: product === modified file 'product/i18n/sv.po' --- product/i18n/sv.po 2011-01-06 05:38:49 +0000 +++ product/i18n/sv.po 2011-01-13 12:13:57 +0000 @@ -2016,7 +2016,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "MÃ¥tt" #. module: product === modified file 'product/i18n/tlh.po' --- product/i18n/tlh.po 2011-01-06 05:38:49 +0000 +++ product/i18n/tlh.po 2011-01-13 12:13:57 +0000 @@ -1965,7 +1965,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/tr.po' --- product/i18n/tr.po 2011-01-10 05:19:37 +0000 +++ product/i18n/tr.po 2011-01-13 12:13:57 +0000 @@ -1985,7 +1985,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "AÄırlık Bilgisi" #. module: product === modified file 'product/i18n/uk.po' --- product/i18n/uk.po 2011-01-06 05:38:49 +0000 +++ product/i18n/uk.po 2011-01-13 12:13:57 +0000 @@ -1970,7 +1970,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/i18n/vi.po' --- product/i18n/vi.po 2011-01-06 05:38:49 +0000 +++ product/i18n/vi.po 2011-01-13 12:13:57 +0000 @@ -1996,7 +1996,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "Khá»i lượng" #. module: product === modified file 'product/i18n/zh_CN.po' --- product/i18n/zh_CN.po 2011-01-12 04:58:46 +0000 +++ product/i18n/zh_CN.po 2011-01-13 12:13:57 +0000 @@ -1974,7 +1974,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "éé" #. module: product === modified file 'product/i18n/zh_TW.po' --- product/i18n/zh_TW.po 2011-01-06 05:38:49 +0000 +++ product/i18n/zh_TW.po 2011-01-13 12:13:57 +0000 @@ -1965,7 +1965,7 @@ #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Weigths" +msgid "weights" msgstr "" #. module: product === modified file 'product/product_view.xml' --- product/product_view.xml 2011-01-11 09:07:20 +0000 +++ product/product_view.xml 2011-01-13 12:13:57 +0000 @@ -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')]}"/> === modified file 'stock/wizard/stock_change_product_qty.py' --- stock/wizard/stock_change_product_qty.py 2010-12-31 06:26:40 +0000 +++ stock/wizard/stock_change_product_qty.py 2011-01-13 12:13:57 +0000 @@ -28,10 +28,23 @@ _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 + prod_obj = self.pool.get('product.product').browse(cr, uid, product_id, context=context) + + if (context.get('active_model') == 'product.product') and prod_obj: + 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.
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
