[MERGE]:trunk

bzr revid: apa@tinyerp.com-20120912124210-cn5y3gcbxhew53h1
bzr revid: apa@tinyerp.com-20120913052046-r2lxb209eau3xnvo

4 files changed, 18 insertions, 42 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index 9bd939dd4fe..35be1d82c6e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -41,8 +41,9 @@ class project_task_type(osv.osv):
         'case_default': fields.boolean('Common to All Projects',
                         help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
-        'state': fields.selection(_TASK_STATE, 'State', required=True,
-                        help="The related state for the stage. The state of your document will automatically change regarding the selected stage. Example, a stage is related to the state 'Close', when your document reach this stage, it will be automatically closed."),
+        'state': fields.selection(_TASK_STATE, 'Related Status', required=True,
+                        help="The status of your document is automatically changed regarding the selected stage. " \
+                            "For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."),
         'fold': fields.boolean('Hide in views if empty',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
@@ -727,7 +728,7 @@ class task(base_stage, osv.osv):
                       When the case is over, the state is set to \'Done\'.\
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
-        'categ_ids': fields.many2many('project.category', string='Categories'),
+        'categ_ids': fields.many2many('project.category', string='Tags'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
                                          help="A task's kanban state indicates special situations affecting it:\n"
                                               " * Normal is the default situation\n"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4f2fe7d54f1..ff8ac943a67 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -136,6 +136,7 @@
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
+                                    <field name="date"/>
                                     <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
@@ -249,47 +250,21 @@
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
                                     </div>
-                                    <table>
-                                      <tr class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
-                                        <th>Deadline</th>
-                                        <td><field name="date"/></td>
-                                      </tr>
-                                      <tr class="oe_kanban_project_fields oe_kanban_project_progress">
-                                        <th>Progress</th>
-                                        <td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></td>
-                                      </tr>
-                                    </table>
+                                    <div class="oe_kanban_footer_left">
+                                        <span>
+                                            <span class="oe_e">R</span>
+                                            <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>
+                                        </span>
+                                        <span t-if="record.date.raw_value">
+                                            <span class="oe_e">N</span>
+                                            <field name="date"/>
+                                        </span>
+                                    </div>
                                     <div class="oe_kanban_project_avatars">
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
                                         </t>
                                     </div>
-
-                                    <!--<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>-->
-
-                                    <!--<div class="oe_kanban_project_list">-->
-                                        <!--<a t-if="record.use_tasks.raw_value"-->
-                                            <!--name="%(act_project_project_2_project_task_all)d" type="action">-->
-                                            <!--Tasks(<field name="task_count"/>)</a>-->
-                                    <!--</div>-->
-
-                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">-->
-                                        <!--<div>Deadline</div>-->
-                                        <!--<div><field name="date"/></div>-->
-                                    <!--</div>-->
-                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_progress">-->
-                                        <!--<div>Progress</div>-->
-                                        <!--<div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>-->
-                                    <!--</div>-->
-                                    <!--<div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">-->
-                                        <!--<a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>-->
-                                    <!--</div>-->
-                                    <!--<div class="oe_kanban_project_avatars">-->
-                                        <!--<t t-foreach="record.members.raw_value" t-as="member">-->
-                                            <!--<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>-->
-                                        <!--</t>-->
-                                    <!--</div>-->
-
                                 </div>
                             </div>
                         </t>
@@ -779,7 +754,7 @@
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="state" string="Related State"/>
+                            <field name="state"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 6c1f5443835..f3055727d5e 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -52,7 +52,7 @@ class report_project_task_user(osv.osv):
 ('0','Very urgent')], 'Priority', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
     }
     _order = 'name desc, project_id'
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index f90162fcc76..8381e6d68d3 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -3,7 +3,7 @@
 }
 
 .oe_kanban_project {
-    width: 250px;
+    width: 220px;
     min-height: 160px;
 }