Merge lp:~vauxoo/addons-vauxoo/jose-acceptability-criterial-buttons into lp:addons-vauxoo/7.0

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com]

[lp:~vauxoo/addons-vauxoo/jose-acceptability-criterial-buttons]

1132. By Nhomar - Vauxoo on 2014-09-23

[FIX] Aceptability criteria editable in form view

1133. By Launchpad Translations on behalf of vauxoo on 2014-09-23

Launchpad automatic translations update.

1134. By Sabrina Romero - http://www.vauxoo.com on 2014-09-23

[FIX][invoice_datetime] Warnings of pylint test and variables names fixed.

1135. By hbto [Vauxoo] http://www.vauxoo.com on 2014-09-25

[merge] From Addons-Vauxoo-Cicsa
[FIX] Redefined general_journal_id fields in account.analytic.line
[merge] [MERGE] add new search by and group by fields in the hr.expense.expense model.
[ADD] add new search by and group by fields in the hr.expense.expense model.
[merge] [MERGE] the partner field is now inline searcheable on the
[ADD] add inline search by partner in the account.analytic.line view.
[merge] [MERGE] add translation template and es_VE.po of the field names of the hr.job
[ADD] add the translate attribute to the hr_job.name field.
[ADD] add spanish translation.
[ADD] add the es_VE.po file manually.
[ADD] add translation template to the hr_job_positions_extended module.
[IMP] level_job for LEVEL_JOB
[merge] [IMP] minors change in hr_job_position
[IMP] replace for attributes
[IMP] translatable fields
[IMP] form_view_ref deleted in link to job_id
[merge] [MERGE] add new module 'account_voucher_draft' that create an account.voucher
[FIX] rearregne the button position.
[FIX] syntax error in view definition.
[FIX] manage the view like the standard.
[FIX] syntax error.
[ADD] overwrite view to create the account voucher, hide the pay button and add
[CC] using rst syntax in the despcriptor.
[ADD] update the module descriptor to add a new dependecy, also extend the
[ADD] extend the account_voucher_draft module description.
[ADD] new method that will be used for the new button to 'pay' the
[ADD] new basic structure and files for the account_voucher_draft module.
[IMP] Allow to use different accounts as advances
[merge] [IMP] Adding Advance Payment Features to Account Voucher
[IMP] Advance Account becomes visible in Account Voucher
[IMP] Adding Advance Payment Features to Account Voucher
[merge] [ADD] fields is added in job positions
[DEL] attribute options of job_id in employee
[ADD] level to job position
[IMP] pep8
[ADD] help to fields
[ADD] reports to in hr.job
[ADD] module for three new fields in job positions
[ADD] analytic_entry_line_journal module was added
[IMP] Redefining field period_id in account analytic line model
[ADD] Module to group by Journal Entry
[ADD] Added Module to group by period on analytic entry lines
[IMP] Translating some strings into English
[merge] [FIX] Removing fields l10n_mx_street3 and l10n_mx_street4 dependant on OMXL

1136. By Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com on 2014-09-27

[MERGE] Merge to add access rule for user_story_long_term module, for we can have control about who can do actions in our models

1137. By Launchpad Translations on behalf of vauxoo on 2014-09-27

Launchpad automatic translations update.

1138. By Moisés López - http://www.vauxoo.com on 2014-09-29

[FIX] Fix unused-import with autoflake

1139. By Moisés López - http://www.vauxoo.com on 2014-09-30

[MERGE] [FIX] Fix unused variable with autoflake and pylint

1140. By Moisés López - http://www.vauxoo.com on 2014-10-01

[MERGE][FIX][expired_task_information] Fix W1401 anomalous-backslash-in-string. Add prefix "r" to string

1141. By Launchpad Translations on behalf of vauxoo on 2014-10-02

Launchpad automatic translations update.

1142. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2014-10-02

[ADD][invoice_discount]Were added fields to get in the lines of invoice the amount without discount and the amount of discount

1143. By Sabrina Romero - http://www.vauxoo.com on 2014-10-03

[FIX][group_xml_id] type field deprecated in 'ir.ui.view' model and trailing whitespace fixed.

1144. By Moisés López - http://www.vauxoo.com on 2014-10-03

[MERGE] [FIX] Fix pylint error W0403 - relative-import

1145. By Moisés López - http://www.vauxoo.com on 2014-10-03

[FIX] Change import to full path example:
  before "import decimal_precision"
  now "from openerp.addons.decimal_precision import decimal_precision"

1146. By Moisés López - http://www.vauxoo.com on 2014-10-03

[MERGE] [FIX] trailing whitespace pylint error C0303 and
[FIX] autopep8 ignoring E501 & E128 and
[FIX] reimported

1147. By Moisés López - http://www.vauxoo.com on 2014-10-03

[MERGE] Set standard in all __openerp__.py files

1148. By Launchpad Translations on behalf of vauxoo on 2014-10-04

Launchpad automatic translations update.

1149. By Launchpad Translations on behalf of vauxoo on 2014-10-05

Launchpad automatic translations update.

1150. By Katherine Zaoral <email address hidden> on 2014-10-09

[MERGE] add new module account_model_plans

1151. By Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com on 2014-10-15

[MERGE] Merge to main branch

1152. By Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com on 2014-10-15

[PYLINT]

1153. By Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com on 2014-10-15

[PYLINT]

Unmerged revisions

=== modified file 'user_story/__init__.py'
--- user_story/__init__.py	2014-10-03 00:28:23 +0000
+++ user_story/__init__.py	2014-10-15 18:08:34 +0000
@@ -1,2 +1,3 @@
 from . import model
 from . import report
+from . import wizard

=== modified file 'user_story/__openerp__.py'
--- user_story/__openerp__.py	2014-10-03 08:22:36 +0000
+++ user_story/__openerp__.py	2014-10-15 18:08:34 +0000
@@ -24,10 +24,10 @@
 #
 ##############################################################################
 {
-    "name": "User Story", 
-    "version": "0.1", 
-    "author": "Vauxoo", 
-    "category": "Generic Modules", 
+    "name": "User Story",
+    "version": "0.1",
+    "author": "Vauxoo",
+    "category": "Generic Modules",
     "description": """
 Este módulo registra requerimientos funcionales y técnicos de software a
 través de Historias de Usuarios.
@@ -40,40 +40,40 @@
 siguientes:
 
 .. Story: http://dannorth.net/whats-in-a-story/
-.. fuentes: http://adrianmoya.com/2012/08/que-hay-en-una-historia/""", 
-    "website": "http://vauxoo.com", 
-    "license": "", 
+.. fuentes: http://adrianmoya.com/2012/08/que-hay-en-una-historia/""",
+    "website": "http://vauxoo.com",
+    "license": "",
     "depends": [
-        "base", 
-        "project", 
-        "sprint_kanban", 
-        "project_timesheet", 
-        "project_conf", 
+        "base",
+        "project",
+        "sprint_kanban",
+        "project_timesheet",
+        "project_conf",
         "report_webkit"
-    ], 
+    ],
     "demo": [
         "demo/demo.xml"
-    ], 
+    ],
     "data": [
-        "data/data_us_report.xml", 
-        "report/user_story_report_view.xml", 
-        "security/userstory_security.xml", 
-        "security/ir.model.access.csv", 
-        "view/userstory_view.xml", 
-        "view/project_view.xml", 
-        "view/hr_timesheet_view.xml", 
-        "view/hr_timesheet_all_view.xml", 
-        "view/custom_project_task_view.xml", 
-        "data/data.xml", 
+        "data/data_us_report.xml",
+        "report/user_story_report_view.xml",
+        "security/userstory_security.xml",
+        "security/ir.model.access.csv",
+        "view/userstory_view.xml",
+        "view/project_view.xml",
+        "view/hr_timesheet_view.xml",
+        "view/hr_timesheet_all_view.xml",
+        "view/custom_project_task_view.xml",
+        "data/data.xml",
         "data/user_story_template.xml"
-    ], 
-    "test": [], 
-    "js": [], 
+    ],
+    "test": [],
+    "js": [],
     "css": [
         "static/src/css/*.css"
-    ], 
-    "qweb": [], 
-    "installable": True, 
-    "auto_install": False, 
+    ],
+    "qweb": [],
+    "installable": True,
+    "auto_install": False,
     "active": False
