[MERGE] lp:777522 (renaming of property_stock_variation field into property_stock_valuation_account_id)
bzr revid: qdp-launchpad@openerp.com-20111010122357-mcj8ym2xgx5or2up
This commit is contained in:
Quentin (OpenERP)
commit
f0eed5901f
|
|
@ -2091,7 +2091,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2122,7 +2122,7 @@ msgid "Future Qty"
|
|||
msgstr "Бъдещо количесто"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2180,7 +2180,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2091,7 +2091,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2271,7 +2271,7 @@ msgid "Future Qty"
|
|||
msgstr "Qtat futura"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Compte variació d'estoc"
|
||||
|
||||
|
|
@ -2329,7 +2329,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Ubicació on el sistema emmagatzemarà els productes finalitzats."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2122,7 +2122,7 @@ msgid "Future Qty"
|
|||
msgstr "Budoucí množ."
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Účet výměny zásob"
|
||||
|
||||
|
|
@ -2180,7 +2180,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Umístění, kde systém naskladní hotové výrobky."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2092,7 +2092,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2150,7 +2150,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2258,7 +2258,7 @@ msgid "Future Qty"
|
|||
msgstr "Zukünftige Menge"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Bestandsveränderungskonto"
|
||||
|
||||
|
|
@ -2316,7 +2316,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Lagerort, wo das System die Fertigprodukte lagert."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2109,7 +2109,7 @@ msgid "Future Qty"
|
|||
msgstr "Μελοντική Ποσ."
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2167,7 +2167,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Τοποθεσία όπου το σύστημα θα αποθηκεύσει τα ολοκληρωμένα προϊόντα."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2281,7 +2281,7 @@ msgid "Future Qty"
|
|||
msgstr "Ctdad futura"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Cuenta variación stock"
|
||||
|
||||
|
|
@ -2339,7 +2339,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Ubicación donde el sistema almacenará los productos finalizados."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2095,7 +2095,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2153,7 +2153,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2277,7 +2277,7 @@ msgid "Future Qty"
|
|||
msgstr "Ctdad futura"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Cuenta variación stock"
|
||||
|
||||
|
|
@ -2335,7 +2335,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Ubicación donde el sistema almacenará los productos finalizados."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2249,7 +2249,7 @@ msgid "Future Qty"
|
|||
msgstr "Ctdad. Futura"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Cuenta de Variación de inventario"
|
||||
|
||||
|
|
@ -2307,7 +2307,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Ubocación donde el sistema colocará los productos finales."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2087,7 +2087,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2145,7 +2145,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2170,7 +2170,7 @@ msgid "Future Qty"
|
|||
msgstr "Tuleva määrä"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Varastomuutoksen tili"
|
||||
|
||||
|
|
@ -2228,7 +2228,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Paikka jonne järjestelmä varastoi valmiit tuotteet."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: elp:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2294,7 +2294,7 @@ msgid "Future Qty"
|
|||
msgstr "Qté à venir"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "COmpte des variation de stock"
|
||||
|
||||
|
|
@ -2352,7 +2352,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "L'emplacement ou le système stockera les produits finis"
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2092,7 +2092,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2150,7 +2150,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2094,7 +2094,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2152,7 +2152,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2164,7 +2164,7 @@ msgid "Future Qty"
|
|||
msgstr "Jövőbeni mennyiség"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Készlet főkönyvi számla"
|
||||
|
||||
|
|
@ -2222,7 +2222,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2162,7 +2162,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2220,7 +2220,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Lokasi dimana sistem akan menyimpan produk jadi"
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2177,7 +2177,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2235,7 +2235,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Ubicazione dove il sistema stoccherà i prodotti finiti"
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2092,7 +2092,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2150,7 +2150,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2095,7 +2095,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2153,7 +2153,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2092,7 +2092,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2150,7 +2150,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2106,7 +2106,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2164,7 +2164,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2095,7 +2095,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2153,7 +2153,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2094,7 +2094,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2152,7 +2152,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2091,7 +2091,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2247,7 +2247,7 @@ msgid "Future Qty"
|
|||
msgstr "Ilość planowana"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Konto wyceny zapasów"
|
||||
|
||||
|
|
@ -2305,7 +2305,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Strefa, w której system umieści gotowe produkty."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2096,7 +2096,7 @@ msgid "Future Qty"
|
|||
msgstr "Quantidade Futura"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2154,7 +2154,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2237,7 +2237,7 @@ msgid "Future Qty"
|
|||
msgstr "Qtde Futura"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Conta para Variação de Estoque"
|
||||
|
||||
|
|
@ -2295,7 +2295,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Local onde o sistema estocará os produtos acabados"
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2115,7 +2115,7 @@ msgid "Future Qty"
|
|||
msgstr "Cant. viitoare"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Cont variații de stoc"
|
||||
|
||||
|
|
@ -2173,7 +2173,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Locația în care sistemul va stoca produsele finite."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2216,7 +2216,7 @@ msgid "Future Qty"
|
|||
msgstr "Будущее Кол-во"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Счет изменения стоимости ТМЦ"
|
||||
|
||||
|
|
@ -2274,7 +2274,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Место хранения, где система будет хранить готовую продукцию."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2091,7 +2091,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2092,7 +2092,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2150,7 +2150,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2107,7 +2107,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2165,7 +2165,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2107,7 +2107,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2165,7 +2165,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -1978,8 +1978,8 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
msgid "Stock Variation Account"
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Valuation Account"
|
||||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
|
|
@ -2036,7 +2036,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid "When real-time inventory valuation is enabled on a product, this account will hold the current value of the products."
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -2093,7 +2093,7 @@ msgid "Future Qty"
|
|||
msgstr "Future Qty"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2151,7 +2151,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2092,7 +2092,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2150,7 +2150,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2091,7 +2091,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2149,7 +2149,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2253,7 +2253,7 @@ msgid "Future Qty"
|
|||
msgstr "Gelecek Miktar"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "Stok Varyasyon Hesabı"
|
||||
|
||||
|
|
@ -2311,7 +2311,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "Sistemin tamamlanan ürünleri stoklayacağı lokasyon."
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2095,7 +2095,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2153,7 +2153,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2095,7 +2095,7 @@ msgid "Future Qty"
|
|||
msgstr "Future Qty"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2153,7 +2153,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -2140,7 +2140,7 @@ msgid "Future Qty"
|
|||
msgstr "未来数量"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr "库存变动科目"
|
||||
|
||||
|
|
@ -2198,7 +2198,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr "系统存储成品的库位"
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 5.0.4\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
|
||||
"PO-Revision-Date: 2011-01-28 03:06+0000\n"
|
||||
"PO-Revision-Date: 2011-09-27 10:25+0000\n"
|
||||
"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-09-05 04:57+0000\n"
|
||||
"X-Generator: Launchpad (build 13830)\n"
|
||||
"X-Launchpad-Export-Date: 2011-09-28 05:19+0000\n"
|
||||
"X-Generator: Launchpad (build 14049)\n"
|
||||
|
||||
#. module: stock
|
||||
#: field:product.product,track_outgoing:0
|
||||
|
|
@ -163,7 +163,7 @@ msgstr ""
|
|||
#: view:report.stock.move:0
|
||||
#: field:stock.change.standard.price,stock_journal:0
|
||||
msgid "Stock journal"
|
||||
msgstr ""
|
||||
msgstr "庫存日誌"
|
||||
|
||||
#. module: stock
|
||||
#: view:report.stock.move:0
|
||||
|
|
@ -475,7 +475,7 @@ msgstr "調動統計"
|
|||
#. module: stock
|
||||
#: view:stock.production.lot:0
|
||||
msgid "Product Lots Filter"
|
||||
msgstr ""
|
||||
msgstr "生產批次篩選"
|
||||
|
||||
#. module: stock
|
||||
#: report:lot.stock.overview:0
|
||||
|
|
@ -636,7 +636,7 @@ msgstr ""
|
|||
#. module: stock
|
||||
#: constraint:stock.move:0
|
||||
msgid "You try to assign a lot which is not from the same product"
|
||||
msgstr ""
|
||||
msgstr "指定了不同產品的批次"
|
||||
|
||||
#. module: stock
|
||||
#: view:res.partner:0
|
||||
|
|
@ -1152,7 +1152,7 @@ msgstr ""
|
|||
#: code:addons/stock/stock.py:1319
|
||||
#, python-format
|
||||
msgid "is in draft state."
|
||||
msgstr "尚在草案階段"
|
||||
msgstr "尚在草案階段。"
|
||||
|
||||
#. module: stock
|
||||
#: model:ir.actions.act_window,help:stock.action_tracking_form
|
||||
|
|
@ -1402,6 +1402,12 @@ msgid ""
|
|||
"* Done: has been processed, can't be modified or cancelled anymore\n"
|
||||
"* Cancelled: has been cancelled, can't be confirmed anymore"
|
||||
msgstr ""
|
||||
"* 草案(Draft): 未確認，不會安排處理直至確認\n"
|
||||
"* 確認(Confirmed): 仍等候產品有貨供應\n"
|
||||
"* 供貨(Available): 已預留產品，只等候確認\n"
|
||||
"* 等待(Waiting): 自動供貨前要再等候下一步 (如於「接單生產(Make-To-Order)」流程)\n"
|
||||
"* 完成(Done): 已處理，無法再修改或取消\n"
|
||||
"* 取消(Cancelled): 已取消，無法再確認"
|
||||
|
||||
#. module: stock
|
||||
#: help:stock.location,company_id:0
|
||||
|
|
@ -1440,6 +1446,11 @@ msgid ""
|
|||
" When the picking is done the state is 'Done'. \n"
|
||||
"The state is 'Waiting' if the move is waiting for another one."
|
||||
msgstr ""
|
||||
"建立調動時先處於「草案(Draft)」狀態。\n"
|
||||
" 然後，如安排者找不到貨，設為「無貨(Not Available)」狀態。\n"
|
||||
" 當已預留貨物，變成「供貨(Available)」。\n"
|
||||
" 完成提貨後狀態為「完成(Done)」。 \n"
|
||||
"如調動正等候其他工作完成，狀態為「等待(Waiting)」。"
|
||||
|
||||
#. module: stock
|
||||
#: selection:report.stock.inventory,location_type:0
|
||||
|
|
@ -1486,7 +1497,7 @@ msgstr "貨幣"
|
|||
#. module: stock
|
||||
#: field:product.product,track_production:0
|
||||
msgid "Track Manufacturing Lots"
|
||||
msgstr ""
|
||||
msgstr "追蹤生產批次"
|
||||
|
||||
#. module: stock
|
||||
#: code:addons/stock/wizard/stock_inventory_merge.py:44
|
||||
|
|
@ -1537,7 +1548,7 @@ msgstr "貨架 2"
|
|||
#. module: stock
|
||||
#: field:stock.report.tracklots,tracking_id:0
|
||||
msgid "Tracking lot"
|
||||
msgstr ""
|
||||
msgstr "追蹤批次"
|
||||
|
||||
#. module: stock
|
||||
#: view:stock.picking:0
|
||||
|
|
@ -1558,7 +1569,7 @@ msgstr "本地化"
|
|||
#. module: stock
|
||||
#: model:ir.model,name:stock.model_stock_report_tracklots
|
||||
msgid "Stock report by tracking lots"
|
||||
msgstr ""
|
||||
msgstr "按追蹤批次庫存報告"
|
||||
|
||||
#. module: stock
|
||||
#: code:addons/stock/product.py:370
|
||||
|
|
@ -2091,7 +2102,7 @@ msgid "Future Qty"
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: field:product.category,property_stock_variation:0
|
||||
#: field:product.category,property_stock_valuation_account_id:0
|
||||
msgid "Stock Variation Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2119,7 +2130,7 @@ msgstr ""
|
|||
#: code:addons/stock/stock.py:2210
|
||||
#, python-format
|
||||
msgid "You can only delete draft moves."
|
||||
msgstr "不能刪除調動草案"
|
||||
msgstr "只能刪除調動草案。"
|
||||
|
||||
#. module: stock
|
||||
#: code:addons/stock/wizard/stock_partial_picking.py:97
|
||||
|
|
@ -2149,7 +2160,7 @@ msgid "Location where the system will stock the finished products."
|
|||
msgstr ""
|
||||
|
||||
#. module: stock
|
||||
#: help:product.category,property_stock_variation:0
|
||||
#: help:product.category,property_stock_valuation_account_id:0
|
||||
msgid ""
|
||||
"When real-time inventory valuation is enabled on a product, this account "
|
||||
"will hold the current value of the products."
|
||||
|
|
@ -2542,7 +2553,7 @@ msgstr "數量（量度單位）"
|
|||
#, python-format
|
||||
msgid ""
|
||||
"You are moving %.2f %s products but only %.2f %s available in this lot."
|
||||
msgstr ""
|
||||
msgstr "您正移動%.2f件 %s 產品，但此批次只有%.2f件 %s。"
|
||||
|
||||
#. module: stock
|
||||
#: view:stock.move:0
|
||||
|
|
@ -3032,7 +3043,7 @@ msgstr ""
|
|||
#. module: stock
|
||||
#: view:stock.inventory:0
|
||||
msgid "Lot Inventory"
|
||||
msgstr ""
|
||||
msgstr "批次存貨"
|
||||
|
||||
#. module: stock
|
||||
#: view:stock.move:0
|
||||
|
|
@ -3501,6 +3512,11 @@ msgid ""
|
|||
" When the picking it done the state is 'Done'. \n"
|
||||
"The state is 'Waiting' if the move is waiting for another one."
|
||||
msgstr ""
|
||||
"建立調動時先處於「草案(Draft)」狀態。\n"
|
||||
" 然後設為「確認(Confirmed)」狀態。\n"
|
||||
" 如庫存有貨，變成「供貨(Available)」。\n"
|
||||
" 完成提貨後狀態為「完成(Done)」。 \n"
|
||||
"如調動正等候其他工作完成，狀態為「等待(Waiting)」。"
|
||||
|
||||
#. module: stock
|
||||
#: view:board.board:0
|
||||
|
|
@ -3720,7 +3736,7 @@ msgstr ""
|
|||
#. module: stock
|
||||
#: constraint:stock.move:0
|
||||
msgid "You must assign a production lot for this product"
|
||||
msgstr "須為此產品分配生產批次"
|
||||
msgstr "須為此產品指定生產批次"
|
||||
|
||||
#. module: stock
|
||||
#: view:stock.move:0
|
||||
|
|
@ -3817,7 +3833,7 @@ msgstr ""
|
|||
#. module: stock
|
||||
#: model:ir.model,name:stock.model_stock_report_prodlots
|
||||
msgid "Stock report by production lots"
|
||||
msgstr "生產批次回報之庫存"
|
||||
msgstr "按生產批次庫存報告"
|
||||
|
||||
#. module: stock
|
||||
#: view:stock.location:0
|
||||
|
|
@ -3878,7 +3894,7 @@ msgstr "輸出"
|
|||
#. module: stock
|
||||
#: selection:stock.move.split.lines,action:0
|
||||
msgid "Keep in one lot"
|
||||
msgstr ""
|
||||
msgstr "保持為同一批次"
|
||||
|
||||
#. module: stock
|
||||
#: view:product.product:0
|
||||
|
|
|
|||
|
|
@ -44,13 +44,12 @@ class product_product(osv.osv):
|
|||
stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
|
||||
|
||||
journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
|
||||
account_variation = product_obj.categ_id.property_stock_variation and product_obj.categ_id.property_stock_variation.id or False
|
||||
|
||||
account_valuation = product_obj.categ_id.property_stock_valuation_account_id and product_obj.categ_id.property_stock_valuation_account_id.id or False
|
||||
return {
|
||||
'stock_account_input': stock_input_acc,
|
||||
'stock_account_output': stock_output_acc,
|
||||
'stock_journal': journal_id,
|
||||
'property_stock_variation': account_variation
|
||||
'property_stock_valuation_account_id': account_valuation
|
||||
}
|
||||
|
||||
def do_change_standard_price(self, cr, uid, ids, datas, context=None):
|
||||
|
|
@ -71,9 +70,9 @@ class product_product(osv.osv):
|
|||
stock_input_acc = datas.get('stock_input_account', False)
|
||||
journal_id = datas.get('stock_journal', False)
|
||||
product_obj=self.browse(cr, uid, ids, context=context)[0]
|
||||
account_variation = product_obj.categ_id.property_stock_variation
|
||||
account_variation_id = account_variation and account_variation.id or False
|
||||
if not account_variation_id: raise osv.except_osv(_('Error!'), _('Variation Account is not specified for Product Category: %s') % (product_obj.categ_id.name))
|
||||
account_valuation = product_obj.categ_id.property_stock_valuation_account_id
|
||||
account_valuation_id = account_valuation and account_valuation.id or False
|
||||
if not account_valuation_id: raise osv.except_osv(_('Error!'), _('Valuation Account is not specified for Product Category: %s') % (product_obj.categ_id.name))
|
||||
move_ids = []
|
||||
loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
|
||||
for rec_id in ids:
|
||||
|
|
@ -132,7 +131,7 @@ class product_product(osv.osv):
|
|||
})
|
||||
move_line_obj.create(cr, uid, {
|
||||
'name': product.categ_id.name,
|
||||
'account_id': account_variation_id,
|
||||
'account_id': account_valuation_id,
|
||||
'credit': amount_diff,
|
||||
'move_id': move_id
|
||||
})
|
||||
|
|
@ -158,7 +157,7 @@ class product_product(osv.osv):
|
|||
})
|
||||
move_line_obj.create(cr, uid, {
|
||||
'name': product.categ_id.name,
|
||||
'account_id': account_variation_id,
|
||||
'account_id': account_valuation_id,
|
||||
'debit': amount_diff,
|
||||
'move_id': move_id
|
||||
})
|
||||
|
|
@ -449,10 +448,10 @@ class product_category(osv.osv):
|
|||
type='many2one', relation='account.account',
|
||||
string='Stock Output Account', view_load=True,
|
||||
help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product.'),
|
||||
'property_stock_variation': fields.property('account.account',
|
||||
'property_stock_valuation_account_id': fields.property('account.account',
|
||||
type='many2one',
|
||||
relation='account.account',
|
||||
string="Stock Variation Account",
|
||||
string="Stock Valuation Account",
|
||||
view_load=True,
|
||||
help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<separator string="Accounting Stock Properties" colspan="2"/>
|
||||
<field name="property_stock_account_input_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_account_output_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_variation"/>
|
||||
<field name="property_stock_valuation_account_id"/>
|
||||
<field name="property_stock_journal"/>
|
||||
</group>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -2033,14 +2033,14 @@ class stock_move(osv.osv):
|
|||
else:
|
||||
acc_dest = accounts['stock_account_output']
|
||||
|
||||
acc_variation = accounts.get('property_stock_variation', False)
|
||||
acc_valuation = accounts.get('property_stock_valuation_account_id', False)
|
||||
journal_id = accounts['stock_journal']
|
||||
|
||||
if acc_dest == acc_variation:
|
||||
raise osv.except_osv(_('Error!'), _('Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same.'))
|
||||
if acc_dest == acc_valuation:
|
||||
raise osv.except_osv(_('Error!'), _('Can not create Journal Entry, Output Account defined on this product and Valuation account on category of this product are same.'))
|
||||
|
||||
if acc_src == acc_variation:
|
||||
raise osv.except_osv(_('Error!'), _('Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same.'))
|
||||
if acc_src == acc_valuation:
|
||||
raise osv.except_osv(_('Error!'), _('Can not create Journal Entry, Input Account defined on this product and Valuation account on category of this product are same.'))
|
||||
|
||||
if not acc_src:
|
||||
raise osv.except_osv(_('Error!'), _('There is no stock input account defined for this product or its category: "%s" (id: %d)') % \
|
||||
|
|
@ -2051,10 +2051,10 @@ class stock_move(osv.osv):
|
|||
if not journal_id:
|
||||
raise osv.except_osv(_('Error!'), _('There is no journal defined on the product category: "%s" (id: %d)') % \
|
||||
(move.product_id.categ_id.name, move.product_id.categ_id.id,))
|
||||
if not acc_variation:
|
||||
raise osv.except_osv(_('Error!'), _('There is no inventory variation account defined on the product category: "%s" (id: %d)') % \
|
||||
if not acc_valuation:
|
||||
raise osv.except_osv(_('Error!'), _('There is no inventory Valuation account defined on the product category: "%s" (id: %d)') % \
|
||||
(move.product_id.categ_id.name, move.product_id.categ_id.id,))
|
||||
return journal_id, acc_src, acc_dest, acc_variation
|
||||
return journal_id, acc_src, acc_dest, acc_valuation
|
||||
|
||||
def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
|
||||
"""
|
||||
|
|
@ -2104,17 +2104,17 @@ class stock_move(osv.osv):
|
|||
if move.location_id.company_id \
|
||||
and (move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal'\
|
||||
or move.location_id.company_id != move.location_dest_id.company_id):
|
||||
journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx)
|
||||
journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx)
|
||||
reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
|
||||
account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_variation, acc_dest, reference_amount, reference_currency_id, context))]
|
||||
account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_dest, reference_amount, reference_currency_id, context))]
|
||||
|
||||
# Incoming moves (or cross-company input part)
|
||||
if move.location_dest_id.company_id \
|
||||
and (move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal'\
|
||||
or move.location_id.company_id != move.location_dest_id.company_id):
|
||||
journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
|
||||
journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
|
||||
reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
|
||||
account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_variation, reference_amount, reference_currency_id, context))]
|
||||
account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))]
|
||||
|
||||
move_obj = self.pool.get('account.move')
|
||||
for j_id, move_lines in account_moves:
|
||||
|
|
|
|||
|
|
@ -260,9 +260,9 @@
|
|||
<field name="lot_input_id" ref="stock_location_shop1"/>
|
||||
</record>
|
||||
|
||||
<record forcecreate="True" id="property_stock_variation" model="ir.property">
|
||||
<field name="name">property_stock_variation</field>
|
||||
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_variation')]"/>
|
||||
<record forcecreate="True" id="property_stock_valuation_account_id" model="ir.property">
|
||||
<field name="name">property_stock_valuation_account_id</field>
|
||||
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
|
||||
<field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
</record>
|
||||
|
|
|
|||
Loading…
Reference in New Issue