Merge lp:~s-ferket/openeam/openeam into lp:openeam

[Stefaan Ferket]

Added Dutch translation

Unmerged revisions

27. By Stefaan Ferket on 2014-10-18

Added Dutch translation

26. By wowas on 2014-09-01

[ADD] filter Asset by location

25. By wowas on 2014-03-02

[UPD] translate asset_sale

24. By wowas on 2014-03-02

[ADD] new modules

23. By wowas on 2014-03-01

[ADD] icon of asset_stock

22. By wowas on 2014-03-01

[FIX] update view

21. By wowas on 2014-03-01

[ADD] new module asset_stock

20. By wowas on 2014-03-01

[FIX] remove fold field

19. By wowas on 2014-03-01

[FIX] add fold field

18. By wowas on 2014-02-26

[ADD] drag&drop manage of state

=== added file 'asset/asset_data.xml'
--- asset/asset_data.xml	1970-01-01 00:00:00 +0000
+++ asset/asset_data.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Asset states in Finance -->
+        <record id="asset_state_planned" model="asset.state">
+            <field name="name">Planned</field>
+            <field name="team">0</field>
+            <field name="state_color">7</field>
+            <field name="sequence">1</field>
+        </record>
+        <record id="asset_state_rented" model="asset.state">
+            <field name="name">Rented</field>
+            <field name="team">0</field>
+            <field name="state_color">5</field>
+            <field name="sequence">2</field>
+        </record>
+        <record id="asset_state_purchased" model="asset.state">
+            <field name="name">Purchased</field>
+            <field name="team">0</field>
+            <field name="state_color">1</field>
+            <field name="sequence">3</field>
+        </record>
+        <record id="asset_state_leased" model="asset.state">
+            <field name="name">Leased</field>
+            <field name="team">0</field>
+            <field name="state_color">4</field>
+            <field name="sequence">4</field>
+        </record>
+        <record id="asset_state_sold" model="asset.state">
+            <field name="name">Sold</field>
+            <field name="team">0</field>
+            <field name="state_color">0</field>
+            <field name="sequence">5</field>
+        </record>
+        <!-- Asset states in Warehouse -->
+        <record id="asset_state_shipped" model="asset.state">
+            <field name="name">Shipped</field>
+            <field name="team">1</field>
+            <field name="state_color">5</field>
+            <field name="sequence">1</field>
+        </record>
+        <record id="asset_state_moves" model="asset.state">
+            <field name="name">Moves</field>
+            <field name="team">1</field>
+            <field name="state_color">9</field>
+            <field name="sequence">2</field>
+        </record>
+        <record id="asset_state_stored" model="asset.state">
+            <field name="name">Stored</field>
+            <field name="team">1</field>
+            <field name="state_color">3</field>
+            <field name="sequence">3</field>
+        </record>
+        <record id="asset_state_installed" model="asset.state">
+            <field name="name">Installed</field>
+            <field name="team">1</field>
+            <field name="state_color">2</field>
+            <field name="sequence">4</field>
+        </record>
+        <record id="asset_state_use" model="asset.state">
+            <field name="name">Use</field>
+            <field name="team">1</field>
+            <field name="state_color">1</field>
+            <field name="sequence">5</field>
+        </record>
+        <record id="asset_state_stolen" model="asset.state">
+            <field name="name">Stolen</field>
+            <field name="team">1</field>
+            <field name="state_color">0</field>
+            <field name="sequence">6</field>
+        </record>
+        <record id="asset_state_retired" model="asset.state">
+            <field name="name">Retired</field>
+            <field name="team">1</field>
+            <field name="state_color">4</field>
+            <field name="sequence">7</field>
+        </record>
+        <!-- Asset states in Manufacture -->
+        <record id="asset_state_shutdown" model="asset.state">
+            <field name="name">Shutdown</field>
+            <field name="team">2</field>
+            <field name="state_color">7</field>
+            <field name="sequence">1</field>
+        </record>
+        <record id="asset_state_run" model="asset.state">
+            <field name="name">Run</field>
+            <field name="team">2</field>
+            <field name="state_color">1</field>
+            <field name="sequence">2</field>
+        </record>
+        <record id="asset_state_setup" model="asset.state">
+            <field name="name">Setup</field>
+            <field name="team">2</field>
+            <field name="state_color">2</field>
+            <field name="sequence">3</field>
+        </record>
+        <record id="asset_state_standby" model="asset.state">
+            <field name="name">Standby</field>
+            <field name="team">2</field>
+            <field name="state_color">3</field>
+            <field name="sequence">4</field>
+        </record>
+        <record id="asset_state_down" model="asset.state">
+            <field name="name">Down</field>
+            <field name="team">2</field>
+            <field name="state_color">0</field>
+            <field name="sequence">5</field>
+        </record>
+        <!-- Asset states in Maintenance -->
+        <record id="asset_state_breakdown" model="asset.state">
+            <field name="name">Breakdown</field>
+            <field name="team">3</field>
+            <field name="state_color">0</field>
+            <field name="sequence">1</field>
+        </record>
+        <record id="asset_state_repair" model="asset.state">
+            <field name="name">Repair</field>
+            <field name="team">3</field>
+            <field name="state_color">4</field>
+            <field name="sequence">2</field>
+        </record>
+        <record id="asset_state_maintenance" model="asset.state">
+            <field name="name">Maintenance</field>
+            <field name="team">3</field>
+            <field name="state_color">8</field>
+            <field name="sequence">3</field>
+        </record>
+        <record id="asset_state_operable" model="asset.state">
+            <field name="name">Operable</field>
+            <field name="team">3</field>
+            <field name="state_color">1</field>
+            <field name="sequence">4</field>
+        </record>
+        <!-- Asset states in Accounting -->
+        <record id="asset_state_draft" model="asset.state">
+            <field name="name">Draft</field>
+            <field name="team">4</field>
+            <field name="state_color">7</field>
+            <field name="sequence">1</field>
+        </record>
+        <record id="asset_state_depreciation" model="asset.state">
+            <field name="name">Depreciation</field>
+            <field name="team">4</field>
+            <field name="state_color">1</field>
+            <field name="sequence">2</field>
+        </record>
+        <record id="asset_state_close" model="asset.state">
+            <field name="name">Close</field>
+            <field name="team">4</field>
+            <field name="state_color">6</field>
+            <field name="sequence">3</field>
+        </record>
+     </data>
+</openerp>

