Merge lp:~openerp-dev/openobject-addons/trunk-imp-quote-builder-dka into lp:openobject-addons

[Paramjit Singh Sahota(OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-imp-quote-builder-dka]

9382. By Paramjit Singh Sahota(OpenERP) on 2014-05-01

[MERGE] Merged lp:openobject-addons.

9383. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[MERGE]Merged lp:openobject-addons.

9384. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[FIX] Fixed the issue 'send the quote, the url refer to a signup, it shouldn't and it does not work in an incognito window'

9385. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[FIX] Fixed the issue:: mobile preview: the left menu overlapas the quote

9386. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[IMP] Improved code to have ' Promote products with a designed quotation template you send by email. ' added in nocontent of quotations when website_quote is installed.

9387. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[IMP] Improved code 'Create a quotaion, the template is setted by default'

9388. By Mahendra Barad(OpenERP) on 2014-05-16

[Merge]with trunk

9389. By Mahendra Barad(OpenERP) on 2014-05-19

[FIX]typo

Unmerged revisions

9389. By Mahendra Barad(OpenERP) on 2014-05-19

[FIX]typo

9388. By Mahendra Barad(OpenERP) on 2014-05-16

[Merge]with trunk

9387. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[IMP] Improved code 'Create a quotaion, the template is setted by default'

9386. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[IMP] Improved code to have ' Promote products with a designed quotation template you send by email. ' added in nocontent of quotations when website_quote is installed.

9385. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[FIX] Fixed the issue:: mobile preview: the left menu overlapas the quote

9384. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[FIX] Fixed the issue 'send the quote, the url refer to a signup, it shouldn't and it does not work in an incognito window'

9383. By Paramjit Singh Sahota(OpenERP) on 2014-05-02

[MERGE]Merged lp:openobject-addons.

9382. By Paramjit Singh Sahota(OpenERP) on 2014-05-01

[MERGE] Merged lp:openobject-addons.

9381. By Darshan Kalola(OpenERP) on 2014-04-25

[IMP]website_quote:added quote_viewed boolean field to set button highlight or set as gray.

9380. By Darshan Kalola(OpenERP) on 2014-04-25

[MERGE]sync with trunk.

=== modified file 'website_quote/data/website_quotation_data.xml'
--- website_quote/data/website_quotation_data.xml	2014-01-25 23:25:25 +0000
+++ website_quote/data/website_quotation_data.xml	2014-05-19 11:53:30 +0000
@@ -5,7 +5,7 @@
             Update Email template to send right quote url
         -->
 
-        <record id="sale.email_template_edi_sale" model="email.template">
+        <record id="portal_sale.email_template_edi_sale" model="email.template">
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
 

=== modified file 'website_quote/data/website_quotation_demo.xml'
--- website_quote/data/website_quotation_demo.xml	2014-01-25 23:08:47 +0000
+++ website_quote/data/website_quotation_demo.xml	2014-05-19 11:53:30 +0000
@@ -58,95 +58,70 @@
             <field name="website_description" type="xml">
 
                 <section data-snippet-id="title">
-                    <h1 class="page-header">Our Partnership Offer</h1>
+                    <h1 class="page-header">Our Customer Offer</h1>
                 </section>
                 <section data-snippet-id="text-block">
                     <div class="row">
                         <div class="col-md-12">
                             <p>
-                                Our partnership offer includes all you need to
-                                grow your business and deliver quality services
-                                with the OpenERP Partner Program.
+                                Our partnership offer includes all you need to grow your business 
+                                and deliver quality services with the our Partner Program.
                             </p><p>
-                                It includes <strong>discounts on OpenERP
-                                Enterprise</strong>, technical and/or functional
-                                <strong>trainings</strong>,
-                                <strong>support</strong> services,
-                                <strong>marketing documents</strong>, access to
-                                the <strong>partner portal</strong>, rights to
-                                <strong>use the trademark</strong>, sales support
-                                from a <strong>dedicated account manager</strong>.
-                            </p>
-                        </div>
-                    </div>
-                </section>
-
-                <section data-snippet-id="pricing">
-                    <div class="row mt32">
-                        <div class="col-md-4">
-                            <div class="panel panel-info">
-                                <div class="panel-heading">
-                                   <h3 class="panel-title">A Valuable Product</h3>
-                                </div>
-                                <div class="panel-body">
-                                   <p>
-                                       Deliver <strong>strong value added services</strong> as you can
-                                       rely on a leading open source software, with
-                                       the support of the publisher.
-                                   <p></p>
-                                       <strong>Grow with your existing customer base</strong>
-                                       by continuously proposing new modules.
-                                   </p>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-4">
-                            <div class="panel panel-info">
-                                <div class="panel-heading">
-                                   <h3 class="panel-title">A Strong Demand</h3>
-                                </div>
-                                <div class="panel-body">
-                                   <p>
-                                    Enjoy the traction of the <strong>fastest growing
-                                    management software</strong> in the world.
-                                   </p><p>
-                                    Benefit from the growing customer demand
-                                    and our OpenERP brand.
-                                   </p>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-4">
-                            <div class="panel panel-info">
-                                <div class="panel-heading">
-                                   <h3 class="panel-title">High Margins</h3>
-                                </div>
-                                <div class="panel-body">
-                                   <p>
-                                     <strong>Get high billing rates</strong> as you deliver a
-                                     highly valuable software.
-                                   </p><p>
-                                     Grow by developing a <strong>recurring
-                                     revenue flow</strong> from OpenERP
-                                     Enterprise's commission system. 
-                                   </p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section data-snippet-id="text-block">
-                    <h2>A Dedicated Account Manager</h2>
-                    <p>
-                        We will assign you a dedicated account manager, an
-                        experienced sales person, to help you develop your
-                        OpenERP business. The account manager helps you get
-                        leads, close deals, gives you feedback and best
-                        practices, delivers sales training and is your direct
-                        point of contact for any request you may have.
-                    </p>
-                </section>
+                                It includes <strong>discounts</strong>, technical and/or functional 
+                                <strong>trainings</strong>, <strong>support</strong> 
+                                services, <strong>marketing documents</strong>,
+                                access to the <strong>portal</strong>, sales support from a 
+                                <strong>dedicated account manager</strong>.
+                            </p>
+                        </div>
+                    </div>
+                </section>
+
+                <section data-snippet-id="pricing1">
+                    <div class="panel panel-info">
+                        <div class="panel-heading">
+                            <h3 class="panel-title">A Valuable Product</h3>
+                        </div>
+                        <div class="panel-body">
+                            <p>
+                                Deliver <strong>strong value added services</strong> 
+                                as you can rely on a leading open source software, 
+                                with the support of the publisher.
+                            </p>
+                        </div>
+                    </div>
+                </section>
+                <section data-snippet-id="pricing2">
+                    <div class="panel panel-info">
+	                    <div class="panel-heading">
+	                       <h3 class="panel-title">A Strong Demand</h3>
+	                    </div>
+	                    <div class="panel-body">
+	                       <p>
+	                           Enjoy the traction of the <strong>fastest growing management</strong> 
+	                           in the world.
+	                       </p><p>
+	                           Benefit from the growing customer demand and our brand.
+	                       </p>
+	                    </div>
+                    </div>
+                 </section>
+                 <section data-snippet-id="pricing3">
+	                 <div class="panel panel-info">
+	                     <div class="panel-heading">
+	                         <h3 class="panel-title">High Margins</h3>
+	                     </div>
+	                     <div class="panel-body">
+	                         <p>
+	                             <strong>Get high billing rates</strong> 
+	                             as you deliver a highly valuable product.
+	                         </p><p>
+	                             Grow by developing a <strong>recurring revenue flow</strong> 
+	                             from the Enterprise's commission system.
+	                         </p>
+	                     </div>
+	                 </div>
+                 </section>
 
                 <section data-snippet-id="text-block">
                     <div class="row">
@@ -155,11 +130,10 @@
                         </div>
                         <div class="col-md-7">
                             <p>
-                                For an extra fee, partners can get access to OpenERP's
-                                core developers and functional experts. This can help
-                                you succeed in delivering more complex or bigger
-                                projects by getting the support of highly experienced
-                                consultants on demand.
+                                For an extra fee, partners can get access to core R&amp;D team members 
+                                and experts. This can help you succeed in delivering more complex or 
+                                bigger projects by getting the support 
+                                of highly experienced consultants on demand.
                             </p>
                         </div>
                         <div class="col-md-5">
@@ -175,12 +149,12 @@
                         </div>
                         <div class="col-md-7">
                             <p>
-                                OpenERP promotes its partners through various ways:
-                                publication on our website, official communication,
-                                publication of your success stories, etc. As soon as
-                                you become an OpenERP partner and have followed the
-                                official trainings, you will be visible on the partner
-                                directory listing.
+                                Our Team promotes its partners through various ways: 
+                                publication on our website, official communication, 
+                                publication of your success stories, etc. As soon as 
+                                you become a partner and have followed the official 
+                                trainings, you will be visible on the partner directory 
+                                listing.
                             </p>
                         </div>
                         <div class="col-md-5">
@@ -196,12 +170,11 @@
                         </div>
                         <div class="col-md-7">
                             <p>
-                                Every year, we redirect more than 100,000 customer
-                                requests to our official partners. These are prospects
-                                that filled a form on the OpenERP website and wanted to
-                                use OpenERP. The right partner to fulfill the customer
-                                request is selected based on the customer localization
-                                (nearest partner) and the grade of the partner.
+                                Every year, we redirect more than 100,000 customer requests to our partners. 
+                                These are prospects that filled a form on the our website and wanted to use
+                                the product. The right partner to fulfill the customer request is selected
+                                based on the customer localization (nearest partner) and the grade of 
+                                the partner.
                             </p>
                         </div>
                         <div class="col-md-5">
@@ -209,42 +182,6 @@
                         </div>
                     </div>
                 </section>
-
-                <section data-snippet-id="text-block">
-                    <h2>Benefit from the OpenERP branding</h2>
-                    <p>
-                        Every year, we redirect more than 100,000 customer
-                        requests to our official partners. These are prospects
-                        that filled a form on the OpenERP website and wanted to
-                        use OpenERP. The right partner to fulfill the customer
-                        request is selected based on the customer localization
-                        (nearest partner) and the grade of the partner.
-                    </p>
-                </section>
-
-                <section class="mb32" data-snippet-id="text-block">
-                    <h2>Test developments automatically</h2>
-                    <div class="row">
-                        <div class="col-md-5">
-                            <img src="/website_quote/static/src/img/partner_sc_01.png" class="img shadow"/>
-                        </div>
-                        <div class="col-md-7">
-                            <p class="mt23">
-                                Save time in your implementation project by having your
-                                developments tested automatically by our automated test
-                                servers. At every code commit, you get a full OpenERP
-                                instance that you can try out online. When this
-                                instance is deployed, your code is automatically put
-                                through our 2000+ automated unit tests.
-                            </p><p>
-                                Our automated testing server software is called Runbot,
-                                and you can try it out here: http://runbot.openerp.com.
-                                A dedicated runbot server is available for every
-                                partner.
-                            </p>
-                        </div>
-                    </div>
-                </section>
             </field>
         </record>
 
@@ -258,27 +195,22 @@
             <field name="discount">10.00</field>
             <field name="website_description" type="html">
                 <section data-snippet-id="title">
-                    <h1>Online Training + Certification</h1>
+                    <h1>Training + Certification</h1>
                 </section>
                 <section data-snippet-id="text-image">
                     <div class="row">
                         <div class="col-md-12 mb32">
-                            <p>These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live sessions by our senior instructors. At the end of the training, you can pass the OpenERP Certification exam in one of the 5000+ Pearson VUE test centers worldwide.</p>
-                        </div>
-                        <div class="col-md-offset-1">
-                            <h3>Your advantages</h3>
-                            <ul>
-                                <li>Modular approach applied to the learning method</li>
-                                <li>New interactive learning experience</li>
-                                <li>Lower training budget for the same quality courses</li>
-                                <li>Better comfort to facilitate your learning process</li>
-                            </ul>
+                            <p>
+                                These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with
+                                modular sessions and cloud­based labs. Many of our online learning courses also include dozens of recorded webinars and live 
+                                sessions by our senior instructors. At the end of the training, you can pass the Certification exam.
+                            </p>
                         </div>
                         <div class="col-md-12">
                             <h2>Structure of the Training</h2>
                         </div>
                         <div class="col-md-5 col-md-offset-1 mt16 mb16">
-                            <img class="img img-responsive" src="https://www.openerp.com/saas_master/static/site_new/img/layout/online_training.png"/>
+                            <img class="img img-responsive" src="https://www.odoo.com/saas_master/static/site_new/img/layout/online_training.png"/>
                         </div>
                         <div class="col-md-6 mt32">
                             <h4><strong>There are three components to the training</strong></h4>

=== modified file 'website_quote/models/order.py'
--- website_quote/models/order.py	2014-04-11 14:20:22 +0000
+++ website_quote/models/order.py	2014-05-19 11:53:30 +0000
@@ -32,7 +32,7 @@
     _columns = {
         'name': fields.char('Quotation Template', size=256, required=True),
         'website_description': fields.html('Description', translate=True),
-        'quote_line': fields.one2many('sale.quote.line', 'quote_id', 'Quote Template Lines'),
+        'quote_line': fields.one2many('sale.quote.line', 'quote_id', 'Quotation Template Lines'),
         'note': fields.text('Terms and conditions'),
         'options': fields.one2many('sale.quote.option', 'template_id', 'Optional Products Lines'),
         'number_of_days': fields.integer('Quote Duration', help='Number of days for the validaty date computation of the quotation'),
@@ -111,19 +111,38 @@
 
     _columns = {
         'access_token': fields.char('Security Token', size=256, required=True),
-        'template_id': fields.many2one('sale.quote.template', 'Quote Template'),
+        'template_id': fields.many2one('sale.quote.template', 'Quotation Template'),
         'website_description': fields.html('Description'),
         'options' : fields.one2many('sale.order.option', 'order_id', 'Optional Products Lines'),
         'validity_date': fields.date('Validity Date'),
         'amount_undiscounted': fields.function(_get_total, string='Amount Before Discount', type="float",
-            digits_compute=dp.get_precision('Account'))
+            digits_compute=dp.get_precision('Account')),
+        'quote_viewed': fields.boolean('Quotation Viewed'),
     }
+
+    def _default_template(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        if 'template_id' in context and context['template_id']:
+            return context['template_id']
+        model_obj = self.pool.get('ir.model.data')
+        res = False
+        try:
+            res = model_obj.get_object_reference(cr, uid, 'website_quote', 'website_quote_template_1')[1]
+        except ValueError:
+            res = False
+        return res
+
+
     _defaults = {
-        'access_token': lambda self, cr, uid, ctx={}: str(uuid.uuid4())
+        'access_token': lambda self, cr, uid, ctx={}: str(uuid.uuid4()),
+        'template_id': _default_template,
+        'quote_viewed': False
     }
 
     def open_quotation(self, cr, uid, quote_id, context=None):
         quote = self.browse(cr, uid, quote_id[0], context=context)
+        self.write(cr, uid, quote_id[0], {'quote_viewed': True}, context=context)
         return {
             'type': 'ir.actions.act_url',
             'target': 'self',
@@ -134,6 +153,9 @@
         if not template_id:
             return True
 
+        if not partner:
+            return True
+
         if context is None:
             context = {}
         context = dict(context, lang=self.pool.get('res.partner').browse(cr, uid, partner, context).lang)

=== modified file 'website_quote/static/src/css/website_quotation.css'
--- website_quote/static/src/css/website_quotation.css	2014-01-25 17:24:55 +0000
+++ website_quote/static/src/css/website_quotation.css	2014-05-19 11:53:30 +0000
@@ -5,6 +5,13 @@
   border-radius: 5px;
 }
 
+/* mobile preview: the left menu overlapas the quote */
+@media (max-width: 768px) {
+  .bs-sidebar {
+    position: absolute;
+  }
+}
+
 .bs-sidenav {
    padding-top: 10px;
    padding-bottom: 10px;

=== modified file 'website_quote/views/website_quotation.xml'
--- website_quote/views/website_quotation.xml	2014-01-28 20:50:17 +0000
+++ website_quote/views/website_quotation.xml	2014-05-19 11:53:30 +0000
@@ -242,7 +242,7 @@
                           <em t-esc="quotation.name"/>
                           <small t-field="quotation.state"/>
                           <div groups="base.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden">
-                              <a class="btn btn-info hidden-print" t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s' % (quotation._name, quotation.id)">Update Quote</a>
+                              <a class="btn btn-info hidden-print" t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s' % (quotation._name, quotation.id)">Update and Send the Quote</a>
                           </div>
                       </h1>
 

=== modified file 'website_quote/views/website_quotation_backend.xml'
--- website_quote/views/website_quotation_backend.xml	2014-01-25 22:10:59 +0000
+++ website_quote/views/website_quotation_backend.xml	2014-05-19 11:53:30 +0000
@@ -7,14 +7,36 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//header/button[@name='invoice_corrected']" position="after">
-                    <button name="open_quotation" string="View Quotation" type="object"
-                        attrs="{'invisible': [('template_id','=',False)]}"/>
+                    <button name="open_quotation" string="View &amp; Design Quotation" 
+                        type="object"
+                        class="oe_highlight"
+                        attrs="{'invisible': ['|',('template_id','=',False),('quote_viewed','=',True)]}"/>
+                </xpath>
+                <xpath expr="//header/button[@name='invoice_corrected']" position="after">
+                    <button name="open_quotation" string="View &amp; Design Quotation" 
+                        type="object"
+                        attrs="{'invisible': ['|',('template_id','=',False),('quote_viewed','=',False)]}"/>
+                </xpath>
+                <xpath expr="//header/button[@name='action_quotation_send'][1]" position="replace">
+                    <button name="action_quotation_send" string="Send by Email" type="object" 
+                        groups="base.group_user"
+                        attrs="{'invisible': ['|',('quote_viewed','=',True),('state','!=', 'draft')]}"/>
+                    <button name="action_quotation_send" string="Send by Email" type="object" 
+                        groups="base.group_user"
+                        class="oe_highlight"
+                        attrs="{'invisible': ['|',('quote_viewed','=',False),('state','!=', 'draft')]}"/>
+                </xpath>
+                <xpath expr="//header/button[@name='print_quotation'][1]" position="replace">
+                    <button name="print_quotation" string="Print" type="object" 
+                        states="draft"
+                        groups="base.group_user"/>
                 </xpath>
                 <xpath expr="//page[@string='Order Lines']" position="after">
                     <page string="Suggested Products">
                         <label string="Optional Products &amp; Services" for="options"/>
+                        <field name="quote_viewed" invisible="1"/>
                         <field name="options">
-                            <tree string="Sales Quote Template Lines" editable="bottom">
+                            <tree string="Sales Quotation Template Lines" editable="bottom">
                                     <field name="product_id" on_change="on_change_product_id(product_id)"/>
                                     <field name="name"/>
                                     <field name="quantity"/>
@@ -59,7 +81,7 @@
                         <notebook>
                             <page string="Lines">
                             <field name="quote_line">
-                                <form string="Sales Quote Template Lines" version="7.0">
+                                <form string="Sales Quotation Template Lines" version="7.0">
                                     <group>
                                         <group>
                                             <field name="product_id" on_change="on_change_product_id(product_id)"/>
@@ -84,7 +106,7 @@
                                         </page>
                                     </notebook>
                                 </form>
-                                <tree string="Sales Quote Template Lines" editable="bottom">
+                                <tree string="Sales Quotation Template Lines" editable="bottom">
                                     <field name="product_id" on_change="on_change_product_id(product_id)"/>
                                     <field name="name"/>
                                     <field name="product_uom_qty"/>
@@ -97,7 +119,7 @@
                         </page>
                         <page string="Suggested Products">
                             <field name="options">
-                              <tree string="Sales Quote Template Lines" editable="bottom">
+                              <tree string="Sales Quotation Template Lines" editable="bottom">
                                 <field name="product_id" on_change="on_change_product_id(product_id)"/>
                                 <field name="name"/>
                                 <field name="quantity"/>
@@ -120,7 +142,7 @@
             <field name="model">sale.quote.template</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sale Quote Template">
+                <tree string="Sale Quotation Template">
                     <field name="name"/>
                 </tree>
             </field>
@@ -131,6 +153,33 @@
             <field name="res_model">sale.quote.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click here to create your template.
+              </p><p>
+                Use templates to create polished, professional quotes in minutes. 
+                Send these quotes by email and let your customer sign online. 
+                Use cross-selling and discounts to push and boost your sales.
+              </p>
+            </field>
+        </record>
+
+        <record id="sale.action_quotations" model="ir.actions.act_window">
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a quotation, the first step of a new sale.
+              </p><p>
+                OpenERP will help you handle efficiently the complete sale flow:
+                from the quotation to the sales order, the
+                delivery, the invoicing and the payment collection.
+              </p><p>
+                Promote products with a designed quotation template you send by email. 
+              </p><p>
+                The social feature helps you organize discussions on each sales
+                order, and allow your customers to keep track of the evolution
+                of the sales order.
+              </p>
+            </field>
         </record>
 
         <menuitem action="action_sale_quotation_template" id="menu_sale_quote_template" parent="base.menu_base_config" sequence="6" groups="base.group_sale_salesman,base.group_sale_manager"/>