[MERGE] no website description

diff --git a/addons/hr/static/src/default_image.png b/addons/hr/static/src/default_image.png
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/addons/hr/static/src/img/default_image.png b/addons/hr/static/src/img/default_image.png
new file mode 100644 (file)
index 0000000..87fdbc5
Binary files /dev/null and b/addons/hr/static/src/img/default_image.png differ

diff --git a/addons/website_quote/views/website_quotation_backend.xml b/addons/website_quote/views/website_quotation_backend.xml
index 2f21f7d..283f82a 100644 (file)
--- a/addons/website_quote/views/website_quotation_backend.xml
+++ b/addons/website_quote/views/website_quotation_backend.xml
@@ -21,6 +21,7 @@
                                     <field name="uom_id" groups="product.group_uom"/>
                                     <field name="price_unit"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                    <field name="website_description" invisible="1"/>
                             </tree>
                         </field>
                     </page>
@@ -28,6 +29,7 @@
                 <xpath expr="//field[@name='client_order_ref']" position="after">
                     <field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position)"/>
                     <field name="validity_date"/>
+                    <field name="website_description" invisible="1"/>
                 </xpath>
             </field>
         </record>
@@ -77,6 +79,9 @@
                                         <page string="Description">
                                             <field name="name" />
                                         </page>
+                                        <page string="Website Description">
+                                            <field name="website_description" />
+                                        </page>
                                     </notebook>
                                 </form>
                                 <tree string="Sales Quote Template Lines" editable="bottom">
@@ -86,6 +91,7 @@
                                     <field name="product_uom_id" groups="product.group_uom"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_unit"/>
+                                    <field name="website_description" invisible="1"/>
                                 </tree>
                             </field>
                         </page>
@@ -98,10 +104,12 @@
                                 <field name="uom_id" groups="product.group_uom"/>
                                 <field name="price_unit"/>
                                 <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                <field name="website_description" invisible="1"/>
                               </tree>
                             </field>
                         </page>
                         </notebook>
+                        <field name="website_description" invisible="1"/>
                         <field name="note" placeholder="Terms and conditions..."  nolable="1"/>
                     </sheet>
                 </form>