=== renamed file 'asset/asset_data.xml' => 'asset/asset_data.xml.moved'
=== added file 'asset/i18n/asset.pot'
--- asset/i18n/asset.pot	1970-01-01 00:00:00 +0000
+++ asset/i18n/asset.pot	2014-10-18 07:04:41 +0000
@@ -0,0 +1,526 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* asset
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20140125-002455\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-26 09:25+0000\n"
+"PO-Revision-Date: 2014-02-26 09:25+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Blue"
+msgstr ""
+
+#. module: asset
+#: help:asset.state,fold:0
+msgid "This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."
+msgstr ""
+
+#. module: asset
+#: model:ir.model,name:asset.model_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "White"
+msgstr ""
+
+#. module: asset
+#: selection:asset.state,team:0
+msgid "Manufacture"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,criticality:0
+msgid "Criticality"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,warranty_end_date:0
+msgid "Warranty End"
+msgstr ""
+
+#. module: asset
+#: model:asset.asset,name:asset.asset_asset_3
+msgid "Building"
+msgstr ""
+
+#. module: asset
+#: view:asset.asset:0
+#: model:ir.actions.act_window,name:asset.action_assets
+#: model:ir.ui.menu,name:asset.menu_maintenance_assets
+#: model:ir.ui.menu,name:asset.menu_maintenance_assets_assets
+#: model:stock.location,name:asset.stock_location_assets
+msgid "Assets"
+msgstr ""
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Model:"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_setup
+msgid "Setup"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: asset
+#: help:asset.asset,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_installed
+msgid "Installed"
+msgstr ""
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Warranty"
+msgstr ""
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Manufacturer:"
+msgstr ""
+
+#. module: asset
+#: help:asset.asset,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_stored
+msgid "Stored"
+msgstr ""
+
+#. module: asset
+#: model:ir.actions.act_window,name:asset.action_management_assets
+#: model:ir.ui.menu,name:asset.menu_maintenance_assets_management
+msgid "Manage states"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_draft
+msgid "Draft"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Magenta"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_rented
+msgid "Rented"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_operable
+msgid "Operable"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,maintenance_state_id:0
+#: view:asset.state:0
+#: field:asset.state,name:0
+msgid "State"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: asset
+#: model:ir.model,name:asset.model_stock_location
+msgid "Location"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Orange"
+msgstr ""
+
+#. module: asset
+#: view:asset.state:0
+msgid "Change color"
+msgstr ""
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Serial No:"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Red"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_breakdown
+msgid "Breakdown"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_run
+msgid "Run"
+msgstr ""
+
+#. module: asset
+#: help:asset.asset,image_medium:0
+msgid "Medium-sized image of the asset. It is automatically resized as a 128x128px image, with aspect ratio preserved, only when the image exceeds one of those sizes. Use this field in form views or some kanban views."
+msgstr ""
+
+#. module: asset
+#: model:asset.asset,name:asset.asset_asset_1
+msgid "Moulding machine 25"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Cyan"
+msgstr ""
+
+#. module: asset
+#: model:ir.ui.menu,name:asset.menu_maintenance_config
+msgid "Configuration"
+msgstr ""
+
+#. module: asset
+#: help:asset.asset,image:0
+msgid "This field holds the image used as image for the asset, limited to 1024x1024px."
+msgstr ""
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Info"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,property_stock_asset:0
+msgid "Asset Location"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_standby
+msgid "Standby"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,criticality:0
+msgid "Very important"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_shipped
+msgid "Shipped"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Green"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_planned
+msgid "Planned"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,image_small:0
+msgid "Small-sized image"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "SkyBlue"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_retired
+msgid "Retired"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,image:0
+msgid "Image"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,serial:0
+msgid "Serial no."
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,image_medium:0
+msgid "Medium-sized image"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,start_date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_use
+msgid "Use"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,criticality:0
+msgid "Critical"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Black"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_maintenance
+#: selection:asset.state,team:0
+msgid "Maintenance"
+msgstr ""
+
+#. module: asset
+#: model:ir.module.category,description:asset.module_category_eam
+msgid "Helps you manage your assets."
+msgstr ""
+
+#. module: asset
+#: selection:asset.state,team:0
+msgid "Finance"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_sold
+msgid "Sold"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Yellow"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,manufacturer_id:0
+msgid "Manufacturer"
+msgstr ""
+
+#. module: asset
+#: help:asset.asset,image_small:0
+msgid "Small-sized image of the asset. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required."
+msgstr ""
+
+#. module: asset
+#: model:ir.actions.act_window,name:asset.action_asset_state
+#: model:ir.ui.menu,name:asset.menu_asset_state
+msgid "Asset States"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: asset
+#: model:ir.model,name:asset.model_asset_state
+msgid "State of Asset"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_repair
+msgid "Repair"
+msgstr ""
+
+#. module: asset
+#: field:asset.state,team:0
+msgid "Scope Team"
+msgstr ""
+
+#. module: asset
+#: help:asset.state,sequence:0
+msgid "Used to order states."
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,criticality:0
+msgid "General"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_down
+msgid "Down"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_shutdown
+msgid "Shutdown"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,asset_number:0
+msgid "Asset Number"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_close
+msgid "Close"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_moves
+msgid "Moves"
+msgstr ""
+
+#. module: asset
+#: help:asset.asset,property_stock_asset:0
+msgid "This location will be used as the destination location for installed parts during asset life."
+msgstr ""
+
+#. module: asset
+#: field:asset.state,state_color:0
+msgid "State Color"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: asset
+#: selection:asset.state,team:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,name:0
+msgid "Asset Name"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_leased
+msgid "Leased"
+msgstr ""
+
+#. module: asset
+#: field:asset.state,fold:0
+msgid "Hide in views if empty"
+msgstr ""
+
+#. module: asset
+#: selection:asset.asset,criticality:0
+msgid "Important"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_stolen
+msgid "Stolen"
+msgstr ""
+
+#. module: asset
+#: model:asset.asset,name:asset.asset_asset_2
+msgid "Truck"
+msgstr ""
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_depreciation
+msgid "Depreciation"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,vendor_id:0
+msgid "Vendor"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,model:0
+msgid "Model"
+msgstr ""
+
+#. module: asset
+#: model:stock.location,name:asset.stock_location_locations_asset
+msgid "Asset Locations"
+msgstr ""
+
+#. module: asset
+#: help:asset.asset,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: asset
+#: field:asset.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,maintenance_state_color:0
+msgid "Color"
+msgstr ""
+
+#. module: asset
+#: field:asset.asset,warranty_start_date:0
+msgid "Warranty Start"
+msgstr ""
+
+#. module: asset
+#: selection:asset.state,team:0
+msgid "Accounting"
+msgstr ""
+
+#. module: asset
+#: model:ir.module.category,name:asset.module_category_eam
+msgid "Enterprise Asset Management"
+msgstr ""
+

