[IMP] add stat button for point of sale, email template

bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 8dbda70..4023372 100644 (file)
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -71,7 +71,7 @@
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice">
                         <field string="Invoices" name="invoice_count" widget="statinfo" attrs="{'readonly':1}"/>
                     </button>
-                    <button type="action" class="oe_stat_button" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-book">
+                    <button type="action" class="oe_stat_button" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user" icon="fa-list">
                         <field string="Journal Items" name="journal_item_count" widget="statinfo"/>                        
                     </button>
                     <button class="oe_inline oe_stat_button" type="action" name="%(account.action_open_partner_analytic_accounts)d" 

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index dfa2697..26fa93f 100644 (file)
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -18,8 +18,9 @@
                                     attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" icon="fa-adn"
                                     help="Display an option on related documents to open a composition wizard with this template" widget="statinfo"/>
                             <button name="unlink_action" string="Remove context action" type="object" 
+                                    class="oe_stat_button" icon="fa-minus"
                                     attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
-                                    help="Remove the contextual action to use this template on related documents"/>
+                                    help="Remove the contextual action to use this template on related documents" widget="statinfo"/>
                             <button class="oe_inline oe_stat_button" name="%(wizard_email_template_preview)d" icon="fa-search-plus" string="Preview"
                                     type="action" target="new"
                                     context="{'template_id':active_id}" widget="statinfo"/>

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 2560590..d71d083 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -105,11 +105,10 @@ class hr_timesheet_sheet(osv.osv):
         return hr_employee.attendance_action_change(cr, uid, employee_ids, context=context)
     
     def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'timesheet_count': 0, 'attendance_count': 0,}), ids))
+        res = dict(map(lambda x: (x,{'timesheet_activity_count': 0, 'attendance_count': 0,}), ids))
         try:
            for datas in self.browse(cr, uid, ids, context=context):
-                res[datas.id] = {'appraisal_count': len(datas.appraisal_ids),
-                'timesheet_count': len(datas.timesheet_ids),
+                res[datas.id] = {'timesheet_activity_count': len(datas.timesheet_activity_ids),
                 'attendance_count': len(datas.attendances_ids),
                 }
         except:
@@ -146,7 +145,8 @@ class hr_timesheet_sheet(osv.osv):
         'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'department_id':fields.many2one('hr.department','Department'),
-        'timesheet_count': fields.function(_count_all, type='integer', string='Timesheet Activities', multi=True),
+        'timesheet_activity_ids': fields.one2many('hr.analytic.timesheet', 'sheet_id', 'Timesheet Activities'),
+        'timesheet_activity_count': fields.function(_count_all, type='integer', string='Timesheet Activities', multi=True),
         'attendance_count': fields.function(_count_all, type='integer', string="Attendances", multi=True),
     }
 

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index fd7570c..d6c987b 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -75,11 +75,13 @@
                             name="%(act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet)d"
                             class="oe_stat_button"
                             icon="fa-times">
-                            <field name="timesheet_count" widget="statinfo" string="Timesheet Activities"/>
+                            <field name="timesheet_activity_count" widget="statinfo" string="Timesheet Activities"/>
                         </button>
                         <button type="action" groups="base.group_hr_attendance"
-                            name="%(act_hr_timesheet_sheet_sheet_2_hr_attendance)d"
-                            string="Attendances" />
+                            class="oe_stat_button" icon="fa-users"
+                            name="%(act_hr_timesheet_sheet_sheet_2_hr_attendance)d">
+                            <field name="attendance_count" widget="statinfo" string="Attendances"/>
+                        </button>
                     </div>
                     <div class="oe_title">
                         <label for="employee_id" class="oe_edit_only"/>

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 7740020..c58d2ea 100644 (file)
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -843,8 +843,10 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button name="%(action_pos_box_in)d" string="Put Money In" type="action" states="opened,closing_control"/>
-                            <button name="%(action_pos_box_out)d" string="Take Money Out" type="action" states="opened,closing_control"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_in)d" string="Put Money In" 
+                                type="action" states="opened,closing_control" icon="fa-money"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_out)d" string="Take Money Out" 
+                                type="action" states="opened,closing_control" icon="fa-money"/>
                         </div>
                         <h1 class="oe_title">
                             Session:

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a47eac9..9e712ce 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -240,18 +240,20 @@
                             <field name="active"/>
                         </group>
                         <group groups="stock.group_tracking_lot" string="Traceability">
-                            <button name="action_traceability" 
-                                string="Upstream Traceability"
-                                class="oe_stat_button"
-                                icon="fa-arrow-up" 
-                                type="object" colspan="2"/>
-                            <button name="action_traceability" 
-                                string="Downstream Traceability"
-                                class="oe_stat_button"
-                                icon="fa-arrow-down" 
-                                type="object"
-                                context="{'type': 'move_history_ids'}" colspan="2"/>
-                        </group>
+                            <div class="oe_button_box">
+                                <button name="action_traceability" 
+                                    string="Upstream Traceability"
+                                    class="oe_stat_button"
+                                    icon="fa-arrow-up" 
+                                    type="object" colspan="2"/>
+                                <button name="action_traceability" 
+                                    string="Downstream Traceability"
+                                    class="oe_stat_button"
+                                    icon="fa-arrow-down" 
+                                    type="object"
+                                    context="{'type': 'move_history_ids'}" colspan="2"/>
+                            </div>
+                        </group>                            
                     </group>
                     <field name="move_ids"/>
                 </form>
@@ -1245,15 +1247,14 @@
                         <group name="main_grp" string="Details">
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
-                            <div class="oe_button_box">
+                            <div>
                                 <field name="product_qty"
                                     on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
                                     class="oe_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
-                                        class="oe_stat_button"
-                                        icon="fa-trash-o" context="{'scrap': True}"
+                                        icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
@@ -1287,20 +1288,18 @@
                                 <field name="tracking_id" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
                                       groups="product.group_stock_packaging"
-                                      class="oe_stat_button "
-                                      icon="fa-gift"
+                                      icon="terp-accessories-archiver+"
                                       states="draft,assigned,confirmed"/>
                             </div>
                             <label for="prodlot_id" groups="stock.group_production_lot"/>
-                            <div groups="stock.group_production_lot" class="oe_button_box">
+                            <div groups="stock.group_production_lot">
                                 <field name="prodlot_id"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]" class="oe_inline"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                                 <button name="%(track_line)d"
-                                    states="draft,waiting,confirmed,assigned" 
-                                    class="oe_stat_button"
-                                    string="Split" type="action" icon="fa-filter"/>
+                                    states="draft,waiting,confirmed,assigned"
+                                    string="Split" type="action" icon="gtk-justify-fill"/>
                             </div>
                         </group>
                     </group>