-}
\ No newline at end of file
+}

=== modified file 'user_story/data/user_story_template.xml'
--- user_story/data/user_story_template.xml	2014-05-09 21:51:34 +0000
+++ user_story/data/user_story_template.xml	2014-10-15 18:08:34 +0000
@@ -1,11 +1,985 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="0">
-    <!-- 
+    <!--
     =====================================================
     SEND EMAIL TEMPLATE
     =====================================================
-    -->        
+    -->
+        <record id="template_approve_aceptabilty_criterial" model="email.template" forcecreate="True">
+            <field name="name">Approve</field>
+            <field name="email_from"></field>
+            <field name="model_id" ref="user_story.model_acceptability_criteria" />
+            <field name="subject"></field>
+            <field name="auto_delete" eval="True"/>
+            <!--
+                 <field name="mail_server_id" ref="template_outgoing_mail_server_test"/>
+            -->
+            <field name="mail_server_id">1</field>
+            <field name="email_to"></field>
+            <field name="body_html"><![CDATA[
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>*|MC:SUBJECT|*</title>
+        <style type="text/css">
+            /* Client-specific Styles */
+            #outlook a{padding:0;} /* Force Outlook to provide a "view in browser" button. */
+            body{width:100% !important;} .ReadMsgBody{width:100%;} .ExternalClass{width:100%;} /* Force Hotmail to display emails at full width */
+            body{-webkit-text-size-adjust:none;} /* Prevent Webkit platforms from changing default text sizes. */
+
+            /* Reset Styles */
+            body{margin:0; padding:0;}
+            img{border:0; height:auto; line-height:100%; outline:none; text-decoration:none;}
+            table td{border-collapse:collapse;}
+            #backgroundTable{height:100% !important; margin:0; padding:0; width:100% !important;}
+
+            /* Template Styles */
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: COMMON PAGE ELEMENTS /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Page
+            * @section background color
+            * @tip Set the background color for your email. You may want to choose one that matches your company's branding.
+            * @theme page
+            */
+            body, #backgroundTable{
+                /*@editable*/ background-color:#FAFAFA;
+            }
+
+            /**
+            * @tab Page
+            * @section email border
+            * @tip Set the border for your email.
+            */
+            #templateContainer{
+                /*@editable*/ border:0;
+            }
+
+            /**
+            * @tab Page
+            * @section heading 1
+            * @tip Set the styling for all first-level headings in your emails. These should be the largest of your headings.
+            * @style heading 1
+            */
+            h1, .h1{
+                /*@editable*/ color:#202020;
+                display:block;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:40px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                margin-top:2%;
+                margin-right:0;
+                margin-bottom:1%;
+                margin-left:0;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Page
+            * @section heading 2
+            * @tip Set the styling for all second-level headings in your emails.
+            * @style heading 2
+            */
+            h2, .h2{
+                /*@editable*/ color:#404040;
+                display:block;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:18px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                margin-top:2%;
+                margin-right:0;
+                margin-bottom:1%;
+                margin-left:0;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Page
+            * @section heading 3
+            * @tip Set the styling for all third-level headings in your emails.
+            * @style heading 3
+            */
+            h3, .h3{
+                /*@editable*/ color:#606060;
+                display:block;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:16px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                margin-top:2%;
+                margin-right:0;
+                margin-bottom:1%;
+                margin-left:0;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Page
+            * @section heading 4
+            * @tip Set the styling for all fourth-level headings in your emails. These should be the smallest of your headings.
+            * @style heading 4
+            */
+            h4, .h4{
+                /*@editable*/ color:#808080;
+                display:block;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:14px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                margin-top:2%;
+                margin-right:0;
+                margin-bottom:1%;
+                margin-left:0;
+                /*@editable*/ text-align:left;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: PREHEADER /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Header
+            * @section preheader style
+            * @tip Set the background color for your email's preheader area.
+            * @theme page
+            */
+            #templatePreheader{
+                /*@editable*/ background-color:#FAFAFA;
+            }
+
+            /**
+            * @tab Header
+            * @section preheader text
+            * @tip Set the styling for your email's preheader text. Choose a size and color that is easy to read.
+            */
+            .preheaderContent div{
+                /*@editable*/ color:#707070;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:10px;
+                /*@editable*/ line-height:100%;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Header
+            * @section preheader link
+            * @tip Set the styling for your email's preheader links. Choose a color that helps them stand out from your text.
+            */
+            .preheaderContent div a:link, .preheaderContent div a:visited, /* Yahoo! Mail Override */ .preheaderContent div a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            /**
+            * @tab Header
+            * @section social bar style
+            * @tip Set the background color and border for your email's footer social bar.
+            */
+            #social div{
+                /*@editable*/ text-align:right;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: HEADER /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Header
+            * @section header style
+            * @tip Set the background color and border for your email's header area.
+            * @theme header
+            */
+            #templateHeader{
+                /*@editable*/ background-color:#FFFFFF;
+                /*@editable*/ border-bottom:5px solid #505050;
+            }
+
+            /**
+            * @tab Header
+            * @section header text
+            * @tip Set the styling for your email's header text. Choose a size and color that is easy to read.
+            */
+            .headerContent{
+                /*@editable*/ color:#202020;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:34px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                /*@editable*/ padding:10px;
+                /*@editable*/ text-align:right;
+                /*@editable*/ vertical-align:middle;
+            }
+
+            /**
+            * @tab Header
+            * @section header link
+            * @tip Set the styling for your email's header links. Choose a color that helps them stand out from your text.
+            */
+            .headerContent a:link, .headerContent a:visited, /* Yahoo! Mail Override */ .headerContent a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            #headerImage{
+                height:auto;
+                max-width:600px !important;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: MAIN BODY /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Body
+            * @section body style
+            * @tip Set the background color for your email's body area.
+            */
+            #templateContainer, .bodyContent{
+                /*@editable*/ background-color:#FDFDFD;
+            }
+
+            /**
+            * @tab Body
+            * @section body text
+            * @tip Set the styling for your email's main content text. Choose a size and color that is easy to read.
+            * @theme main
+            */
+            .bodyContent div{
+                /*@editable*/ color:#505050;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:14px;
+                /*@editable*/ line-height:150%;
+                /*@editable*/ text-align:justify;
+            }
+
+            /**
+            * @tab Body
+            * @section body link
+            * @tip Set the styling for your email's main content links. Choose a color that helps them stand out from your text.
+            */
+            .bodyContent div a:link, .bodyContent div a:visited, /* Yahoo! Mail Override */ .bodyContent div a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            .bodyContent img{
+                display:inline;
+                height:auto;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: SIDEBAR /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Sidebar
+            * @section sidebar style
+            * @tip Set the background color and border for your email's sidebar area.
+            */
+            #templateSidebar{
+                /*@editable*/ background-color:#FDFDFD;
+            }
+
+            /**
+            * @tab Sidebar
+            * @section sidebar style
+            * @tip Set the background color and border for your email's sidebar area.
+            */
+            .sidebarContent{
+                /*@editable*/ border-right:1px solid #DDDDDD;
+            }
+
+            /**
+            * @tab Sidebar
+            * @section sidebar text
+            * @tip Set the styling for your email's sidebar text. Choose a size and color that is easy to read.
+            */
+            .sidebarContent div{
+                /*@editable*/ color:#505050;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:10px;
+                /*@editable*/ line-height:150%;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Sidebar
+            * @section sidebar link
+            * @tip Set the styling for your email's sidebar links. Choose a color that helps them stand out from your text.
+            */
+            .sidebarContent div a:link, .sidebarContent div a:visited, /* Yahoo! Mail Override */ .sidebarContent div a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            .sidebarContent img{
+                display:inline;
+                height:auto;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: FOOTER /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Footer
+            * @section footer style
+            * @tip Set the background color and top border for your email's footer area.
+            * @theme footer
+            */
+            #templateFooter{
+                /*@editable*/ background-color:#FAFAFA;
+                /*@editable*/ border-top:3px solid #909090;
+            }
+
+            /**
+            * @tab Footer
+            * @section footer text
+            * @tip Set the styling for your email's footer text. Choose a size and color that is easy to read.
+            * @theme footer
+            */
+            .footerContent div{
+                /*@editable*/ color:#707070;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:11px;
+                /*@editable*/ line-height:125%;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Footer
+            * @section footer link
+            * @tip Set the styling for your email's footer links. Choose a color that helps them stand out from your text.
+            */
+            .footerContent div a:link, .footerContent div a:visited, /* Yahoo! Mail Override */ .footerContent div a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            .footerContent img{
+                display:inline;
+            }
+
+            /**
+            * @tab Footer
+            * @section social bar style
+            * @tip Set the background color and border for your email's footer social bar.
+            * @theme footer
+            */
+            #social{
+                /*@editable*/ background-color:#FFFFFF;
+                /*@editable*/ border:0;
+            }
+
+            /**
+            * @tab Footer
+            * @section social bar style
+            * @tip Set the background color and border for your email's footer social bar.
+            */
+            #social div{
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Footer
+            * @section utility bar style
+            * @tip Set the background color and border for your email's footer utility bar.
+            * @theme footer
+            */
+            #utility{
+                /*@editable*/ background-color:#FAFAFA;
+                /*@editable*/ border-top:0;
+            }
+
+            /**
+            * @tab Footer
+            * @section utility bar style
+            * @tip Set the background color and border for your email's footer utility bar.
+            */
+            #utility div{
+                /*@editable*/ text-align:left;
+            }
+
+            #monkeyRewards img{
+                max-width:170px !important;
+            }
+        </style>
+    </head>
+    <body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
+        <center>
+            <table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="backgroundTable">
+                <tr>
+                    <td align="center" valign="top">
+                        <table border="0" cellpadding="0" cellspacing="0" width="600" id="templateContainer">
+                            <tr style="margin: 0px; padding: 0px; background-color: rgb(247, 247, 247);">
+                                <td align="center" valign="top">
+                                    <!-- // Begin Template Header \\ -->
+                                    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin: 0px; padding: 0px;  background-color: rgb(253, 253, 253);">
+                                        <tr>
+                                            <td class="headerContent">
+                                                <img src="https://pbs.twimg.com/profile_images/2137139487/logo-vauxoo-lp.jpg" style="max-width:60px; padding: 2px 2px 2px;" id="headerImage campaign-icon" mc:label="header_image" mc:edit="header_image" mc:allowtext />
+                                            </td>
+
+                                            <td class="headerContent" width="100%" style="padding-left:10px; padding-right:20px;">
+                                                <div mc:edit="Header_content">
+                                                    <h2>
+                                                        ${object.accep_crit_id.name}
+                                                    </h2>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <!-- // End Template Header \\ -->
+                                </td>
+                            </tr>
+                            <tr>
+                            <td align="center" style="margin: 0px; padding: 0px; width: 600px; background-color: #951510">
+                                <div style="font-size:1.3em; font-family:Arial; color:#FFFFFF;"><b>
+                                        Criterio de Aceptación.
+                                </b></div>
+                            </td>
+                            </tr>
+                            <tr>
+                                <td align="center" valign="top">
+                                    <!-- // Begin Template Body \\ -->
+                                    <table border="0" cellpadding="10" cellspacing="0" width="600" style="margin: 0px; padding: 0px; width: 600px; background-color: rgb(247, 247, 247);">
+                                        <tr>
+                                            <!-- // Begin Sidebar \\  -->
+                                            <td valign="top" width="180" id="templateSidebar">
+                                                <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                                    <tr>
+                                                        <td valign="top">
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <!-- // End Sidebar \\ -->
+                                            <td valign="top" class="bodyContent">
+
+                                                <!-- // Begin Module: Standard Content \\ -->
+                                                <table border="0" cellpadding="10" cellspacing="0" width="600">
+                                                    <tr>
+                                                        <td valign="top" style="padding-left:0;">
+                                                            <div mc:edit="std_content00">
+                                                                <h2 class="h2">Estimad@ ${object.accep_crit_id.owner_id.name}</h2>
+                                                                <h3 class="h3">
+                                                El criterio de aceptación ${object.name} ha sido aceptado por ${user.name}.
+                                                                </h3>
+                                                                <pre style="font-size:1.1em; font-family:Arial">
+
+Agradeciendo su atención.
+
+Ante cualquier duda estamos a su disposición.
+<a href="${object.get_body_disapproval()}">Acceso directo al Documento</a>
+                                                                </pre>
+                                                                <br />
+                                                        </div>
+                                                    </td>
+                                                    </tr>
+                                                </table>
+                                                <!-- // End Module: Standard Content \\ -->
+
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <!-- // End Template Body \\ -->
+                                </td>
+                        </table>
+                        <br />
+                    </td>
+                </tr>
+            </table>
+        </center>
+    </body>
+</html>
+            ]]></field>
+        </record>
+        <record id="template_ask_aceptabilty_criterial" model="email.template" forcecreate="True">
+            <field name="name">Ask For Review</field>
+            <field name="email_from"></field>
+            <field name="model_id" ref="user_story.model_acceptability_criteria" />
+            <field name="subject"></field>
+            <field name="auto_delete" eval="True"/>
+            <!--
+                 <field name="mail_server_id" ref="template_outgoing_mail_server_test"/>
+            -->
+            <field name="mail_server_id">1</field>
+            <field name="email_to"></field>
+            <field name="body_html"><![CDATA[
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>*|MC:SUBJECT|*</title>
+        <style type="text/css">
+            /* Client-specific Styles */
+            #outlook a{padding:0;} /* Force Outlook to provide a "view in browser" button. */
+            body{width:100% !important;} .ReadMsgBody{width:100%;} .ExternalClass{width:100%;} /* Force Hotmail to display emails at full width */
+            body{-webkit-text-size-adjust:none;} /* Prevent Webkit platforms from changing default text sizes. */
+
+            /* Reset Styles */
+            body{margin:0; padding:0;}
+            img{border:0; height:auto; line-height:100%; outline:none; text-decoration:none;}
+            table td{border-collapse:collapse;}
+            #backgroundTable{height:100% !important; margin:0; padding:0; width:100% !important;}
+
+            /* Template Styles */
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: COMMON PAGE ELEMENTS /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Page
+            * @section background color
+            * @tip Set the background color for your email. You may want to choose one that matches your company's branding.
+            * @theme page
+            */
+            body, #backgroundTable{
+                /*@editable*/ background-color:#FAFAFA;
+            }
+
+            /**
+            * @tab Page
+            * @section email border
+            * @tip Set the border for your email.
+            */
+            #templateContainer{
+                /*@editable*/ border:0;
+            }
+
+            /**
+            * @tab Page
+            * @section heading 1
+            * @tip Set the styling for all first-level headings in your emails. These should be the largest of your headings.
+            * @style heading 1
+            */
+            h1, .h1{
+                /*@editable*/ color:#202020;
+                display:block;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:40px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                margin-top:2%;
+                margin-right:0;
+                margin-bottom:1%;
+                margin-left:0;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Page
+            * @section heading 2
+            * @tip Set the styling for all second-level headings in your emails.
+            * @style heading 2
+            */
+            h2, .h2{
+                /*@editable*/ color:#404040;
+                display:block;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:18px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                margin-top:2%;
+                margin-right:0;
+                margin-bottom:1%;
+                margin-left:0;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Page
+            * @section heading 3
+            * @tip Set the styling for all third-level headings in your emails.
+            * @style heading 3
+            */
+            h3, .h3{
+                /*@editable*/ color:#606060;
+                display:block;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:16px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                margin-top:2%;
+                margin-right:0;
+                margin-bottom:1%;
+                margin-left:0;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Page
+            * @section heading 4
+            * @tip Set the styling for all fourth-level headings in your emails. These should be the smallest of your headings.
+            * @style heading 4
+            */
+            h4, .h4{
+                /*@editable*/ color:#808080;
+                display:block;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:14px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                margin-top:2%;
+                margin-right:0;
+                margin-bottom:1%;
+                margin-left:0;
+                /*@editable*/ text-align:left;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: PREHEADER /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Header
+            * @section preheader style
+            * @tip Set the background color for your email's preheader area.
+            * @theme page
+            */
+            #templatePreheader{
+                /*@editable*/ background-color:#FAFAFA;
+            }
+
+            /**
+            * @tab Header
+            * @section preheader text
+            * @tip Set the styling for your email's preheader text. Choose a size and color that is easy to read.
+            */
+            .preheaderContent div{
+                /*@editable*/ color:#707070;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:10px;
+                /*@editable*/ line-height:100%;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Header
+            * @section preheader link
+            * @tip Set the styling for your email's preheader links. Choose a color that helps them stand out from your text.
+            */
+            .preheaderContent div a:link, .preheaderContent div a:visited, /* Yahoo! Mail Override */ .preheaderContent div a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            /**
+            * @tab Header
+            * @section social bar style
+            * @tip Set the background color and border for your email's footer social bar.
+            */
+            #social div{
+                /*@editable*/ text-align:right;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: HEADER /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Header
+            * @section header style
+            * @tip Set the background color and border for your email's header area.
+            * @theme header
+            */
+            #templateHeader{
+                /*@editable*/ background-color:#FFFFFF;
+                /*@editable*/ border-bottom:5px solid #505050;
+            }
+
+            /**
+            * @tab Header
+            * @section header text
+            * @tip Set the styling for your email's header text. Choose a size and color that is easy to read.
+            */
+            .headerContent{
+                /*@editable*/ color:#202020;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:34px;
+                /*@editable*/ font-weight:bold;
+                /*@editable*/ line-height:100%;
+                /*@editable*/ padding:10px;
+                /*@editable*/ text-align:right;
+                /*@editable*/ vertical-align:middle;
+            }
+
+            /**
+            * @tab Header
+            * @section header link
+            * @tip Set the styling for your email's header links. Choose a color that helps them stand out from your text.
+            */
+            .headerContent a:link, .headerContent a:visited, /* Yahoo! Mail Override */ .headerContent a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            #headerImage{
+                height:auto;
+                max-width:600px !important;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: MAIN BODY /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Body
+            * @section body style
+            * @tip Set the background color for your email's body area.
+            */
+            #templateContainer, .bodyContent{
+                /*@editable*/ background-color:#FDFDFD;
+            }
+
+            /**
+            * @tab Body
+            * @section body text
+            * @tip Set the styling for your email's main content text. Choose a size and color that is easy to read.
+            * @theme main
+            */
+            .bodyContent div{
+                /*@editable*/ color:#505050;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:14px;
+                /*@editable*/ line-height:150%;
+                /*@editable*/ text-align:justify;
+            }
+
+            /**
+            * @tab Body
+            * @section body link
+            * @tip Set the styling for your email's main content links. Choose a color that helps them stand out from your text.
+            */
+            .bodyContent div a:link, .bodyContent div a:visited, /* Yahoo! Mail Override */ .bodyContent div a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            .bodyContent img{
+                display:inline;
+                height:auto;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: SIDEBAR /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Sidebar
+            * @section sidebar style
+            * @tip Set the background color and border for your email's sidebar area.
+            */
+            #templateSidebar{
+                /*@editable*/ background-color:#FDFDFD;
+            }
+
+            /**
+            * @tab Sidebar
+            * @section sidebar style
+            * @tip Set the background color and border for your email's sidebar area.
+            */
+            .sidebarContent{
+                /*@editable*/ border-right:1px solid #DDDDDD;
+            }
+
+            /**
+            * @tab Sidebar
+            * @section sidebar text
+            * @tip Set the styling for your email's sidebar text. Choose a size and color that is easy to read.
+            */
+            .sidebarContent div{
+                /*@editable*/ color:#505050;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:10px;
+                /*@editable*/ line-height:150%;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Sidebar
+            * @section sidebar link
+            * @tip Set the styling for your email's sidebar links. Choose a color that helps them stand out from your text.
+            */
+            .sidebarContent div a:link, .sidebarContent div a:visited, /* Yahoo! Mail Override */ .sidebarContent div a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            .sidebarContent img{
+                display:inline;
+                height:auto;
+            }
+
+            /* /\/\/\/\/\/\/\/\/\/\ STANDARD STYLING: FOOTER /\/\/\/\/\/\/\/\/\/\ */
+
+            /**
+            * @tab Footer
+            * @section footer style
+            * @tip Set the background color and top border for your email's footer area.
+            * @theme footer
+            */
+            #templateFooter{
+                /*@editable*/ background-color:#FAFAFA;
+                /*@editable*/ border-top:3px solid #909090;
+            }
+
+            /**
+            * @tab Footer
+            * @section footer text
+            * @tip Set the styling for your email's footer text. Choose a size and color that is easy to read.
+            * @theme footer
+            */
+            .footerContent div{
+                /*@editable*/ color:#707070;
+                /*@editable*/ font-family:Arial;
+                /*@editable*/ font-size:11px;
+                /*@editable*/ line-height:125%;
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Footer
+            * @section footer link
+            * @tip Set the styling for your email's footer links. Choose a color that helps them stand out from your text.
+            */
+            .footerContent div a:link, .footerContent div a:visited, /* Yahoo! Mail Override */ .footerContent div a .yshortcuts /* Yahoo! Mail Override */{
+                /*@editable*/ color:#336699;
+                /*@editable*/ font-weight:normal;
+                /*@editable*/ text-decoration:underline;
+            }
+
+            .footerContent img{
+                display:inline;
+            }
+
+            /**
+            * @tab Footer
+            * @section social bar style
+            * @tip Set the background color and border for your email's footer social bar.
+            * @theme footer
+            */
+            #social{
+                /*@editable*/ background-color:#FFFFFF;
+                /*@editable*/ border:0;
+            }
+
+            /**
+            * @tab Footer
+            * @section social bar style
+            * @tip Set the background color and border for your email's footer social bar.
+            */
+            #social div{
+                /*@editable*/ text-align:left;
+            }
+
+            /**
+            * @tab Footer
+            * @section utility bar style
+            * @tip Set the background color and border for your email's footer utility bar.
+            * @theme footer
+            */
+            #utility{
+                /*@editable*/ background-color:#FAFAFA;
+                /*@editable*/ border-top:0;
+            }
+
+            /**
+            * @tab Footer
+            * @section utility bar style
+            * @tip Set the background color and border for your email's footer utility bar.
+            */
+            #utility div{
+                /*@editable*/ text-align:left;
+            }
+
+            #monkeyRewards img{
+                max-width:170px !important;
+            }
+        </style>
+    </head>
+    <body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
+        <center>
+            <table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="backgroundTable">
+                <tr>
+                    <td align="center" valign="top">
+                        <table border="0" cellpadding="0" cellspacing="0" width="600" id="templateContainer">
+                            <tr style="margin: 0px; padding: 0px; background-color: rgb(247, 247, 247);">
+                                <td align="center" valign="top">
+                                    <!-- // Begin Template Header \\ -->
+                                    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin: 0px; padding: 0px;  background-color: rgb(253, 253, 253);">
+                                        <tr>
+                                            <td class="headerContent">
+                                                <img src="https://pbs.twimg.com/profile_images/2137139487/logo-vauxoo-lp.jpg" style="max-width:60px; padding: 2px 2px 2px;" id="headerImage campaign-icon" mc:label="header_image" mc:edit="header_image" mc:allowtext />
+                                            </td>
+
+                                            <td class="headerContent" width="100%" style="padding-left:10px; padding-right:20px;">
+                                                <div mc:edit="Header_content">
+                                                    <h2>
+                                                        ${object.accep_crit_id.name}
+                                                    </h2>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <!-- // End Template Header \\ -->
+                                </td>
+                            </tr>
+                            <tr>
+                            <td align="center" style="margin: 0px; padding: 0px; width: 600px; background-color: #951510">
+                                <div style="font-size:1.3em; font-family:Arial; color:#FFFFFF;"><b>
+                                        Criterio de Aceptación.
+                                </b></div>
+                            </td>
+                            </tr>
+                            <tr>
+                                <td align="center" valign="top">
+                                    <!-- // Begin Template Body \\ -->
+                                    <table border="0" cellpadding="10" cellspacing="0" width="600" style="margin: 0px; padding: 0px; width: 600px; background-color: rgb(247, 247, 247);">
+                                        <tr>
+                                            <!-- // Begin Sidebar \\  -->
+                                            <td valign="top" width="180" id="templateSidebar">
+                                                <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                                    <tr>
+                                                        <td valign="top">
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <!-- // End Sidebar \\ -->
+                                            <td valign="top" class="bodyContent">
+
+                                                <!-- // Begin Module: Standard Content \\ -->
+                                                <table border="0" cellpadding="10" cellspacing="0" width="600">
+                                                    <tr>
+                                                        <td valign="top" style="padding-left:0;">
+                                                            <div mc:edit="std_content00">
+                                                                <h2 class="h2">Estimad@ ${object.accep_crit_id.owner_id.name}</h2>
+                                                                <h3 class="h3">
+                                                El criterio de aceptación ${object.name} ha sido terminado por ${object.accep_crit_id.user_execute_id and object.accep_crit_id.user_execute_id.name}.
+                                                                </h3>
+                                                                <pre style="font-size:1.1em; font-family:Arial">
+
+Agradeciendo su atención.
+
+Ante cualquier duda estamos a su disposición.
+<a href="${object.get_body_disapproval()}">Acceso directo al Documento</a>
+                                                                </pre>
+                                                                <br />
+                                                        </div>
+                                                    </td>
+                                                    </tr>
+                                                </table>
+                                                <!-- // End Module: Standard Content \\ -->
+
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <!-- // End Template Body \\ -->
+                                </td>
+                        </table>
+                        <br />
+                    </td>
+                </tr>
+            </table>
+        </center>
+    </body>
+</html>
+            ]]></field>
+        </record>
         <record id="template_send_email_hu" model="email.template" forcecreate="True">
             <field name="name">Accept Criteria</field>
             <field name="email_from"></field>