=== renamed file 'asset/i18n/asset.pot' => 'asset/i18n/asset.pot.moved'
=== added file 'asset/i18n/nl.po'
--- asset/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ asset/i18n/nl.po	2014-10-18 07:04:41 +0000
@@ -0,0 +1,507 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20140804-231303\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-18 05:59+0000\n"
+"PO-Revision-Date: 2014-10-18 05:59+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Blauw"
+msgstr "Blauw"
+
+#. module: asset
+#: model:ir.model,name:asset.model_asset_asset
+msgid "Asset"
+msgstr "Asset"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "White"
+msgstr "Wit"
+
+#. module: asset
+#: selection:asset.state,team:0
+msgid "Manufacture"
+msgstr "Fabricage"
+
+#. module: asset
+#: field:asset.asset,criticality:0
+msgid "Criticality"
+msgstr "Kritiek element"
+
+#. module: asset
+#: field:asset.asset,message_unread:0
+msgid "Unread Messages"
+msgstr "Ongelezen Berichten"
+
+#. module: asset
+#: field:asset.asset,warranty_end_date:0
+msgid "Warranty End"
+msgstr "Einde Garantie"
+
+#. module: asset
+#: view:asset.asset:0
+#: model:ir.actions.act_window,name:asset.action_assets
+#: model:ir.ui.menu,name:asset.menu_maintenance_assets
+#: model:ir.ui.menu,name:asset.menu_maintenance_assets_assets
+#: model:stock.location,name:asset.stock_location_assets
+msgid "Assets"
+msgstr "Assets"
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Model:"
+msgstr "Model:"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_setup
+msgid "Setup"
+msgstr "Setup"
+
+#. module: asset
+#: field:asset.asset,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. module: asset
+#: help:asset.asset,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Indien aangevinkt nieuwe berichten vragen om uw aandacht."
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_installed
+msgid "Installed"
+msgstr "Geïnstalleerd"
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Warranty"
+msgstr "Garantie"
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Manufacturer:"
+msgstr "Fabrikant:"
+
+#. module: asset
+#: help:asset.asset,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr "Houdt de Chatter samenvatting (aantal berichten, ...). Deze samenvatting is rechtstreeks in html-formaat om in kanban bekeken moet worden ingevoegd."
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_stored
+msgid "Stored"
+msgstr "Opgeslagen"
+
+#. module: asset
+#: model:ir.actions.act_window,name:asset.action_management_assets
+#: model:ir.ui.menu,name:asset.menu_maintenance_assets_management
+msgid "Manage states"
+msgstr "Beheer statussen"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_draft
+msgid "Draft"
+msgstr "Concept"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Magenta"
+msgstr "Magenta"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_rented
+msgid "Rented"
+msgstr "Verhuurd"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_operable
+msgid "Operable"
+msgstr "Bruikbaar"
+
+#. module: asset
+#: field:asset.asset,finance_state_id:0
+#: field:asset.asset,maintenance_state_id:0
+#: field:asset.asset,manufacture_state_id:0
+#: field:asset.asset,warehouse_state_id:0
+#: view:asset.state:0
+#: field:asset.state,name:0
+msgid "State"
+msgstr "Staat"
+
+#. module: asset
+#: field:asset.asset,message_follower_ids:0
+msgid "Followers"
+msgstr "Volgers"
+
+#. module: asset
+#: model:ir.model,name:asset.model_stock_location
+msgid "Location"
+msgstr "Locatie"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Orange"
+msgstr "Orange"
+
+#. module: asset
+#: view:asset.state:0
+msgid "Change color"
+msgstr "Kleur veranderen"
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Serial No:"
+msgstr "Serienummer:"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Red"
+msgstr "Rood"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_breakdown
+msgid "Breakdown"
+msgstr "Storing"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_run
+msgid "Run"
+msgstr "Run"
+
+#. module: asset
+#: help:asset.asset,image_medium:0
+msgid "Medium-sized image of the asset. It is automatically resized as a 128x128px image, with aspect ratio preserved, only when the image exceeds one of those sizes. Use this field in form views or some kanban views."
+msgstr "Middelgrote afbeelding van het asset. Het wordt automatisch vergroot of verkleind beeld 128x128px als, met beeldverhouding behouden, alleen wanneer de afbeelding groter is dan een van die maten. Gebruik dit veld in uitzicht vorm of een kanban uitzicht."
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Cyan"
+msgstr "Cyaan"
+
+#. module: asset
+#: model:ir.ui.menu,name:asset.menu_maintenance_config
+msgid "Configuration"
+msgstr "Configuratie"
+
+#. module: asset
+#: help:asset.asset,image:0
+msgid "This field holds the image used as image for the asset, limited to 1024x1024px."
+msgstr "Dit veld bevat het gebruikt als afbeelding voor het actief afbeelding, beperkt tot 1024x1024px."
+
+#. module: asset
+#: view:asset.asset:0
+msgid "Info"
+msgstr "Info"
+
+#. module: asset
+#: field:asset.asset,property_stock_asset:0
+msgid "Asset Location"
+msgstr "Asset locatie"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_purchased
+msgid "Purchased"
+msgstr "Gekocht"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_standby
+msgid "Standby"
+msgstr "Standby"
+
+#. module: asset
+#: selection:asset.asset,criticality:0
+msgid "Very important"
+msgstr "Heel belangrijk"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_shipped
+msgid "Shipped"
+msgstr "Verscheept"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Green"
+msgstr "Groen"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_planned
+msgid "Planned"
+msgstr "Geplande"
+
+#. module: asset
+#: field:asset.asset,image_small:0
+msgid "Small-sized image"
+msgstr "Kleine afbeelding"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "SkyBlue"
+msgstr "Hemelsblauw"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_retired
+msgid "Retired"
+msgstr "Gepensioneerd"
+
+#. module: asset
+#: field:asset.asset,image:0
+msgid "Image"
+msgstr "Afbeelding"
+
+#. module: asset
+#: field:asset.asset,serial:0
+msgid "Serial no."
+msgstr "Serienummer."
+
+#. module: asset
+#: field:asset.asset,image_medium:0
+msgid "Medium-sized image"
+msgstr "Middelgrote afbeelding 
+"
+
+#. module: asset
+#: field:asset.asset,start_date:0
+msgid "Start Date"
+msgstr "Startdatum"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_use
+msgid "Use"
+msgstr "Gebruik"
+
+#. module: asset
+#: selection:asset.asset,criticality:0
+msgid "Critical"
+msgstr "Kritiek
+"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Black"
+msgstr "Zwart"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_maintenance
+#: selection:asset.state,team:0
+msgid "Maintenance"
+msgstr "Onderhoud "
+
+#. module: asset
+#: model:ir.module.category,description:asset.module_category_eam
+msgid "Helps you manage your assets."
+msgstr "Helpt u uw assets te beheren."
+
+#. module: asset
+#: selection:asset.state,team:0
+msgid "Finance"
+msgstr "Financiën"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_sold
+msgid "Sold"
+msgstr "Verkocht"
+
+#. module: asset
+#: field:asset.asset,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Is een volger"
+
+#. module: asset
+#: field:asset.asset,active:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: asset
+#: selection:asset.asset,maintenance_state_color:0
+#: selection:asset.state,state_color:0
+msgid "Yellow"
+msgstr "Geel"
+
+#. module: asset
+#: field:asset.asset,manufacturer_id:0
+msgid "Manufacturer"
+msgstr "Fabrikant"
+
+#. module: asset
+#: help:asset.asset,image_small:0
+msgid "Small-sized image of the asset. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required."
+msgstr "Kleine afbeelding van het actief. Het wordt automatisch vergroot of verkleind beeld 64x64px zo, met beeldverhouding behouden. Gebruik dit veld ergens een kleine afbeelding is vereist."
+
+#. module: asset
+#: model:ir.actions.act_window,name:asset.action_asset_state
+#: model:ir.ui.menu,name:asset.menu_asset_state
+msgid "Asset States"
+msgstr "Asset Statussen"
+
+#. module: asset
+#: field:asset.asset,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: asset
+#: model:ir.model,name:asset.model_asset_state
+msgid "State of Asset"
+msgstr "Staat van Asset"
+
+#. module: asset
+#: field:asset.asset,user_id:0
+msgid "Assigned to"
+msgstr "Toegewezen aan"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_repair
+msgid "Repair"
+msgstr "Reparatie"
+
+#. module: asset
+#: field:asset.state,team:0
+msgid "Scope Team"
+msgstr "Scope Team"
+
+#. module: asset
+#: help:asset.state,sequence:0
+msgid "Used to order states."
+msgstr "Gebruikt om statussen te ordenen."
+
+#. module: asset
+#: selection:asset.asset,criticality:0
+msgid "General"
+msgstr "
+Algemeen"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_down
+msgid "Down"
+msgstr "Omlaag"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_shutdown
+msgid "Shutdown"
+msgstr "Stilgelegd"
+
+#. module: asset
+#: field:asset.asset,asset_number:0
+msgid "Asset Number"
+msgstr "Asset Nummer"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_close
+msgid "Close"
+msgstr "Sluiten"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_moves
+msgid "Moves"
+msgstr "Verplaatstingen"
+
+#. module: asset
+#: help:asset.asset,property_stock_asset:0
+msgid "This location will be used as the destination location for installed parts during asset life."
+msgstr "Deze locatie zal worden gebruikt als de doellocatie voor de geïnstalleerde onderdelen tijdens de levensduur van het activum."
+
+#. module: asset
+#: field:asset.state,state_color:0
+msgid "State Color"
+msgstr "Kleur status"
+
+#. module: asset
+#: field:asset.asset,purchase_date:0
+msgid "Purchase Date"
+msgstr "Aankoopdatum"
+
+#. module: asset
+#: selection:asset.state,team:0
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#. module: asset
+#: field:asset.asset,name:0
+msgid "Asset Name"
+msgstr "Asset Naam"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_leased
+msgid "Leased"
+msgstr "Geleased"
+
+#. module: asset
+#: selection:asset.asset,criticality:0
+msgid "Important"
+msgstr "Belangrijk"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_stolen
+msgid "Stolen"
+msgstr "Gestolen"
+
+#. module: asset
+#: model:asset.state,name:asset.asset_state_depreciation
+msgid "Depreciation"
+msgstr "Afschrijvingen"
+
+#. module: asset
+#: field:asset.asset,vendor_id:0
+msgid "Vendor"
+msgstr "Leverancier"
+
+#. module: asset
+#: field:asset.asset,model:0
+msgid "Model"
+msgstr "Model"
+
+#. module: asset
+#: model:stock.location,name:asset.stock_location_locations_asset
+msgid "Asset Locations"
+msgstr "Asset Locaties"
+
+#. module: asset
+#: help:asset.asset,message_ids:0
+msgid "Messages and communication history"
+msgstr "Berichten en communicatie geschiedenis"
+
+#. module: asset
+#: field:asset.state,sequence:0
+msgid "Sequence"
+msgstr "Volgorde"
+
+#. module: asset
+#: field:asset.asset,maintenance_state_color:0
+msgid "Color"
+msgstr "Kleur"
+
+#. module: asset
+#: field:asset.asset,warranty_start_date:0
+msgid "Warranty Start"
+msgstr "Garantie Start"
+
+#. module: asset
+#: selection:asset.state,team:0
+msgid "Accounting"
+msgstr "Boekhouding"
+
+#. module: asset
+#: model:ir.module.category,name:asset.module_category_eam
+msgid "Enterprise Asset Management"
+msgstr "Enterprise Asset Management"
+

=== added directory 'asset/static/src/css'
=== renamed directory 'asset/static/src/css' => 'asset/static/src/css.moved'
=== added file 'asset/static/src/css/asset.css'
--- asset/static/src/css/asset.css	1970-01-01 00:00:00 +0000
+++ asset/static/src/css/asset.css	2014-10-18 07:04:41 +0000
@@ -0,0 +1,83 @@
+@charset "utf-8";
+.codup_status {
+  margin: -3px 2px -5px 2px;
+  display: inline-block;
+  height: 20px;
+  width: 20px;
+  border-radius: 10px;
+  background-position: center center;
+  background-image: radial-gradient(at 35% 35%, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0) 40%), radial-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8) 80%);
+  box-shadow: 0 0 3px;
+}
+.codup_status_color_0 {
+  background-color: #ff0000;
+}
+.codup_status_color_1 {
+  background-color: #00ff00;
+}
+.codup_status_color_2 {
+  background-color: #0000ff;
+}
+.codup_status_color_3 {
+  background-color: #ffff00;
+}
+.codup_status_color_4 {
+  background-color: #ff00ff;
+}
+.codup_status_color_5 {
+  background-color: #00ffff;
+}
+.codup_status_color_6 {
+  background-color: #000000;
+}
+.codup_status_color_7 {
+  background-color: #ffffff;
+}
+.codup_status_color_8 {
+  background-color: #ff8000;
+}
+.codup_status_color_9 {
+  background-color: #0080ff;
+}
+.codup_kanban_status {
+  background-color: #E6E6E6 !important;
+  border-color: #C8C8C8 !important;
+}
+.codup_kanban_status:hover {
+  box-shadow: 3px 3px 5px rgba(0,0,0,0.1);
+  border-color: #D8D8D8 #C8C8C8 #C8C8C8 #D8D8D8 !important;
+}
+.codup_kanban_status:hover .codup_status {
+  background-image: radial-gradient(at 33% 34%, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0) 40%), radial-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9) 80%);
+}
+.codup_kanban_left {
+  display: inline-block;
+}
+.codup_kanban_left .codup_status {
+  display: block;
+  margin: 7px 22px;
+}
+.codup_kanban_info .oe_kanban_avatar{
+  margin-left: 20px;
+}
+.codup_attention_on, .codup_attention_off {
+  font-family: "entypoRegular";
+  font-size: 24px;
+  color: #cccccc !important;
+  text-shadow: 0 0 2px black;
+  text-decoration: none !important;
+}
+.codup_attention_on:hover, .codup_attention_off:hover {
+  text-decoration: none !important;
+}
+.codup_attention_on {
+  color: gold !important;
+}
+.openerp .oe_kanban_view .codup_kanban_details {
+    display: inline-block;
+    vertical-align: top;
+    width: 140px;
+    font-size: 13px;
+    padding: 0px 5px;
+    color: #4C4C4C;
+}
\ No newline at end of file