=== modified file 'user_story/model/user_story.py'
--- user_story/model/user_story.py	2014-10-03 07:19:35 +0000
+++ user_story/model/user_story.py	2014-10-15 18:08:34 +0000
@@ -87,7 +87,7 @@
         return super(user_story, self).write(cr, uid, ids,
                                              vals, context=context)
 
-    def body_progress(self, cr, uid, ids, template, hu, context=None):
+    def body_progress(self, cr, uid, ids, template, context=None):
         imd_obj = self.pool.get('ir.model.data')
         template_ids = imd_obj.search(
             cr, uid, [('model', '=', 'email.template'), ('name', '=', template)])
@@ -138,7 +138,8 @@
         else:
             return False
 
-    def send_mail_hu(self, cr, uid, ids, subject, body, res_id, users=[], context=None):
+    def send_mail_hu(self, cr, uid, ids, subject, body, res_id,
+                     users=None, context=None):
         if context is None:
             context = {}
         if context.get('force_send', False):
@@ -215,7 +216,9 @@
                 result[task.userstory_id.id] = True
         return result.keys()
 
-    def _message_get_auto_subscribe_fields(self, cr, uid, updated_fields, auto_follow_fields=['user_id'], context=None):
+    def _message_get_auto_subscribe_fields(self, cr, uid, updated_fields,
+                                           auto_follow_fields=None,
+                                           context=None):
         if auto_follow_fields is None:
             auto_follow_fields = ['user_id']
 
@@ -300,13 +303,13 @@
         '''
         usname = self.browse(cr, uid, i).name
         username = self.pool.get('res.users').browse(cr, uid, uid).name
-        urlbase = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-        link = '#id={i}&view_type=form&model=user.story'.format(i=i, urlbase=urlbase)
+        link = '#id={i}&view_type=form&model=user.story'.format(i=i)
         return _(u'''<html><div>
                  <h2>{usname}</h2>
                  <p>The user {user} has approved the user Story
                  <a href="{link}">See what we are talking about here</a>
-                 </div></html>'''.format(usname=usname, user=username, link=link))
+                 </div></html>'''.format(usname=usname, user=username,
+                                         link=link))
 
     def do_disapproval(self, cr, uid, ids, context=None):
         '''
@@ -323,13 +326,13 @@
     def get_body_approval(self, cr, uid, i, context=None):
         usname = self.browse(cr, uid, i).name
         username = self.pool.get('res.users').browse(cr, uid, uid).name
-        urlbase = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-        link = '#id={i}&view_type=form&model=user.story'.format(i=i, urlbase=urlbase)
+        link = '#id={i}&view_type=form&model=user.story'.format(i=i)
         return _(u'''<html><div>
                  <h2>{usname}</h2>
                  <p>The user {user} has approved the user Story
                  <a href="{link}">See what we are talking about here</a>