=== added directory 'asset_account'
=== renamed directory 'asset_account' => 'asset_account.moved'
=== added file 'asset_account/__init__.py'
--- asset_account/__init__.py	1970-01-01 00:00:00 +0000
+++ asset_account/__init__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import asset
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'asset_account/__openerp__.py'
--- asset_account/__openerp__.py	1970-01-01 00:00:00 +0000
+++ asset_account/__openerp__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Assets & Finance',
+    'version': '1.0',
+    'summary': 'Integrate Asset and Accounting',
+    'description': """
+Integrate financial and maintenance asset management.
+===========================
+
+This module allows use the same Assets for maintenance and accounting purposes.
+Integration take in account assumption that maintenable asset is physical asset
+and must have depreciation. Also vice versa, if asset have depreciation then
+it must be maintenable. So, when you create asset for accounting, it automaticaly
+available for maintenance. And when you create asset for maintenance, it automaticaly
+available for finance.
+Keep one entity in one place for escape mistakes!
+    """,
+    'author': 'CodUP',
+    'website': 'http://codup.com',
+    'category': 'Enterprise Asset Management',
+    'sequence': 0,
+    'depends': ['asset','account_asset'],
+    'data': ['asset_view.xml'],
+    'installable': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_account/asset.py'
--- asset_account/asset.py	1970-01-01 00:00:00 +0000
+++ asset_account/asset.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+class account_asset(osv.osv):
+    _inherit = 'account.asset.asset'
+    
+    def _get_name(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for asset in self.browse(cr, uid, ids, context=context):
+            res[asset.id] = asset.asset_id.name
+        return res	
+
+    _columns = {
+        'name': fields.function(_get_name, method=True, type='char', string='Asset'),
+        'asset_id': fields.many2one('asset.asset', 'Asset', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_account/asset_view.xml'
--- asset_account/asset_view.xml	1970-01-01 00:00:00 +0000
+++ asset_account/asset_view.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <record id="assets_form_view" model="ir.ui.view">
+            <field name="name">account.asset.asset.form.inherit</field>
+            <field name="model">account.asset.asset</field>
+            <field name="inherit_id" ref="account_asset.view_account_asset_asset_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="category_id" position="before" version="7.0">
+                        <field name="asset_id"/>
+                    </field>
+                    <label for="name" position="replace"/>
+                </data>
+            </field>
+        </record>
+        
+ 	</data>
+</openerp>

=== added directory 'asset_account/static'
=== added directory 'asset_account/static/src'
=== added directory 'asset_account/static/src/img'
=== added file 'asset_account/static/src/img/icon.png'
Binary files asset_account/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and asset_account/static/src/img/icon.png	2014-10-18 07:04:41 +0000 differ
=== added directory 'asset_mrp'
=== renamed directory 'asset_mrp' => 'asset_mrp.moved'
=== added file 'asset_mrp/__init__.py'
--- asset_mrp/__init__.py	1970-01-01 00:00:00 +0000
+++ asset_mrp/__init__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import mrp
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'asset_mrp/__openerp__.py'
--- asset_mrp/__openerp__.py	1970-01-01 00:00:00 +0000
+++ asset_mrp/__openerp__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Assets & Manufacturing',
+    'version': '1.0',
+    'summary': 'Integrate Asset and Manufacturing',
+    'description': """
+Integrate manufacturing and maintenance asset management.
+===========================
+
+This module allows use the same Assets for manufacturing and maintenance purposes.
+Integration take in account following assumption. In manufacturing,
+Work Center can be simple logical entity, but also can reference
+to equipment that is physical asset. Each physical asset must be maintenable, but
+not each can be manufacturing equipment. So, when you create Work Center, you can
+reference it to asset.
+Keep one entity in one place for escape mistakes!
+    """,
+    'author': 'CodUP',
+    'website': 'http://codup.com',
+    'category': 'Enterprise Asset Management',
+    'sequence': 0,
+    'depends': ['asset','mrp'],
+    'data': ['mrp_view.xml'],
+    'installable': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_mrp/mrp.py'
--- asset_mrp/mrp.py	1970-01-01 00:00:00 +0000
+++ asset_mrp/mrp.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+class mrp_workcenter(osv.osv):
+    _inherit = 'mrp.workcenter'
+    _columns = {
+        'asset_ids': fields.many2many('asset.asset', string='Asset'),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_mrp/mrp_view.xml'
--- asset_mrp/mrp_view.xml	1970-01-01 00:00:00 +0000
+++ asset_mrp/mrp_view.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <record id="mrp_workcenter_view" model="ir.ui.view">
+            <field name="name">mrp.workcenter.form.inherit</field>
+            <field name="model">mrp.workcenter</field>
+            <field name="inherit_id" ref="mrp.mrp_workcenter_view"/>
+            <field name="arch" type="xml">
+                <page string="General Information" position="after" version="7.0">
+                    <page string="Assets">
+                        <field name="asset_ids">
+                            <tree string="Assets">
+                                <field name="name" string="Asset"/>
+                                <field name="model"/>
+                                <field name="property_stock_asset" string="Location"/>
+                            </tree>
+                        </field>
+                    </page>
+                </page>
+            </field>
+        </record>
+        
+ 	</data>
+</openerp>

=== added directory 'asset_mrp/static'
=== added directory 'asset_mrp/static/src'
=== added directory 'asset_mrp/static/src/img'
=== added file 'asset_mrp/static/src/img/icon.png'
Binary files asset_mrp/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and asset_mrp/static/src/img/icon.png	2014-10-18 07:04:41 +0000 differ
=== added directory 'asset_purchase'
=== renamed directory 'asset_purchase' => 'asset_purchase.moved'
=== added file 'asset_purchase/__init__.py'
--- asset_purchase/__init__.py	1970-01-01 00:00:00 +0000
+++ asset_purchase/__init__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import asset
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'asset_purchase/__openerp__.py'
--- asset_purchase/__openerp__.py	1970-01-01 00:00:00 +0000
+++ asset_purchase/__openerp__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Assets & Purchase',
+    'version': '1.0',
+    'summary': 'Integrate Asset and Purchase',
+    'description': """
+Integrate Maintenance and Purchase.
+===========================
+
+This module allows use the same Assets for purchase and maintenance purposes.
+Keep one entity in one place for escape mistakes!
+    """,
+    'author': 'CodUP',
+    'website': 'http://codup.com',
+    'category': 'Enterprise Asset Management',
+    'sequence': 0,
+    'depends': ['purchase','asset'],
+    'demo': ['asset_demo.xml'],
+    'data': ['purchase_view.xml'],
+    'installable': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_purchase/asset.py'
--- asset_purchase/asset.py	1970-01-01 00:00:00 +0000
+++ asset_purchase/asset.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+from openerp.addons.asset.asset import STATE_COLOR_SELECTION
+
+
+class asset_asset(osv.osv):
+    _inherit = 'asset.asset'
+
+    _columns = {
+        'finance_state_color': fields.related('finance_state_id', 'state_color', type="selection", selection=STATE_COLOR_SELECTION, string="Color", readonly=True),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_purchase/asset_demo.xml'
--- asset_purchase/asset_demo.xml	1970-01-01 00:00:00 +0000
+++ asset_purchase/asset_demo.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        
+        <!-- Resource: asset.asset -->
+        <record id="asset.asset_asset_1" model="asset.asset">
+            <field name="finance_state_id" ref="asset.asset_state_purchased"/>
+        </record>
+
+        <record id="asset.asset_asset_2" model="asset.asset">
+            <field name="finance_state_id" ref="asset.asset_state_rented"/>
+        </record>
+
+        <record id="asset.asset_asset_3" model="asset.asset">
+            <field name="finance_state_id" ref="asset.asset_state_leased"/>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'asset_purchase/i18n'
=== added file 'asset_purchase/i18n/asset_purchase.pot'
--- asset_purchase/i18n/asset_purchase.pot	1970-01-01 00:00:00 +0000
+++ asset_purchase/i18n/asset_purchase.pot	2014-10-18 07:04:41 +0000
@@ -0,0 +1,66 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* asset_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20140125-002455\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-02 08:41+0000\n"
+"PO-Revision-Date: 2014-03-02 08:41+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: asset_purchase
+#: view:asset.asset:0
+msgid "Info"
+msgstr ""
+
+#. module: asset_purchase
+#: view:asset.asset:0
+msgid "Model:"
+msgstr ""
+
+#. module: asset_purchase
+#: view:asset.asset:0
+#: model:ir.actions.act_window,name:asset_purchase.action_assets_purchase
+#: model:ir.ui.menu,name:asset_purchase.menu_maintenance_assets
+#: model:ir.ui.menu,name:asset_purchase.menu_maintenance_assets_assets
+msgid "Assets"
+msgstr ""
+
+#. module: asset_purchase
+#: model:ir.ui.menu,name:asset_purchase.menu_asset_state
+msgid "Asset States"
+msgstr ""
+
+#. module: asset_purchase
+#: view:asset.asset:0
+msgid "Manufacturer:"
+msgstr ""
+
+#. module: asset_purchase
+#: model:ir.model,name:asset_purchase.model_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: asset_purchase
+#: model:ir.actions.act_window,name:asset_purchase.action_management_assets_purchase
+#: model:ir.ui.menu,name:asset_purchase.menu_maintenance_assets_management
+msgid "Manage states"
+msgstr ""
+
+#. module: asset_purchase
+#: view:asset.asset:0
+msgid "Warranty"
+msgstr ""
+
+#. module: asset_purchase
+#: view:asset.asset:0
+msgid "Serial No:"
+msgstr ""
+

=== added file 'asset_purchase/i18n/ru.po'
--- asset_purchase/i18n/ru.po	1970-01-01 00:00:00 +0000
+++ asset_purchase/i18n/ru.po	2014-10-18 07:04:41 +0000
@@ -0,0 +1,35 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* asset_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20140125-002455\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-02 08:41+0000\n"
+"PO-Revision-Date: 2014-03-02 08:41+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: asset_purchase
+#: view:asset.asset:0
+#: model:ir.actions.act_window,name:asset_purchase.action_assets_purchase
+#: model:ir.ui.menu,name:asset_purchase.menu_maintenance_assets
+#: model:ir.ui.menu,name:asset_purchase.menu_maintenance_assets_assets
+msgid "Assets"
+msgstr "Активы"
+
+#. module: asset_purchase
+#: model:ir.ui.menu,name:asset_purchase.menu_asset_state
+msgid "Asset States"
+msgstr "Состояния активов"
+
+#. module: asset_purchase
+#: model:ir.actions.act_window,name:asset_purchase.action_management_assets_purchase
+#: model:ir.ui.menu,name:asset_purchase.menu_maintenance_assets_management
+msgid "Manage states"
+msgstr "Управление состояниями"
\ No newline at end of file

=== added file 'asset_purchase/purchase_view.xml'
--- asset_purchase/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ asset_purchase/purchase_view.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <!-- Asset menu -->
+        <menuitem name="Assets"
+            id="menu_maintenance_assets"
+            parent="base.menu_purchase_root"
+            sequence="9"/>
+
+        <!-- Asset Form View  -->
+        <record id="assets_form_view_purchase" model="ir.ui.view">
+            <field name="name">asset.asset.form.purchase</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <form string="Assets" version="7.0">
+                    <header>
+                        <field name="finance_state_id" widget="statusbar" clickable="True"/>
+                    </header>
+                    <sheet>
+                        <field name="image_medium" widget="image" class="oe_avatar oe_left"/>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <field name="property_stock_asset" domain="[('usage','=','asset')]"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="criticality"/>
+                                <field name="user_id"/>
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Info">
+                                <group>
+                                    <group>
+                                        <field name="asset_number"/>
+                                        <field name="model"/>
+                                        <field name="serial"/>
+                                    </group>
+                                    <group>
+                                    </group>
+                                </group>
+                                <group string="Warranty">
+                                    <group>
+                                    <field name="manufacturer_id"/>
+                                    <field name="start_date"/>
+                                    <field name="warranty_start_date"/>
+                                    </group>
+                                    <group>
+                                    <field name="vendor_id"/>
+                                    <field name="purchase_date"/>
+                                    <field name="warranty_end_date"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+                     </sheet>
+                     <div class="oe_chatter">
+                            <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <!-- Asset Kanban View  -->
+        <record model="ir.ui.view" id="assets_kanban_view_purchase">
+            <field name="name">asset.asset.kanban.purchase</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="finance_state_id"/>
+                    <field name="finance_state_color"/>
+                    <field name="user_id"/>
+                    <field name="criticality"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_vignette">
+                                <div class="codup_kanban_left">
+                                    <a type="open"><img t-att-src="kanban_image('asset.asset', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                    <div t-attf-title="#{record.finance_state_id.value}" t-attf-class="codup_status_color_#{record.finance_state_color.raw_value} codup_status"></div>
+                                </div>
+                                <div class="oe_kanban_details">
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                    </h4>
+                                    <ul>
+                                        <li>Model: <field name="model"></field></li>
+                                        <li>Manufacturer: <field name="manufacturer_id"></field></li>
+                                        <li>Serial No: <field name="serial"></field></li>
+                                        <li class="codup_kanban_info">
+                                        <a t-if="record.criticality.raw_value == 0" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 0" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 1" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 1" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 2" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 2" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_assets_purchase" model="ir.actions.act_window">
+            <field name="name">Assets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">asset.asset</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="view_id" eval="False"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_kanban_view_purchase">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="assets_kanban_view_purchase"/>
+            <field name="act_window_id" ref="action_assets_purchase"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_tree_view_purchase">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="asset.assets_tree_view"/>
+            <field name="act_window_id" ref="action_assets_purchase"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_form_view_purchase">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="assets_form_view_purchase"/>
+            <field name="act_window_id" ref="action_assets_purchase"/>
+        </record>
+
+        <!-- Asset item -->
+        <menuitem name="Assets"
+            action="action_assets_purchase"
+            id="menu_maintenance_assets_assets"
+            parent="menu_maintenance_assets"
+            sequence="100"/>
+
+        <!-- Management Asset Kanban View  -->
+        <record model="ir.ui.view" id="management_assets_kanban_view_purchase">
+            <field name="name">Manage states Asset Kanban</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="finance_state_id" create="false" delete="false">
+                    <field name="finance_state_id"/>
+                    <field name="finance_state_color"/>
+                    <field name="user_id"/>
+                    <field name="criticality"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card codup_kanban_status oe_kanban_global_click">
+                                <div class="codup_kanban_left">
+                                    <a type="open"><img t-att-src="kanban_image('asset.asset', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                    <div t-attf-title="#{record.finance_state_id.value}" t-attf-class="codup_status_color_#{record.finance_state_color.raw_value} codup_status"></div>
+                                </div>
+                                <div class="codup_kanban_details">
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                    </h4>
+                                    <ul>
+                                        <li title="Model"><field name="model"></field></li>
+                                        <li title="Manufacturer"><field name="manufacturer_id"></field></li>
+                                        <li class="codup_kanban_info">
+                                        <a t-if="record.criticality.raw_value == 0" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 0" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 1" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 1" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 2" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 2" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_management_assets_purchase" model="ir.actions.act_window">
+            <field name="name">Manage states</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">asset.asset</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,form</field>
+            <field name="view_id" eval="False"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="action_management_assets_kanban_view_purchase">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="management_assets_kanban_view_purchase"/>
+            <field name="act_window_id" ref="action_management_assets_purchase"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="action_management_assets_form_view_purchase">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="assets_form_view_purchase"/>
+            <field name="act_window_id" ref="action_management_assets_purchase"/>
+        </record>
+
+        <!-- Management Asset item -->
+        <menuitem name="Manage states"
+            action="action_management_assets_purchase"
+            id="menu_maintenance_assets_management"
+            parent="menu_maintenance_assets"
+            sequence="100"/>    
+
+        <!-- Asset state item -->
+        <menuitem name="Asset States"
+            action="asset.action_asset_state"
+            id="menu_asset_state"
+            parent="purchase.menu_purchase_config_purchase"
+            sequence="100"/>
+    
+ 	</data>
+</openerp>

=== added directory 'asset_purchase/static'
=== added directory 'asset_purchase/static/src'
=== added directory 'asset_purchase/static/src/img'
=== added file 'asset_purchase/static/src/img/icon.png'
Binary files asset_purchase/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and asset_purchase/static/src/img/icon.png	2014-10-18 07:04:41 +0000 differ
=== added directory 'asset_sale'
=== renamed directory 'asset_sale' => 'asset_sale.moved'
=== added file 'asset_sale/__init__.py'
--- asset_sale/__init__.py	1970-01-01 00:00:00 +0000
+++ asset_sale/__init__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import asset
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'asset_sale/__openerp__.py'
--- asset_sale/__openerp__.py	1970-01-01 00:00:00 +0000
+++ asset_sale/__openerp__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Assets & Sale',
+    'version': '1.0',
+    'summary': 'Integrate Asset and Sale',
+    'description': """
+Integrate Maintenance and Sale.
+===========================
+
+This module allows use the same Assets for sale and maintenance purposes.
+Keep one entity in one place for escape mistakes!
+    """,
+    'author': 'CodUP',
+    'website': 'http://codup.com',
+    'category': 'Enterprise Asset Management',
+    'sequence': 0,
+    'depends': ['sale','asset'],
+    'demo': ['asset_demo.xml'],
+    'data': ['sale_view.xml'],
+    'installable': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_sale/asset.py'
--- asset_sale/asset.py	1970-01-01 00:00:00 +0000
+++ asset_sale/asset.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+from openerp.addons.asset.asset import STATE_COLOR_SELECTION
+
+
+class asset_asset(osv.osv):
+    _inherit = 'asset.asset'
+
+    _columns = {
+        'finance_state_color': fields.related('finance_state_id', 'state_color', type="selection", selection=STATE_COLOR_SELECTION, string="Color", readonly=True),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_sale/asset_demo.xml'
--- asset_sale/asset_demo.xml	1970-01-01 00:00:00 +0000
+++ asset_sale/asset_demo.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        
+        <!-- Resource: asset.asset -->
+        <record id="asset.asset_asset_1" model="asset.asset">
+            <field name="finance_state_id" ref="asset.asset_state_purchased"/>
+        </record>
+
+        <record id="asset.asset_asset_2" model="asset.asset">
+            <field name="finance_state_id" ref="asset.asset_state_rented"/>
+        </record>
+
+        <record id="asset.asset_asset_3" model="asset.asset">
+            <field name="finance_state_id" ref="asset.asset_state_leased"/>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'asset_sale/i18n'
=== added file 'asset_sale/i18n/asset_sale.pot'
--- asset_sale/i18n/asset_sale.pot	1970-01-01 00:00:00 +0000
+++ asset_sale/i18n/asset_sale.pot	2014-10-18 07:04:41 +0000
@@ -0,0 +1,121 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* asset_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20140125-002455\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-02 08:26+0000\n"
+"PO-Revision-Date: 2014-03-02 08:26+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "Blue"
+msgstr ""
+
+#. module: asset_sale
+#: view:asset.asset:0
+msgid "Info"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "Green"
+msgstr ""
+
+#. module: asset_sale
+#: view:asset.asset:0
+#: model:ir.actions.act_window,name:asset_sale.action_assets_sale
+#: model:ir.ui.menu,name:asset_sale.menu_maintenance_assets
+#: model:ir.ui.menu,name:asset_sale.menu_maintenance_assets_assets
+msgid "Assets"
+msgstr ""
+
+#. module: asset_sale
+#: view:asset.asset:0
+msgid "Model:"
+msgstr ""
+
+#. module: asset_sale
+#: field:asset.asset,finance_state_color:0
+msgid "Color"
+msgstr ""
+
+#. module: asset_sale
+#: model:ir.ui.menu,name:asset_sale.menu_asset_state
+msgid "Asset States"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "SkyBlue"
+msgstr ""
+
+#. module: asset_sale
+#: view:asset.asset:0
+msgid "Manufacturer:"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "Orange"
+msgstr ""
+
+#. module: asset_sale
+#: view:asset.asset:0
+msgid "Warranty"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "Yellow"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "Black"
+msgstr ""
+
+#. module: asset_sale
+#: model:ir.model,name:asset_sale.model_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: asset_sale
+#: model:ir.actions.act_window,name:asset_sale.action_management_assets_sale
+#: model:ir.ui.menu,name:asset_sale.menu_maintenance_assets_management
+msgid "Manage states"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "Cyan"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "Magenta"
+msgstr ""
+
+#. module: asset_sale
+#: view:asset.asset:0
+msgid "Serial No:"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "White"
+msgstr ""
+
+#. module: asset_sale
+#: selection:asset.asset,finance_state_color:0
+msgid "Red"
+msgstr ""
+

=== added file 'asset_sale/i18n/ru.po'
--- asset_sale/i18n/ru.po	1970-01-01 00:00:00 +0000
+++ asset_sale/i18n/ru.po	2014-10-18 07:04:41 +0000
@@ -0,0 +1,45 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* asset_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20140125-002455\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-02 08:26+0000\n"
+"PO-Revision-Date: 2014-03-02 08:26+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_asset_sale
+msgid "Assets & Sale"
+msgstr "Активы и Продажи"
+
+#. module: base
+#: model:ir.module.module,summary:base.module_asset_sale
+msgid "Integrate Asset and Sale"
+msgstr "Объединяет активы с продажами"
+
+#. module: asset_sale
+#: view:asset.asset:0
+#: model:ir.actions.act_window,name:asset_sale.action_assets_sale
+#: model:ir.ui.menu,name:asset_sale.menu_maintenance_assets
+#: model:ir.ui.menu,name:asset_sale.menu_maintenance_assets_assets
+msgid "Assets"
+msgstr "Активы"
+
+#. module: asset_sale
+#: model:ir.ui.menu,name:asset_sale.menu_asset_state
+msgid "Asset States"
+msgstr "Состояния активов"
+
+#. module: asset_sale
+#: model:ir.actions.act_window,name:asset_sale.action_management_assets_sale
+#: model:ir.ui.menu,name:asset_sale.menu_maintenance_assets_management
+msgid "Manage states"
+msgstr "Управление состояниями"
\ No newline at end of file

=== added file 'asset_sale/sale_view.xml'
--- asset_sale/sale_view.xml	1970-01-01 00:00:00 +0000
+++ asset_sale/sale_view.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <!-- Asset menu -->
+        <menuitem name="Assets"
+            id="menu_maintenance_assets"
+            parent="base.menu_base_partner"
+            sequence="9"/>
+
+        <!-- Asset Form View  -->
+        <record id="assets_form_view_sale" model="ir.ui.view">
+            <field name="name">asset.asset.form.sale</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <form string="Assets" version="7.0">
+                    <header>
+                        <field name="finance_state_id" widget="statusbar" clickable="True"/>
+                    </header>
+                    <sheet>
+                        <field name="image_medium" widget="image" class="oe_avatar oe_left"/>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <field name="property_stock_asset" domain="[('usage','=','asset')]"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="criticality"/>
+                                <field name="user_id"/>
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Info">
+                                <group>
+                                    <group>
+                                        <field name="asset_number"/>
+                                        <field name="model"/>
+                                        <field name="serial"/>
+                                    </group>
+                                    <group>
+                                    </group>
+                                </group>
+                                <group string="Warranty">
+                                    <group>
+                                    <field name="manufacturer_id"/>
+                                    <field name="start_date"/>
+                                    <field name="warranty_start_date"/>
+                                    </group>
+                                    <group>
+                                    <field name="vendor_id"/>
+                                    <field name="purchase_date"/>
+                                    <field name="warranty_end_date"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+                     </sheet>
+                     <div class="oe_chatter">
+                            <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <!-- Asset Kanban View  -->
+        <record model="ir.ui.view" id="assets_kanban_view_sale">
+            <field name="name">asset.asset.kanban.sale</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="finance_state_id"/>
+                    <field name="finance_state_color"/>
+                    <field name="user_id"/>
+                    <field name="criticality"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_vignette">
+                                <div class="codup_kanban_left">
+                                    <a type="open"><img t-att-src="kanban_image('asset.asset', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                    <div t-attf-title="#{record.finance_state_id.value}" t-attf-class="codup_status_color_#{record.finance_state_color.raw_value} codup_status"></div>
+                                </div>
+                                <div class="oe_kanban_details">
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                    </h4>
+                                    <ul>
+                                        <li>Model: <field name="model"></field></li>
+                                        <li>Manufacturer: <field name="manufacturer_id"></field></li>
+                                        <li>Serial No: <field name="serial"></field></li>
+                                        <li class="codup_kanban_info">
+                                        <a t-if="record.criticality.raw_value == 0" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 0" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 1" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 1" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 2" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 2" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_assets_sale" model="ir.actions.act_window">
+            <field name="name">Assets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">asset.asset</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="view_id" eval="False"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_kanban_view_sale">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="assets_kanban_view_sale"/>
+            <field name="act_window_id" ref="action_assets_sale"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_tree_view_sale">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="asset.assets_tree_view"/>
+            <field name="act_window_id" ref="action_assets_sale"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_form_view_sale">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="assets_form_view_sale"/>
+            <field name="act_window_id" ref="action_assets_sale"/>
+        </record>
+
+        <!-- Asset item -->
+        <menuitem name="Assets"
+            action="action_assets_sale"
+            id="menu_maintenance_assets_assets"
+            parent="menu_maintenance_assets"
+            sequence="100"/>
+
+        <!-- Management Asset Kanban View  -->
+        <record model="ir.ui.view" id="management_assets_kanban_view_sale">
+            <field name="name">Manage states Asset Kanban</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="finance_state_id" create="false" delete="false">
+                    <field name="finance_state_id"/>
+                    <field name="finance_state_color"/>
+                    <field name="user_id"/>
+                    <field name="criticality"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card codup_kanban_status oe_kanban_global_click">
+                                <div class="codup_kanban_left">
+                                    <a type="open"><img t-att-src="kanban_image('asset.asset', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                    <div t-attf-title="#{record.finance_state_id.value}" t-attf-class="codup_status_color_#{record.finance_state_color.raw_value} codup_status"></div>
+                                </div>
+                                <div class="codup_kanban_details">
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                    </h4>
+                                    <ul>
+                                        <li title="Model"><field name="model"></field></li>
+                                        <li title="Manufacturer"><field name="manufacturer_id"></field></li>
+                                        <li class="codup_kanban_info">
+                                        <a t-if="record.criticality.raw_value == 0" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 0" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 1" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 1" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 2" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 2" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_management_assets_sale" model="ir.actions.act_window">
+            <field name="name">Manage states</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">asset.asset</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,form</field>
+            <field name="view_id" eval="False"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="action_management_assets_kanban_view_sale">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="management_assets_kanban_view_sale"/>
+            <field name="act_window_id" ref="action_management_assets_sale"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="action_management_assets_form_view_sale">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="assets_form_view_sale"/>
+            <field name="act_window_id" ref="action_management_assets_sale"/>
+        </record>
+
+        <!-- Management Asset item -->
+        <menuitem name="Manage states"
+            action="action_management_assets_sale"
+            id="menu_maintenance_assets_management"
+            parent="menu_maintenance_assets"
+            sequence="100"/>    
+
+        <!-- Asset state item -->
+        <menuitem name="Asset States"
+            action="asset.action_asset_state"
+            id="menu_asset_state"
+            parent="base.menu_base_config"
+            sequence="100"/>
+    
+ 	</data>
+</openerp>

=== added directory 'asset_sale/static'
=== added directory 'asset_sale/static/src'
=== added directory 'asset_sale/static/src/img'
=== added file 'asset_sale/static/src/img/icon.png'
Binary files asset_sale/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and asset_sale/static/src/img/icon.png	2014-10-18 07:04:41 +0000 differ
=== added directory 'asset_stock'
=== renamed directory 'asset_stock' => 'asset_stock.moved'
=== added file 'asset_stock/__init__.py'
--- asset_stock/__init__.py	1970-01-01 00:00:00 +0000
+++ asset_stock/__init__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import asset
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'asset_stock/__openerp__.py'
--- asset_stock/__openerp__.py	1970-01-01 00:00:00 +0000
+++ asset_stock/__openerp__.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Assets & Warehouse',
+    'version': '1.0',
+    'summary': 'Integrate Asset and Warehouse',
+    'description': """
+Integrate Maintenance and Warehouse.
+===========================
+
+This module allows use the same Assets for warehouse and maintenance purposes.
+Keep one entity in one place for escape mistakes!
+    """,
+    'author': 'CodUP',
+    'website': 'http://codup.com',
+    'category': 'Enterprise Asset Management',
+    'sequence': 0,
+    'depends': ['asset'],
+    'demo': ['asset_demo.xml'],
+    'data': ['stock_view.xml'],
+    'installable': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_stock/asset.py'
--- asset_stock/asset.py	1970-01-01 00:00:00 +0000
+++ asset_stock/asset.py	2014-10-18 07:04:41 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 CodUP (<http://codup.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+from openerp.addons.asset.asset import STATE_COLOR_SELECTION
+
+
+class asset_asset(osv.osv):
+    _inherit = 'asset.asset'
+
+    _columns = {
+        'warehouse_state_color': fields.related('warehouse_state_id', 'state_color', type="selection", selection=STATE_COLOR_SELECTION, string="Color", readonly=True),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'asset_stock/asset_demo.xml'
--- asset_stock/asset_demo.xml	1970-01-01 00:00:00 +0000
+++ asset_stock/asset_demo.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        
+        <!-- Resource: asset.asset -->
+        <record id="asset.asset_asset_1" model="asset.asset">
+            <field name="warehouse_state_id" ref="asset.asset_state_use"/>
+        </record>
+
+        <record id="asset.asset_asset_2" model="asset.asset">
+            <field name="warehouse_state_id" ref="asset.asset_state_shipped"/>
+        </record>
+
+        <record id="asset.asset_asset_3" model="asset.asset">
+            <field name="warehouse_state_id" ref="asset.asset_state_stored"/>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'asset_stock/i18n'
=== added file 'asset_stock/i18n/asset_stock.pot'
--- asset_stock/i18n/asset_stock.pot	1970-01-01 00:00:00 +0000
+++ asset_stock/i18n/asset_stock.pot	2014-10-18 07:04:41 +0000
@@ -0,0 +1,133 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* asset_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20140125-002455\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-01 09:45+0000\n"
+"PO-Revision-Date: 2014-03-01 09:45+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "Blue"
+msgstr ""
+
+#. module: asset_stock
+#: field:asset.asset,warehouse_state_id:0
+#: view:asset.state:0
+msgid "State"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "Black"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "Yellow"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "Orange"
+msgstr ""
+
+#. module: asset_stock
+#: view:asset.state:0
+msgid "Change color"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "White"
+msgstr ""
+
+#. module: asset_stock
+#: view:asset.asset:0
+msgid "Serial No:"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "Red"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "Cyan"
+msgstr ""
+
+#. module: asset_stock
+#: view:asset.asset:0
+msgid "Info"
+msgstr ""
+
+#. module: asset_stock
+#: view:asset.asset:0
+msgid "Warranty"
+msgstr ""
+
+#. module: asset_stock
+#: view:asset.asset:0
+#: model:ir.actions.act_window,name:asset_stock.action_assets_stock
+#: model:ir.ui.menu,name:asset_stock.menu_maintenance_assets
+#: model:ir.ui.menu,name:asset_stock.menu_maintenance_assets_assets
+msgid "Assets"
+msgstr ""
+
+#. module: asset_stock
+#: model:ir.actions.act_window,name:asset_stock.action_asset_state
+#: model:ir.ui.menu,name:asset_stock.menu_asset_state
+msgid "Asset States"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "Green"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "SkyBlue"
+msgstr ""
+
+#. module: asset_stock
+#: view:asset.asset:0
+msgid "Model:"
+msgstr ""
+
+#. module: asset_stock
+#: field:asset.asset,warehouse_state_color:0
+msgid "Color"
+msgstr ""
+
+#. module: asset_stock
+#: view:asset.asset:0
+msgid "Manufacturer:"
+msgstr ""
+
+#. module: asset_stock
+#: model:ir.actions.act_window,name:asset_stock.action_management_assets
+#: model:ir.ui.menu,name:asset_stock.menu_maintenance_assets_management
+msgid "Manage states"
+msgstr ""
+
+#. module: asset_stock
+#: selection:asset.asset,warehouse_state_color:0
+msgid "Magenta"
+msgstr ""
+
+#. module: asset_stock
+#: model:ir.model,name:asset_stock.model_asset_asset
+msgid "Asset"
+msgstr ""
+

=== added file 'asset_stock/i18n/ru.po'
--- asset_stock/i18n/ru.po	1970-01-01 00:00:00 +0000
+++ asset_stock/i18n/ru.po	2014-10-18 07:04:41 +0000
@@ -0,0 +1,36 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* asset_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20140125-002455\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-01 09:45+0000\n"
+"PO-Revision-Date: 2014-03-01 09:45+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: asset_stock
+#: view:asset.asset:0
+#: model:ir.actions.act_window,name:asset_stock.action_assets_stock
+#: model:ir.ui.menu,name:asset_stock.menu_maintenance_assets
+#: model:ir.ui.menu,name:asset_stock.menu_maintenance_assets_assets
+msgid "Assets"
+msgstr "Активы"
+
+#. module: asset_stock
+#: model:ir.actions.act_window,name:asset_stock.action_asset_state
+#: model:ir.ui.menu,name:asset_stock.menu_asset_state
+msgid "Asset States"
+msgstr "Состояния активов"
+
+#. module: asset_stock
+#: model:ir.actions.act_window,name:asset_stock.action_management_assets
+#: model:ir.ui.menu,name:asset_stock.menu_maintenance_assets_management
+msgid "Manage states"
+msgstr "Управление состояниями"
\ No newline at end of file

=== added directory 'asset_stock/static'
=== added directory 'asset_stock/static/src'
=== added directory 'asset_stock/static/src/img'
=== added file 'asset_stock/static/src/img/icon.png'
Binary files asset_stock/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and asset_stock/static/src/img/icon.png	2014-10-18 07:04:41 +0000 differ
=== added file 'asset_stock/stock_view.xml'
--- asset_stock/stock_view.xml	1970-01-01 00:00:00 +0000
+++ asset_stock/stock_view.xml	2014-10-18 07:04:41 +0000
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <!-- Asset menu -->
+        <menuitem name="Assets"
+            id="menu_maintenance_assets"
+            parent="stock.menu_stock_root"
+            sequence="9"/>
+
+        <!-- Asset Form View  -->
+        <record id="assets_form_view_stock" model="ir.ui.view">
+            <field name="name">asset.asset.form.stock</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <form string="Assets" version="7.0">
+                    <header>
+                        <field name="warehouse_state_id" widget="statusbar" clickable="True"/>
+                    </header>
+                    <sheet>
+                        <field name="image_medium" widget="image" class="oe_avatar oe_left"/>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <field name="property_stock_asset" domain="[('usage','=','asset')]"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="criticality"/>
+                                <field name="user_id"/>
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Info">
+                                <group>
+                                    <group>
+                                        <field name="asset_number"/>
+                                        <field name="model"/>
+                                        <field name="serial"/>
+                                    </group>
+                                    <group>
+                                    </group>
+                                </group>
+                                <group string="Warranty">
+                                    <group>
+                                    <field name="manufacturer_id"/>
+                                    <field name="start_date"/>
+                                    <field name="warranty_start_date"/>
+                                    </group>
+                                    <group>
+                                    <field name="vendor_id"/>
+                                    <field name="purchase_date"/>
+                                    <field name="warranty_end_date"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+                     </sheet>
+                     <div class="oe_chatter">
+                            <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <!-- Asset Kanban View  -->
+        <record model="ir.ui.view" id="assets_kanban_view_stock">
+            <field name="name">asset.asset.kanban.stock</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="warehouse_state_id"/>
+                    <field name="warehouse_state_color"/>
+                    <field name="user_id"/>
+                    <field name="criticality"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_vignette">
+                                <div class="codup_kanban_left">
+                                    <a type="open"><img t-att-src="kanban_image('asset.asset', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                    <div t-attf-title="#{record.warehouse_state_id.value}" t-attf-class="codup_status_color_#{record.warehouse_state_color.raw_value} codup_status"></div>
+                                </div>
+                                <div class="oe_kanban_details">
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                    </h4>
+                                    <ul>
+                                        <li>Model: <field name="model"></field></li>
+                                        <li>Manufacturer: <field name="manufacturer_id"></field></li>
+                                        <li>Serial No: <field name="serial"></field></li>
+                                        <li class="codup_kanban_info">
+                                        <a t-if="record.criticality.raw_value == 0" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 0" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 1" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 1" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 2" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 2" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_assets_stock" model="ir.actions.act_window">
+            <field name="name">Assets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">asset.asset</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="view_id" eval="False"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_kanban_view_stock">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="assets_kanban_view_stock"/>
+            <field name="act_window_id" ref="action_assets_stock"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_tree_view_stock">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="asset.assets_tree_view"/>
+            <field name="act_window_id" ref="action_assets_stock"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_assets_form_view_stock">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="assets_form_view_stock"/>
+            <field name="act_window_id" ref="action_assets_stock"/>
+        </record>
+
+        <!-- Asset item -->
+        <menuitem name="Assets"
+            action="action_assets_stock"
+            id="menu_maintenance_assets_assets"
+            parent="menu_maintenance_assets"
+            sequence="100"/>
+
+        <!-- Management Asset Kanban View  -->
+        <record model="ir.ui.view" id="management_assets_kanban_view_stock">
+            <field name="name">Manage states Asset Kanban</field>
+            <field name="model">asset.asset</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="warehouse_state_id" create="false" delete="false">
+                    <field name="warehouse_state_id"/>
+                    <field name="warehouse_state_color"/>
+                    <field name="user_id"/>
+                    <field name="criticality"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card codup_kanban_status oe_kanban_global_click">
+                                <div class="codup_kanban_left">
+                                    <a type="open"><img t-att-src="kanban_image('asset.asset', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                    <div t-attf-title="#{record.warehouse_state_id.value}" t-attf-class="codup_status_color_#{record.warehouse_state_color.raw_value} codup_status"></div>
+                                </div>
+                                <div class="codup_kanban_details">
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                    </h4>
+                                    <ul>
+                                        <li title="Model"><field name="model"></field></li>
+                                        <li title="Manufacturer"><field name="manufacturer_id"></field></li>
+                                        <li class="codup_kanban_info">
+                                        <a t-if="record.criticality.raw_value == 0" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 0" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 1" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 1" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <a t-if="record.criticality.raw_value lte 2" t-attf-title="#{record.criticality.value}" class="codup_attention_off">c</a>
+                                        <a t-if="record.criticality.raw_value gt 2" t-attf-title="#{record.criticality.value}" class="codup_attention_on">c</a>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_management_assets_stock" model="ir.actions.act_window">
+            <field name="name">Manage states</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">asset.asset</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,form</field>
+            <field name="view_id" eval="False"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="action_management_assets_kanban_view_stock">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="management_assets_kanban_view_stock"/>
+            <field name="act_window_id" ref="action_management_assets_stock"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="action_management_assets_form_view_stock">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="assets_form_view_stock"/>
+            <field name="act_window_id" ref="action_management_assets_stock"/>
+        </record>
+
+        <!-- Management Asset item -->
+        <menuitem name="Manage states"
+            action="action_management_assets_stock"
+            id="menu_maintenance_assets_management"
+            parent="menu_maintenance_assets"
+            sequence="100"/>    
+
+        <!-- Asset state item -->
+        <menuitem name="Asset States"
+            action="asset.action_asset_state"
+            id="menu_asset_state"
+            parent="stock.menu_stock_configuration"
+            sequence="100"/>
+    
+ 	</data>
+</openerp>