-                 </div></html>'''.format(usname=usname, user=username, link=link))
+                 </div></html>'''.format(usname=usname, user=username,
+                                         link=link))
 
     def do_approval(self, cr, uid, ids, context=None):
         context = context or {}
@@ -418,6 +421,112 @@
             cr, uid, [('accep_crit_id', 'in', us_ids)], context=context)
         return ac_ids
 
+    def get_body_disapproval(self, cr, uid, i, context=None):
+        '''
+        TODO: This body must be verified to give the information regarding the answers in
+        the do_disaproval method.
+        '''
+        model_brw = self.browse(cr, uid, i[0])
+        urlbase = self.pool.get('ir.config_parameter').get_param(cr, SUPERUSER_ID, 'web.base.url')
+        link = '#id={i}&view_type=form&model=user.story'.format(i=model_brw.accep_crit_id and model_brw.accep_crit_id.id, urlbase=urlbase)
+        return link
+
+    def approve(self, cr, uid, ids, context=None):
+        context = context or {}
+        criterial_brw2 = self.browse(cr, uid, ids[0])
+        criterial_brw = self.browse(cr, SUPERUSER_ID, ids[0])
+        if criterial_brw.accepted:
+            return True
+        data_obj = self.pool.get('ir.model.data')
+        compose_obj = self.pool.get('mail.compose.message')
+        user_story_brw = criterial_brw.accep_crit_id
+        partner_ids = [i.id for i in user_story_brw.message_follower_ids]
+        partner_ids.append(user_story_brw.owner_id.partner_id.id)
+        if user_story_brw.user_id:
+            partner_ids.append(user_story_brw.user_id.partner_id.id)
+        if user_story_brw.user_execute_id:
+            partner_ids.append(user_story_brw.user_execute_id.partner_id.id)
+        partner_ids = list(set(partner_ids))
+        template = data_obj.get_object(cr, uid, 'user_story', 'template_approve_aceptabilty_criterial')
+        mail = self.pool.get('email.template').generate_email(cr, SUPERUSER_ID, template.id, ids[0])
+        compose_id = compose_obj.create(cr, uid, {
+                        'res_model': 'user.story',
+                        'model': 'user.story',
+                        'res_id': user_story_brw.id,
+                        'partner_ids': [(6, 0, partner_ids)],
+                        'partner_id':0,
+                        'body': mail.get('body'),
+        })
+        criterial_brw2.write({'accepted': True})
+        compose_obj.send_mail(cr, uid, [compose_id])
+        return True
+
+    def disapprove(self, cr, uid, ids, context=None):
+        context = context or {}
+        criterial_brw = self.browse(cr, SUPERUSER_ID, ids[0])
+        if criterial_brw.accepted:
+            return True
+        data_obj = self.pool.get('ir.model.data')
+        user_story_brw = criterial_brw.accep_crit_id
+        partner_ids = [i.id for i in user_story_brw.message_follower_ids]
+        partner_ids.append(user_story_brw.owner_id.partner_id.id)
+        if user_story_brw.user_id:
+            partner_ids.append(user_story_brw.user_id.partner_id.id)
+        if user_story_brw.user_execute_idi:
+            partner_ids.append(user_story_brw.user_execute_id.partner_id.id)
+        partner_ids = list(set(partner_ids))
+        model_data_id = data_obj._get_id(cr, uid, 'user_story',
+                                         'email_compose_message_wizard_inherit_form_without_partner')
+        res_id = data_obj.browse(cr, uid, model_data_id, context=context).res_id
+        ction = {
+                'type': 'ir.actions.act_window',
+                'res_model': 'mail.compose.message',
+                'src_model': 'user.story',
+                'view_mode': 'form',
+                'view_mode':'form,tree',
+                'view_id': res_id,
+                'view_type': 'form',
+                'views': [[res_id, 'form']],
+                'target': 'new',
+                'context': {
+                        'default_res_model': 'user.story',
+                        'default_mail_compose_log': True,
+                        'default_model': 'user.story',
+                        'default_res_id': user_story_brw.id,
+                        'default_partner_ids': [(6, 0, partner_ids)],
+                        'default_body': _('<b>Description the cause of disapproval</b>'),
+                                   }
+                            }
+        return ction
+
+    def ask_review(self, cr, uid, ids, context=None):
+        context = context or {}
+        criterial_brw = self.browse(cr, SUPERUSER_ID, ids[0])
+        if criterial_brw.accepted:
+            return True
+        data_obj = self.pool.get('ir.model.data')
+        compose_obj = self.pool.get('mail.compose.message')
+        user_story_brw = criterial_brw.accep_crit_id
+        partner_ids = [i.id for i in user_story_brw.message_follower_ids]
+        partner_ids.append(user_story_brw.owner_id.partner_id.id)
+        if user_story_brw.user_id:
+            partner_ids.append(user_story_brw.user_id.partner_id.id)
+        if user_story_brw.user_execute_id:
+            partner_ids.append(user_story_brw.user_execute_id.partner_id.id)
+        partner_ids = list(set(partner_ids))
+        template = data_obj.get_object(cr, uid, 'user_story', 'template_ask_aceptabilty_criterial')
+        mail = self.pool.get('email.template').generate_email(cr, SUPERUSER_ID, template.id, ids[0])
+        compose_id = compose_obj.create(cr, uid, {
+                        'res_model': 'user.story',
+                        'model': 'user.story',
+                        'res_id': user_story_brw.id,
+                        'partner_ids': [(6, 0, partner_ids)],
+                        'partner_id':0,
+                        'body': mail.get('body'),
+        })
+        compose_obj.send_mail(cr, uid, [compose_id])
+        return True
+
     def _get_user_story_field(self, cr, uid, ids, fieldname, arg, context=None):
         """
         Method used as the function for extracting values for the user.story
@@ -441,7 +550,7 @@
         'accep_crit_id': fields.many2one('user.story',
                                          'User Story',
                                          ondelete='cascade',
-                                         required=True),
+                                         ),
         'accepted': fields.boolean('Accepted',
                                    help='Check if this criterion apply'),
         'development': fields.boolean('Development'),

=== modified file 'user_story/tests/test_user_story.py'
--- user_story/tests/test_user_story.py	2014-10-03 07:19:35 +0000
+++ user_story/tests/test_user_story.py	2014-10-15 18:08:34 +0000
@@ -2,6 +2,7 @@
 from openerp.osv.orm import except_orm
 from openerp import SUPERUSER_ID
 from openerp.tools import mute_logger
+import threading
 
 
 class TestUserStory(TransactionCase):
@@ -9,6 +10,7 @@
     def setUp(self):
         super(TestUserStory, self).setUp()
         self.story = self.registry('user.story')
+        self.criterial = self.registry('acceptability.criteria')
         self.project = self.registry('project.project')
         self.user = self.registry('res.users')
         self.data = self.registry('ir.model.data')
@@ -35,33 +37,47 @@
                               'name': 'User Story Test',
                               'owner_id': user_test_id,
                               'project_id': project_id,
-                              'accep_crit_ids': [(0, 0, {'name': 'Criterial Test 1', 'scenario': 'Test 1'}),
-                                                 (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                                                 (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                                                 ]
-                          })
         # Adding user story group to the user created previously
+                              'accep_crit_ids': [(0, 0,
+                                                  {'name': 'Criterial Test 1',
+                                                   'scenario': 'Test 1'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 2',
+                                                   'scenario': 'Test 2'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 3',
+                                                   'scenario': 'Test 3'}),
+                                                         ]
+                           })
+        #Adding user story group to the user created previously
         self.user.write(cr, SUPERUSER_ID, [user_test_id], {
             'groups_id': [(4, us_manager_group.id)]
         })
         # Try that a user with user story group can create a user story,  this group must allow create user story without problems
         self.assertTrue(self.story.create(cr, user_test_id, {
-            'name': 'User Story Test',
-            'owner_id': user_test_id,
-            'project_id': project_id,
-            'accep_crit_ids': [(0, 0, {'name': 'Criterial Test 1', 'scenario': 'Test 1'}),
-                               (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                               (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                               ]
+                              'name': 'User Story Test',
+                              'owner_id': user_test_id,
+                              'project_id': project_id,
+                              'accep_crit_ids': [(0, 0,
+                                                  {'name': 'Criterial Test 1',
+                                                   'scenario': 'Test 1'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 2',
+                                                   'scenario': 'Test 2'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 3',
+                                                   'scenario': 'Test 3'}),
+                                                         ]
 
         }), "An user with user story group manager cannot create an user story")
 
     @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
     def test_write_method(self):
         cr, uid = self.cr, self.uid
-        # Search groups that allow manage user story
-        us_manager_group = self.data.get_object(cr, uid, 'user_story', 'group_user_story_manager')
-        # Creating user to try the create method
+        #Search groups that allow manage user story
+        us_manager_group = self.data.get_object(cr, uid, 'user_story',
+                                                'group_user_story_manager')
+        #Creating user to try the create method
         user_test_id = self.user.create(cr, SUPERUSER_ID, {
             'name': 'User Test',
             'login': 'test_create_user'
@@ -77,13 +93,20 @@
                               'name': 'User Story Test',
                               'owner_id': user_test_id,
                               'project_id': project_id,
-                              'accep_crit_ids': [(0, 0, {'name': 'Criterial Test 1', 'scenario': 'Test 1'}),
-                                                 (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                                                 (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                                                 ]
-                          })
-        # Try that a user without user story group cannot write an user story
-        self.assertRaises(except_orm, self.story.write, cr, user_test_id, [story_id],
+                              'accep_crit_ids': [(0, 0,
+                                                  {'name': 'Criterial Test 1',
+                                                   'scenario': 'Test 1'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 2',
+                                                   'scenario': 'Test 2'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 3',
+                                                   'scenario': 'Test 3'}),
+                                                         ]
+                           })
+        #Try that a user without user story group cannot write an user story
+        self.assertRaises(except_orm, self.story.write, cr,
+                          user_test_id, [story_id],
                           {
                               'name': 'User Story Test Changed',
         })
@@ -99,9 +122,10 @@
     @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
     def test_unlink_method(self):
         cr, uid = self.cr, self.uid
-        # Search groups that allow manage user story
-        us_manager_group = self.data.get_object(cr, uid, 'user_story', 'group_user_story_manager')
-        # Creating user to try the create method
+        #Search groups that allow manage user story
+        us_manager_group = self.data.get_object(cr, uid, 'user_story',
+                                                'group_user_story_manager')
+        #Creating user to try the create method
         user_test_id = self.user.create(cr, SUPERUSER_ID, {
             'name': 'User Test',
             'login': 'test_create_user'
@@ -117,27 +141,35 @@
                               'name': 'User Story Test',
                               'owner_id': user_test_id,
                               'project_id': project_id,
-                              'accep_crit_ids': [(0, 0, {'name': 'Criterial Test 1', 'scenario': 'Test 1'}),
-                                                 (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                                                 (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                                                 ]
-                          })
-        # Try that a user without user story group cannot remove an user story
-        self.assertRaises(except_orm, self.story.unlink, cr, user_test_id, [story_id])
-        # Adding user story group to the user created previously
+                              'accep_crit_ids': [(0, 0,
+                                                  {'name': 'Criterial Test 1',
+                                                   'scenario': 'Test 1'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 2',
+                                                   'scenario': 'Test 2'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 3',
+                                                   'scenario': 'Test 3'}),
+                                                         ]
+                           })
+        #Try that a user without user story group cannot remove an user story
+        self.assertRaises(except_orm, self.story.unlink,
+                          cr, user_test_id, [story_id])
+        #Adding user story group to the user created previously
         self.user.write(cr, SUPERUSER_ID, [user_test_id], {
             'groups_id': [(4, us_manager_group.id)]
         })
-        # Try that a user with user story group can remove a user story,  this group must allow create user story without problems
-        self.assertTrue(self.story.unlink(cr, user_test_id, [story_id]),
-                        "An user with user story group manager cannot remove an user story")
-
+        #Try that a user with user story group can remove a user story,  this group must allow create user story without problems
+        self.assertTrue(self.story.unlink(cr, user_test_id, [story_id] ),
+                        "An user with user story group manager cannot remove "
+                        "an user story")
     @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
     def test_copy_method(self):
         cr, uid = self.cr, self.uid
-        # Search groups that allow manage user story
-        us_manager_group = self.data.get_object(cr, uid, 'user_story', 'group_user_story_manager')
-        # Creating user to try the create method
+        #Search groups that allow manage user story
+        us_manager_group = self.data.get_object(cr, uid, 'user_story',
+                                                'group_user_story_manager')
+        #Creating user to try the create method
         user_test_id = self.user.create(cr, SUPERUSER_ID, {
             'name': 'User Test',
             'login': 'test_create_user'
@@ -153,17 +185,60 @@
                               'name': 'User Story Test',
                               'owner_id': user_test_id,
                               'project_id': project_id,
-                              'accep_crit_ids': [(0, 0, {'name': 'Criterial Test 1', 'scenario': 'Test 1'}),
-                                                 (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                                                 (0, 0, {'name': 'Criterial Test 2', 'scenario': 'Test 2'}),
-                                                 ]
-                          })
-        # Try that a user without user story group cannot copy an user story
-        self.assertRaises(except_orm, self.story.copy, cr, user_test_id, story_id)
-        # Adding user story group to the user created previously
+                              'accep_crit_ids': [(0, 0,
+                                                  {'name': 'Criterial Test 1',
+                                                   'scenario': 'Test 1'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 2',
+                                                   'scenario': 'Test 2'}),
+                                                 (0, 0,
+                                                  {'name': 'Criterial Test 3',
+                                                   'scenario': 'Test 3'}),
+                                                         ]
+                           })
+        #Try that a user without user story group cannot copy an user story
+        self.assertRaises(except_orm, self.story.copy, cr,
+                          user_test_id, story_id)
+        #Adding user story group to the user created previously
         self.user.write(cr, SUPERUSER_ID, [user_test_id], {
             'groups_id': [(4, us_manager_group.id)]
         })
-        # Try that a user with user story group can copy a user story,  this group must allow create user story without problems
-        self.assertTrue(self.story.copy(cr, user_test_id, story_id),
-                        "An user with user story group manager cannot remove an user story")
+        #Try that a user with user story group can copy a user story,  this group must allow create user story without problems
+        self.assertTrue(self.story.copy(cr, user_test_id, story_id ),
+                        "An user with user story group manager cannot "
+                        "remove an user story")
+
+    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
+    def test_acceptability_criterial_buttons(self):
+        cr, uid = self.cr, self.uid
+        self.test_create_method()
+        threading.currentThread().testing = True
+        #Search the user and the user story to change the criterials
+        user_id = self.user.search(cr, uid, [('name', '=', 'User Test')])
+        story_id = self.story.search(cr, uid,
+                                     [('name', '=', 'User Story Test')])
+        user_brw = user_id and self.user.browse(cr, uid, user_id[0])
+        story_brw = story_id and self.story.browse(cr, uid, story_id[0])
+        i = 0
+        for criterial in user_brw and story_brw and story_brw.accep_crit_ids:
+            if i == 0:
+                mes = 'El criterio%{0}%ha sido aceptado por%'.\
+                                                         format(criterial.name)
+                self.criterial.approve(cr, user_brw.id, [criterial.id])
+                m_id = self.message.search(cr, uid,
+                                           [('res_id', '=', story_brw.id),
+                                            ('body', 'ilike', mes)])
+                self.assertTrue(m_id, "The message was not created")
+                cri_brw = self.criterial.browse(cr, uid, criterial.id)
+                self.assertTrue(cri_brw.accepted,
+                                "The criterial was not accepted")
+
+            elif i == 1:
+                mes = 'El criterio%{0}%ha sido terminado por%'.\
+                                                         format(criterial.name)
+                self.criterial.ask_review(cr, user_brw.id, [criterial.id])
+                m_id = self.message.search(cr, uid,
+                                           [('res_id', '=', story_brw.id),
+                                            ('body', 'ilike', mes)])
+                self.assertTrue(m_id, "The message was not created")
+            i+=1

=== modified file 'user_story/view/userstory_view.xml'
--- user_story/view/userstory_view.xml	2014-09-23 06:13:41 +0000
+++ user_story/view/userstory_view.xml	2014-10-15 18:08:34 +0000
@@ -8,16 +8,16 @@
       <field name="arch" type="xml">
         <form string="User Story" version="7.0">
           <header>
-			 <button name="do_draft" string="Draft" type="object" states="open,pending,done,cancelled"/>
-			 <button name="do_progress" string="Progress" type="object" states="draft,pending,done,cancelled"/>
-			 <button name="do_pending" string="Pending" type="object" states="draft,open,done,cancelled"/>
-			 <button name="do_done" string="Done" type="object" states="draft,open,pending,cancelled"/>
-			 <button name="do_cancel" string="Cancel" type="object" states="draft,open,pending,done"/>
-			 <field name="state" widget="statusbar"/>
+             <button name="do_draft" string="Draft" type="object" states="open,pending,done,cancelled"/>
+             <button name="do_progress" string="Progress" type="object" states="draft,pending,done,cancelled"/>
+             <button name="do_pending" string="Pending" type="object" states="draft,open,done,cancelled"/>
+             <button name="do_done" string="Done" type="object" states="draft,open,pending,cancelled"/>
+             <button name="do_cancel" string="Cancel" type="object" states="draft,open,pending,done"/>
+             <field name="state" widget="statusbar"/>
                 <label for='help'/>
                 <field name='help'/>
-		  </header>
-		  <sheet string="User Story">
+          </header>
+          <sheet string="User Story">
             <div class="oe_right">
                         <field name="date" select="1"
                             string="Created at"/>
@@ -28,10 +28,10 @@
                  -->
             <h2 class="no_print"><label for="approved" string="0.- Is this User Story Approved to work with?"/><field name="approved"/></h2>
             <h1><label for="name" string="1.- Name of what will be done/configured/developed: Title of the Story" class="oe_horizontal_separator oe_clear"/></h1>
-			<h2><field name="name"/></h2>
-			<h3>
-		        <label for="project_id" string="2.- Related Project" class="oe_horizontal_separator oe_clear"/>
-			</h3>
+            <h2><field name="name"/></h2>
+            <h3>
+                <label for="project_id" string="2.- Related Project" class="oe_horizontal_separator oe_clear"/>
+            </h3>
             <div>
                 <field name="project_id" domain="[('child_ids','=',False)]" context="{'current_model': 'project.project'}" />
                 <div class="no_print" attrs="{'invisible':[('help','=',False)]}">
@@ -75,11 +75,16 @@
                     </p>
                 </div>
                 <div class="no_print oe_right">
-                    <button name="do_approval" type="object" states="draft" help="Please, Approve this User Story to start to work with it take care about if you are not the Owner of this User Story you will not be able to approve it." string="I approve start to work with this Story"/>
+                    <button name="do_approval"
+                            type="object"
+                            attrs="{'invisible':[('approved','=',True)]}"
+                            states="draft"
+                            help="Please, Approve this User Story to start to work with it take care about if you are not the Owner of this User Story you will not be able to approve it."
+                            string="I approve start to work with this Story"/>
                     <h3>This User Story was approved by: <field name="approval_user_id" readonly="True"/></h3>
                 </div>
               <field name="description" colspan="4" nolabel="1" attrs="{'readonly':[('approved','=',True)]}" placeholder="Add a description here ..." widget="html"/>
-		      <h1><label for="accep_crit_ids" string="4.- Aceptability Criteria" class="oe_horizontal_separator oe_clear"/></h1>
+              <h1><label for="accep_crit_ids" string="4.- Aceptability Criteria" class="oe_horizontal_separator oe_clear"/></h1>
               <field name="accep_crit_ids" colspan="4" nolabel="1">
                 <tree string="Acceptability Criteria" editable="bottom">
                   <field name="name"/>
@@ -111,7 +116,7 @@
                     <a href="/user_story/static/src/demo/TestUS.xmind" target="_NEW">here</a>
                     </p>
                 </div>
-			  <separator colspan="4" string="5.- Technical Conclusions" class="oe_horizontal_separator oe_clear"/>
+              <separator colspan="4" string="5.- Technical Conclusions" class="oe_horizontal_separator oe_clear"/>
                 <div class="no_print" attrs="{'invisible':[('help','=',False)]}">
                     <p class="oe_grey">
                         Here you need to declare technically how will be
@@ -171,7 +176,7 @@
               </field>
             </page>
           </notebook>
-		  </sheet>
+          </sheet>
            <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread"/>
@@ -223,7 +228,6 @@
                     </h1>
                     <group>
                         <field name="scenario"/>
-                        <field name="accep_crit_id"/>
                         <field name="accepted"/>
                         <field name="development"/>
                         <field name="difficulty" invisible="1"/>
@@ -289,6 +293,32 @@
             </search>
         </field>
     </record>
+     <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form_without_partner">
+            <field name="name">mail.compose.message.form</field>
+            <field name="model">mail.compose.message</field>
+            <field name="priority">9999</field>
+            <field name="groups_id" eval="[(3,ref('base.group_user'))]"/>
+            <field name="arch" type="xml">
+                <form string="Compose Email" version="7.0">
+                    <group>
+                        <!-- truly invisible fields for control and options -->
+                        <field name="composition_mode" invisible="1"/>
+                        <field name="model" invisible="1"/>
+                        <field name="res_id" invisible="1"/>
+                        <field name="parent_id" invisible="1"/>
+                        <!-- visible wizard -->
+                        <field name="subject" placeholder="Subject..."/>
+                    </group>
+                    <field name="body"/>
+                    <field name="attachment_ids" widget="many2many_binary"/>
+                    <footer>
+                        <button string="Send" name="send_mail" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+     </record>
 
      <record id="view_userstory_search" model="ir.ui.view">
       <field name="name">user.story.search</field>

=== added directory 'user_story/wizard'
=== added file 'user_story/wizard/__init__.py'
--- user_story/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ user_story/wizard/__init__.py	2014-10-15 18:08:34 +0000
@@ -0,0 +1,1 @@
+from . import message_compose

=== added file 'user_story/wizard/message_compose.py'
--- user_story/wizard/message_compose.py	1970-01-01 00:00:00 +0000
+++ user_story/wizard/message_compose.py	2014-10-15 18:08:34 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+class mail_compose_message(osv.TransientModel):
+    _inherit = 'mail.compose.message'
+
+    def _get_templates(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        email_template_obj = self.pool.get('email.template')
+        if not email_template_obj.check_access_rights(cr, uid, 'read', raise_exception=False):
+            return []
+        else:
+            return super(mail_compose_message, self)._get_templates(cr, uid, context=context)
+        return []
+
+
+    _columns = {
+        # incredible hack of the day: size=-1 means we want an int db column instead of an str one
+        'template_id': fields.selection(_get_templates, 'Template', size=-1),
+    }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: