diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 22b04e05f39..5936e29fe29 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -62,7 +62,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 
     def _get_lines(self, form):
         res = []
-        account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
         self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
                     res_partner.name AS name \
                 FROM res_partner,account_move_line AS l, account_account\
@@ -219,7 +218,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 
     def _get_lines_with_out_partner(self, form):
         res = []
-        account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index b03aea5c05d..d3fb791bfaa 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -190,7 +190,6 @@ class tax_report(rml_parse.rml_parse):
                 bcl_rup_ind = ind - 1
 
                 while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
-                    tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
                     res_tot = { 'code': accounts[bcl_rup_ind]['code'],
                         'name': '',
                         'debit': 0,
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index a2cf45391fb..7b6d232d702 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-import netsvc
-from osv import fields, osv
+from osv import osv
 from tools.translate import _
 
 class invoice(osv.osv):
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 7105102b385..c26a1f1bbfb 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -42,6 +42,7 @@
     'depends': ['base', 'account', 'hr_attendance'],
     'init_xml': ['auction_sequence.xml', 'auction_data.xml'],
     'update_xml': [
+        'security/auction_security.xml',
         'security/ir.model.access.csv',
         'wizard/auction_lots_make_invoice_buyer_view.xml',
         'wizard/auction_lots_make_invoice_view.xml',
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 1cda8ceba60..a3fb7b5a28a 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system"/>
-    <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
+    <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26" 
+                groups="base.group_system,group_auction_manager,group_auction_user"/>
+    <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="base.group_system,group_auction_manager"/>
     <menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
     <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
 
@@ -80,7 +81,8 @@
         <field name="view_id" ref="view_auction_object_categories_tree"/>
     </record>
 
-    <menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" id="menu_auction_object_cat"/>
+    <menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" 
+                id="menu_auction_object_cat" groups="base.group_system,group_auction_manager"/>
 
    <!--  Auction Management/Auction Dates/New Auction Dates  -->
 
@@ -485,6 +487,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="action_all_objects">
+        <field name="name">Objects</field>
         <field name="res_model">auction.lots</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,graph</field>
@@ -762,7 +765,7 @@
     <menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
     <menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
 
-    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
+    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="base.group_system,group_auction_manager"/>
 
     <act_window name="Deposit slip"
         context="{'search_default_partner_id': [active_id]}"
diff --git a/addons/auction/report/report_auction_view.xml b/addons/auction/report/report_auction_view.xml
index 8153314e877..ec4f36ceb70 100644
--- a/addons/auction/report/report_auction_view.xml
+++ b/addons/auction/report/report_auction_view.xml
@@ -37,23 +37,24 @@
         <field name="arch" type="xml">
             <search string="Auction Summary">
                 <group>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Auction in last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
+                    <filter icon="terp-go-year" string="Year"
+                        domain="[('year','=',time.strftime('%%Y'))]"
+                        help="Auction during current year."/>
+                    <filter icon="terp-go-month" string="Month"
                         name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Auction in last 30 days"/>
+                        domain="[('month','=',time.strftime('%%m'))]"
+                        help="Auction during current month."/>
                     <filter icon="terp-go-week"
-                         string="    7 Days    "
+                         string="Month -1"
                          separator="1"
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Auction during last 7 days"/>
+                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
+                         help="Auction during last month."/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Draft"
                         domain="[('state','=','draft')]"/>
                     <filter icon="terp-dolar"
+                        name="sold"
                         string="Sold"
                         domain="[('state','=', 'sold')]"/>
                     <separator orientation="vertical"/>
@@ -74,7 +75,7 @@
                     <filter string="Buyer" icon="terp-personal" name="buyer" context="{'group_by':'buyer'}"/>
                     <filter string="Seller" icon="terp-personal" name="seller" context="{'group_by':'seller'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Auction" icon="terp-project" name="auction" context="{'group_by':'auction'}"/>
+                    <filter string="Auction" icon="terp-project" name="auction_date" context="{'group_by':'auction'}"/>
                     <separator orientation="vertical" />
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Type"
@@ -113,7 +114,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_report_auction_search"/>
-        <field name="context">{'search_default_month':1}</field>
+        <field name="context">{'search_default_month':1,'search_default_sold':1,'search_default_auction_date':1, 'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
 
     <menuitem name="Auction Analysis" action="action_report_auction" id="menu_report_auction" parent="auction.auction_report_menu"/>
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
new file mode 100644
index 00000000000..32fdf0d64f3
--- /dev/null
+++ b/addons/auction/security/auction_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="group_auction_manager" model="res.groups">
+        <field name="name">Auction / Manager</field>
+    </record>
+    <record id="group_auction_user" model="res.groups">
+        <field name="name">Auction / User</field>
+    </record>
+    
+</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index cd4ec1a77f0..31f3182fa04 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -1,18 +1,23 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_auction_artists","auction.artists","model_auction_artists","base.group_user",1,1,1,1
-"access_auction_dates","auction.dates","model_auction_dates","base.group_user",1,1,1,1
-"access_auction_deposit","auction.deposit","model_auction_deposit","base.group_user",1,1,1,1
-"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","base.group_user",1,1,1,1
-"access_auction_lot_category","auction.lot.category","model_auction_lot_category","base.group_user",1,1,1,1
-"access_auction_lots","auction.lots","model_auction_lots","base.group_user",1,1,1,1
-"access_auction_bid","auction.bid","model_auction_bid","base.group_user",1,1,1,1
-"access_auction_bid_line","auction.bid.line","model_auction_bid_line","base.group_user",1,1,1,1
-"access_auction_lot_history","auction.lot.history","model_auction_lot_history","base.group_user",1,1,1,1
-"access_report_auction","report.auction","model_report_auction","base.group_user",1,0,0,0
-"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","base.group_user",1,0,0,0
-"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","base.group_user",1,0,0,0
-"access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0
-"access_aie_category","aie.category","model_aie_category","base.group_user",1,0,0,0
+"access_auction_artists","auction.artists","model_auction_artists","group_auction_manager",1,1,1,1
+"access_auction_dates_manager","auction.dates manager","model_auction_dates","group_auction_manager",1,1,1,1
+"access_auction_deposit_manager","auction.deposit manager","model_auction_deposit","group_auction_manager",1,1,1,1
+"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","group_auction_manager",1,1,1,1
+"access_auction_lot_category","auction.lot.category","model_auction_lot_category","group_auction_user",1,0,0,0
+"access_auction_lot_category_manager","auction.lot.category manager","model_auction_lot_category","group_auction_manager",1,1,1,1
+"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,1
+"access_auction_lots_manager","auction.lots manager","model_auction_lots","group_auction_manager",1,0,0,0
+"access_auction_bid","auction.bid","model_auction_bid","group_auction_user",1,1,1,1
+"access_auction_bid_manager","auction.bid manager","model_auction_bid","group_auction_manager",1,0,0,0
+"access_auction_bid_line","auction.bid.line","model_auction_bid_line","group_auction_user",1,1,1,1
+"access_auction_bid_line_manager","auction.bid.line manager","model_auction_bid_line","group_auction_manager",1,0,0,0
+"access_auction_lot_history","auction.lot.history","model_auction_lot_history","group_auction_user",1,1,1,1
+"access_auction_lot_history_manager","auction.lot.history manager","model_auction_lot_history","group_auction_manager",1,0,0,0
+"access_report_auction","report.auction","model_report_auction","group_auction_manager",1,1,1,1
+"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","group_auction_manager",1,1,1,1
+"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
+"access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
+"access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
 "access_auction_dates_system","auction.dates system","model_auction_dates","base.group_system",1,0,0,0
 "access_auction_lots_system","auction.lots system","model_auction_lots","base.group_system",1,0,0,0
 "access_auction_deposit_system","auction.deposit system","model_auction_deposit","base.group_system",1,0,0,0
@@ -22,3 +27,15 @@
 "access_auction_lot_history_system","auction.lot.history system","model_auction_lot_history","base.group_system",1,0,0,0
 "access_auction_deposit_cost_system","auction.deposit.cost system","model_auction_deposit_cost","base.group_system",1,0,0,0
 "access_auction_bid_line_system","auction.bid.line system","model_auction_bid_line","base.group_system",1,0,0,0
+"access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
+"access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
+"access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
+"access_auction_account_invoice","account.invoice manager","account.model_account_invoice","group_auction_manager",1,1,1,0
+"access_auction_account_invoice_line","account.invoice.line manager","account.model_account_invoice_line","group_auction_manager",1,1,1,0
+"access_auction_account_invoice_tax","account.invoice.tax manager","account.model_account_invoice_tax","group_auction_manager",1,1,1,0
+"access_auction_account_analytic_journal","account.analytic.journal manager","account.model_account_analytic_journal","group_auction_manager",1,1,1,0
+"access_auction_account_period","account.period manager","account.model_account_period","group_auction_manager",1,1,1,0
+"access_auction_account_move","account.move manager","account.model_account_move","group_auction_manager",1,1,1,0
+"access_auction_account_move_line","account.move.line manager","account.model_account_move_line","group_auction_manager",1,1,1,0
+"access_auction_account_journal_period","account.journal.period manager","account.model_account_journal_period","group_auction_manager",1,1,1,0
+"access_auction_account_analytic_line","account.analytic.line manager","account.model_account_analytic_line","group_auction_manager",1,1,1,1
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 0e4fb4a7df5..80d973ee0e8 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -47,7 +47,6 @@ class crm_phonecall_report(osv.osv):
             @param context: A standard dictionary for contextual values """
 
         res = {}
-        state_perc = 0.0
         avg_ans = 0.0
 
         for case in self.browse(cr, uid, ids, context):
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 7046034afaf..8c5e13db4c1 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -207,7 +207,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             context = {}
         
         partner_ids = self._create_partner(cr, uid, ids, context)
-        mod_obj = self.pool.get('ir.model.data')
         value = {}
         data_obj = self.pool.get('ir.model.data')
         data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index f2b3d711f2e..3c0a5730203 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 44e7b102d18..a1bd0ba39d7 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -565,7 +565,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 4d3fd7169e9..6114a513680 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index 6a674f9d1c3..ed1ee7ba401 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -584,7 +584,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Temps en hores per realitzar un cicle."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Data final"
 
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index cf9c4b7dbc1..012d1c2eae0 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index e6a45d18a49..2e84ba9f1e2 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Zeit in Stunden für einen (Auftrags-) Zyklus"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Endedatum"
 
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index fc5cb55363f..6904be353b3 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Χρόνος ενός κύκλου σε ώρες"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Ημερ/νία Τέλους"
 
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 9212132769a..d2568c453cf 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Tiempo en horas para realizar un ciclo."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Fecha final"
 
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index c1c0ee7e6b9..6146c57db3d 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index d86a3f54173..ff994127269 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Tiempo en horas para realizar un ciclo."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Fecha final"
 
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index 434a4622aa5..1e78dd6168b 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Aeg tundides mis kulub ühes tsükklis."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Lõppkuupäev"
 
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index 8610bec1dea..1d33d2dedff 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -580,7 +580,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Yhden kierron kesto tunneissa."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Lopetuspäivämäärä"
 
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 51287167558..a39551a404d 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -600,7 +600,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Temps nécessaire à la réalisation d'un cycle"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Date de fin"
 
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 96be03f1000..d8352b7d12d 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "समाप्ति तिथि"
 
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 652303d8bb4..17504495bf8 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 10d9b0da8ba..fb78fa66ed3 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index c91d0f8438e..23308aeca00 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index c001e0a2d6e..148820c77f9 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -586,7 +586,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Tempo in ore per completare un ciclo."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Data di fine"
 
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 1068e604527..8df359442fb 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "한 사이클을 수행하는 시간"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "마감 날짜"
 
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 677f640b861..faae3ef23ce 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -575,7 +575,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Vieno ciklo laikas valandomis."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Pabaigos data"
 
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index d576151f247..913acfe3f9f 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -546,7 +546,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index 97c4f6ee79c..4faad6c115e 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -584,7 +584,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Tijd in uren voor één productiecyclus."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Einddatum"
 
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index a6bea998b5f..a4df723195a 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index d65d0617e75..37985293f94 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -582,7 +582,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Czas wykonania jednego cyklu w godzinach"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Data końcowa"
 
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 71ea973805e..39c9c359335 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -564,7 +564,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Data de finalização"
 
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index b348ca0faee..ba0de24330e 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Tempo em hora para fazer um ciclo."
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Data final"
 
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 11f24dae6c9..346792757ce 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 3f227b676ac..b0a01bfe8f2 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "Время в часах на выполнение одного цикла"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Дата окончания"
 
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index e9bdba85b42..5cad0bfc519 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 1c314829f6a..16c4b4c8067 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Končni datum"
 
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index ba8543fe2f7..bbd4051e28a 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index d3865dd7691..c086b7f24f1 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Slutdatum"
 
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index 81ba3486333..5ac8e02d5aa 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index be3a69b6415..ee6b7017c3b 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Bitiş Tarihi"
 
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index a5824ca6d96..fcbd14cb9e7 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "Кінцева дата"
 
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 516438d2dfc..6c620e01062 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index b4b04af2f15..1fb75aececc 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "一个周期的工作小时数"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr "结束日期"
 
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index 88ec10de504..43c27d45606 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "一個循環所須的小時數"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index b0be94ac800..08120747e9a 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
 msgstr "一個循環所須的小時數"
 
 #. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
 msgid "End Date"
 msgstr ""
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 1a71114c336..eea2e4a5224 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -456,7 +456,7 @@ class mrp_production(osv.osv):
         'date_planned_date': fields.function(_production_date, method=True, type='date', string='Scheduled Date'),
         'date_planned': fields.datetime('Scheduled date', required=True, select=1),
         'date_start': fields.datetime('Start Date'),
-        'date_finnished': fields.datetime('End Date'),
+        'date_finished': fields.datetime('End Date'),
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."),
@@ -658,7 +658,7 @@ class mrp_production(osv.osv):
         """
         for production in self.browse(cr, uid, ids):
             self._costs_generate(cr, uid, production)
-        return self.write(cr, uid, ids, {'state': 'done', 'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return self.write(cr, uid, ids, {'state': 'done', 'date_finished': time.strftime('%Y-%m-%d %H:%M:%S')})
 
     def test_production_done(self, cr, uid, ids):
         """ Tests whether production is done or not.
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 39ecec5ad95..6fda888190c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -545,7 +545,7 @@
             <field name="model">mrp.production</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-                <gantt color="product_id" date_stop="date_finnished" date_start="date_start" string="Productions">
+                <gantt color="product_id" date_stop="date_finished" date_start="date_start" string="Productions">
                     <level object="mrp.routing" link="routing_id" domain="[]">
                         <field name="name"/>
                         <field name="origin"/>
@@ -604,8 +604,8 @@
                                 <tree colors="blue:state in ('draft');black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="UOM"/>
-                                    <field name="location_id"  string="Source Loc."/>
+                                    <field name="product_uom"  string="UOM" widget="selection"/>
+                                    <field name="location_id"  string="Source Loc." widget="selection"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.move_consume)d"
                                         string="Consume Products" type="action"
@@ -623,8 +623,8 @@
                                    <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="UOM"/>
-                                       <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
+                                       <field name="product_uom" readonly="1" string="UOM" widget="selection"/>
+                                       <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                        <field name="prodlot_id" />
                                        <field name="state" invisible="1"/>
                                        <field name="scrapped" invisible="1"/>
@@ -658,8 +658,8 @@
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="UOM"/>
-                                    <field name="location_id"  string="Source Loc."/>
+                                    <field name="product_uom"  string="UOM" widget="selection"/>
+                                    <field name="location_id"  string="Source Loc." widget="selection"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -673,8 +673,8 @@
                                    <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="UOM"/>
-                                       <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
+                                       <field name="product_uom" readonly="1" string="UOM" widget="selection"/>
+                                       <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                        <field name="prodlot_id" />
                                        <field name="scrapped" invisible="1"/>
                                        <button name="%(stock.track_line)d"
@@ -711,7 +711,7 @@
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
                             <field name="date_start"/>
-                            <field name="date_finnished"/>
+                            <field name="date_finished"/>
                             <field name="picking_id" groups="base.group_extended"/>
                             <field name="move_prod_id" groups="base.group_extended"/>
                         </page>
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index 9aeae1781cd..3ad4184c413 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -51,7 +51,7 @@ class mrp_production_order(osv.osv):
         'date_planned':fields.date('Scheduled Date'),
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', readonly=True),
         'date_start': fields.datetime('Start Date',readonly=True),
-        'date_finnished': fields.datetime('End Date',readonly=True),
+        'date_finished': fields.datetime('End Date',readonly=True),
         'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', readonly=True),
         'company_id': fields.many2one('res.company','Company',readonly=True),
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material',readonly=True),
@@ -100,7 +100,7 @@ class mrp_production_order(osv.osv):
                      s.routing_id,
                      s.picking_id,
                      s.date_start,
-                     s.date_finnished,
+                     s.date_finished,
                      to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_planned,
                      s.origin,
                      s.priority,
@@ -128,7 +128,7 @@ class mrp_production_order(osv.osv):
                      to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY'),
                      s.origin,
                      s.date_start,
-                     s.date_finnished,
+                     s.date_finished,
                      s.company_id
             )""")
 mrp_production_order()
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index ea1f15bc3ea..6f88981fd5f 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -58,7 +58,7 @@
 		                <filter icon="terp-go-week"
 	                            string="Month -1"
 	                            separator="1"
-	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                            domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
 	                            help="Production during last month"/>
                       <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
@@ -80,7 +80,7 @@
                       <newline/>
                         <field name="date_start"/>
                       <field name="date_planned"/>
-                      <field name="date_finnished"/>
+                      <field name="date_finished"/>
                     </group>
                    <newline/>
                    <group expand="1" string="Group By...">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 1bf82338cdd..dcb2bcb3566 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -101,7 +101,8 @@
             <field name="view_mode">graph,tree</field>
             <field name="help">Weekly Stock Value Variation enables you to track stock value evolution as a result of manufacturing activities (consumption of raw materials, production of finished goods, added accounting value of stock by the creation of value following the transformation of products).</field>
         </record>
-        <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="next_id_77"/>
+        <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" 
+                    parent="next_id_77" groups="mrp.group_mrp_manager"/>
 
 
 
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 79c5de9a505..e63ced14997 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -5,12 +5,14 @@
 "access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0
 "access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
 "access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
+"access_mrp_property_group","mrp.property.group","procurement.model_mrp_property_group","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
 "access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
-"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,1
 "access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
 "access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
 "access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
@@ -20,14 +22,15 @@
 "access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
 "access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,1,1,1
 "access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
-"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","base.group_system",1,1,1,1
+"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_manager","resource.model_resource_calendar","mrp.group_mrp_manager",1,1,1,1
 "access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
 "access_procurement_user","procurement.order.user","model_procurement_order","base.group_user",1,1,1,1
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
 "access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
-"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
-"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
-"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,1,1,1
+"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
+"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
+"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,0,0,0
+"access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
 "access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
 "access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,1,1,1
 "access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,1,1,1
@@ -39,6 +42,7 @@
 "access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
 "access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
 "access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
+"access_resource_calendar_attendance_manager","mrp.resource.calendar.attendance.manager","resource.model_resource_calendar_attendance","mrp.group_mrp_manager",1,1,1,1
 "access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,1,1,0
 "access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,1,1,0
 "access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,1,1,0
@@ -55,7 +59,7 @@
 "access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
 "access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
 "access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
+"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,1
 "access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
 "access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
 "access_product_template_system","product.template mgr.system","product.model_product_template","base.group_system",1,0,0,0
@@ -87,6 +91,6 @@
 "access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
 "access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
 "access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
-"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,1,1,1
+"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
 "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 46b1d19244a..08a0bc31c86 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -230,17 +230,6 @@
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
     	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
-  I get the approval from both the suppliers. So I approve my purchase orders.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    import netsvc
-    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
-    assert purch_ids, _('No Confirmed Purchase Orders found!')
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
 -
   I see two incoming pickings for Orange and Sugar.
 -
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 7435503bac9..40d22ae817f 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -178,17 +178,7 @@
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
     	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
-  I get the approval from the supplier. So I approve my purchase orders.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    import netsvc
-    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
-    assert purch_ids, _('No Confirmed Purchase Orders found!')
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+
 -
   I confirm purchase order for Buttons.
 -
@@ -198,17 +188,7 @@
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
     	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
-  I get the approval from the supplier. So I approve my purchase orders.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    import netsvc
-    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
-    assert purch_ids, _('No Confirmed Purchase Orders found!')
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+
 -
   I Check incoming shipments for cloth. And receive products.
 -
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 5f7aa0754e1..f5d62d535c9 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -87,10 +87,10 @@ class change_production_qty(osv.osv_memory):
                 factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
                 res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
                 for r in res[0]:
-                    if r['product_id']== move.product_id.id:
-                        move_lines_obj.write(cr, uid,move.id, {'product_qty' :  r['product_qty']})
+                    if r['product_id'] == move.product_id.id:
+                        move_lines_obj.write(cr, uid, [move.id], {'product_qty' :  r['product_qty']})
             for m in prod.move_created_ids:
-                move_lines_obj.write(cr, uid,m.id, {'product_qty': wiz_qty.product_qty})
+                move_lines_obj.write(cr, uid, [m.id], {'product_qty': wiz_qty.product_qty})
     
         return {}
     
diff --git a/addons/mrp_operations/i18n/ar.po b/addons/mrp_operations/i18n/ar.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/ar.po
+++ b/addons/mrp_operations/i18n/ar.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/bg.po b/addons/mrp_operations/i18n/bg.po
index f67c785f82e..39a5d93bdb5 100644
--- a/addons/mrp_operations/i18n/bg.po
+++ b/addons/mrp_operations/i18n/bg.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/bs.po b/addons/mrp_operations/i18n/bs.po
index ff9a28f1473..f1f31cefc6b 100644
--- a/addons/mrp_operations/i18n/bs.po
+++ b/addons/mrp_operations/i18n/bs.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/ca.po b/addons/mrp_operations/i18n/ca.po
index fd8d311dcc4..6567a54a457 100644
--- a/addons/mrp_operations/i18n/ca.po
+++ b/addons/mrp_operations/i18n/ca.po
@@ -249,7 +249,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/cs.po b/addons/mrp_operations/i18n/cs.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/cs.po
+++ b/addons/mrp_operations/i18n/cs.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index 2c4800228d0..82d75040b9e 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -250,7 +250,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index e973ddb2381..2b0bf5b7c50 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -251,7 +251,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
index d0589260312..3c140fd1541 100644
--- a/addons/mrp_operations/i18n/es_AR.po
+++ b/addons/mrp_operations/i18n/es_AR.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/es_EC.po b/addons/mrp_operations/i18n/es_EC.po
index b0caeb9a279..730a921b999 100644
--- a/addons/mrp_operations/i18n/es_EC.po
+++ b/addons/mrp_operations/i18n/es_EC.po
@@ -251,7 +251,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/et.po b/addons/mrp_operations/i18n/et.po
index 493f060565b..de913493585 100644
--- a/addons/mrp_operations/i18n/et.po
+++ b/addons/mrp_operations/i18n/et.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/fi.po b/addons/mrp_operations/i18n/fi.po
index 0f94be1c01a..27936f066f7 100644
--- a/addons/mrp_operations/i18n/fi.po
+++ b/addons/mrp_operations/i18n/fi.po
@@ -249,7 +249,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index 4e818c3655a..a5f40616d0a 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index cdd3e5fd4a4..865f2353a13 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/hu.po b/addons/mrp_operations/i18n/hu.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/hu.po
+++ b/addons/mrp_operations/i18n/hu.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/id.po b/addons/mrp_operations/i18n/id.po
index 064aeb7c14b..871abf389d6 100644
--- a/addons/mrp_operations/i18n/id.po
+++ b/addons/mrp_operations/i18n/id.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/it.po b/addons/mrp_operations/i18n/it.po
index 379639b9d39..9c93f457091 100644
--- a/addons/mrp_operations/i18n/it.po
+++ b/addons/mrp_operations/i18n/it.po
@@ -249,7 +249,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index c4c54b0857b..33a70f940fa 100644
--- a/addons/mrp_operations/i18n/ko.po
+++ b/addons/mrp_operations/i18n/ko.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/lt.po b/addons/mrp_operations/i18n/lt.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/lt.po
+++ b/addons/mrp_operations/i18n/lt.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index a1f61b1965d..90df737dde5 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -242,7 +242,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index 1a7674b11cd..7905b9cc363 100644
--- a/addons/mrp_operations/i18n/nl.po
+++ b/addons/mrp_operations/i18n/nl.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/nl_BE.po b/addons/mrp_operations/i18n/nl_BE.po
index 6d8bb017f25..173b7601ae9 100644
--- a/addons/mrp_operations/i18n/nl_BE.po
+++ b/addons/mrp_operations/i18n/nl_BE.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 48b6475b9fd..dd4ff7ee02c 100644
--- a/addons/mrp_operations/i18n/pl.po
+++ b/addons/mrp_operations/i18n/pl.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index 96427a43ff0..d874808086b 100644
--- a/addons/mrp_operations/i18n/pt.po
+++ b/addons/mrp_operations/i18n/pt.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
index 731aded6cda..981c5624c8b 100644
--- a/addons/mrp_operations/i18n/pt_BR.po
+++ b/addons/mrp_operations/i18n/pt_BR.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/ro.po b/addons/mrp_operations/i18n/ro.po
index 54db3294f60..2658a2ce74e 100644
--- a/addons/mrp_operations/i18n/ro.po
+++ b/addons/mrp_operations/i18n/ro.po
@@ -250,7 +250,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index 333caa9e4f3..69c0d6fb0a5 100644
--- a/addons/mrp_operations/i18n/ru.po
+++ b/addons/mrp_operations/i18n/ru.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/sl.po b/addons/mrp_operations/i18n/sl.po
index 81ab1c3b66e..0d012e0211e 100644
--- a/addons/mrp_operations/i18n/sl.po
+++ b/addons/mrp_operations/i18n/sl.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/sq.po b/addons/mrp_operations/i18n/sq.po
index 27c43ff72cf..d61f3069824 100644
--- a/addons/mrp_operations/i18n/sq.po
+++ b/addons/mrp_operations/i18n/sq.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/sv.po b/addons/mrp_operations/i18n/sv.po
index 945c20d62cb..52e7c2b59e5 100644
--- a/addons/mrp_operations/i18n/sv.po
+++ b/addons/mrp_operations/i18n/sv.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/tlh.po b/addons/mrp_operations/i18n/tlh.po
index 5d7551ac4b7..5af1d671159 100644
--- a/addons/mrp_operations/i18n/tlh.po
+++ b/addons/mrp_operations/i18n/tlh.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index bbcb1006500..3643a54ae6a 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/uk.po b/addons/mrp_operations/i18n/uk.po
index 4f55f459921..fadaf9ba531 100644
--- a/addons/mrp_operations/i18n/uk.po
+++ b/addons/mrp_operations/i18n/uk.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/vi.po b/addons/mrp_operations/i18n/vi.po
index 38bbfea8310..9fcae413139 100644
--- a/addons/mrp_operations/i18n/vi.po
+++ b/addons/mrp_operations/i18n/vi.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index 8ff3bb9f5b2..d7b5635fcc0 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr "运作"
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
index b49e5f9d85b..a8c0f97102f 100644
--- a/addons/mrp_operations/i18n/zh_TW.po
+++ b/addons/mrp_operations/i18n/zh_TW.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
 msgstr ""
 
 #. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 3328f24a59f..9585a34df36 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -67,7 +67,7 @@ class mrp_production_workcenter_line(osv.osv):
         @return: Dictionary of values.
         """
         ops = self.browse(cr, uid, ids, context=context)
-        date_and_hours_by_cal = [(op.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops]
+        date_and_hours_by_cal = [(op.production_id.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops]
         intervals = self.pool.get('resource.calendar').interval_get_multi(cr, uid, date_and_hours_by_cal)
 
         res = {}
@@ -95,7 +95,7 @@ class mrp_production_workcenter_line(osv.osv):
        'date_planned': fields.datetime('Scheduled Date'),
        'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
        'date_start': fields.datetime('Start Date'),
-       'date_finnished': fields.datetime('End Date'),
+       'date_finished': fields.datetime('End Date'),
        'delay': fields.float('Working Hours',help="This is lead time between operation start and stop in this workcenter",readonly=True),
        'production_state':fields.related('production_id','state',
             type='selection',
@@ -179,7 +179,7 @@ class mrp_production_workcenter_line(osv.osv):
         delay += (date_finished-date_start).days * 24
         delay += (date_finished-date_start).seconds / float(60*60)
         
-        self.write(cr, uid, ids, {'state':'done', 'date_finnished': date_now,'delay':delay})
+        self.write(cr, uid, ids, {'state':'done', 'date_finished': date_now,'delay':delay})
         self.modify_production_order_state(cr,uid,ids,'done')
         return True
 
@@ -288,7 +288,7 @@ class mrp_production(osv.osv):
                     dt_end = datetime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
                 old = wc.sequence or 0
             super(mrp_production, self).write(cr, uid, [po.id], {
-                'date_finnished': dt_end
+                'date_finished': dt_end
             })
         return dt_end
 
@@ -306,7 +306,7 @@ class mrp_production(osv.osv):
                 if l.state in ('done','cancel','draft'):
                     continue
                 todo += l.move_dest_id_lines
-                if l.production_id and (l.production_id.date_finnished > dt):
+                if l.production_id and (l.production_id.date_finished > dt):
                     if l.production_id.state not in ('done','cancel'):
                         for wc in l.production_id.workcenter_lines:
                             i = self.pool.get('resource.calendar').interval_min_get(
@@ -335,8 +335,8 @@ class mrp_production(osv.osv):
                         break
                     if l.production_id.state in ('done','cancel'):
                         break
-                    if l.production_id and (l.production_id.date_start < po.date_finnished):
-                        self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finnished})
+                    if l.production_id and (l.production_id.date_start < po.date_finished):
+                        self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finished})
                         break
 
 
@@ -511,7 +511,7 @@ class mrp_operations_operation(osv.osv):
             if code.start_stop=='done':
                 self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
                 wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_done', cr)
-                self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':datetime.now().strftime('%Y-%m-%d %H:%M:%S')})
+                self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finished':datetime.now().strftime('%Y-%m-%d %H:%M:%S')})
 
             if code.start_stop=='pause':
                 self.pool.get('mrp.production.workcenter.line').action_pause(cr,uid,wc_op_id)
@@ -532,7 +532,7 @@ class mrp_operations_operation(osv.osv):
         line_vals['delay'] = delay
         if vals.get('date_start',False):
             if code.start_stop == 'done':
-                line_vals['date_finnished'] = vals['date_start']
+                line_vals['date_finished'] = vals['date_start']
             elif code.start_stop == 'start':    
                 line_vals['date_start'] = vals['date_start']
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 7a5a5af3dc9..9a93b67a36f 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -101,7 +101,7 @@
                     <group colspan="2" col="2">
                         <separator string="Real" colspan="2"/>
                         <field name="date_start" readonly="1"/>
-                        <field name="date_finnished" readonly="1"/>
+                        <field name="date_finished" readonly="1"/>
                         <field name="delay" widget="float_time"/>
                     </group>
                     <group colspan="2" col="2">
@@ -170,7 +170,7 @@
         <field name="model">mrp.production.workcenter.line</field>
         <field name="type">calendar</field>
         <field name="arch" type="xml">
-            <calendar color="product" date_stop="date_finnished" date_start="date_start" string="Operations">
+            <calendar color="product" date_stop="date_finished" date_start="date_start" string="Operations">
                 <field name="workcenter_id"/>
                 <field name="production_id"/>
             </calendar>
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f7a6837aace..5848fa7057c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -21,7 +21,7 @@
 
 from osv import fields,osv
 import netsvc
-from datetime import datetime, date
+from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from tools.translate import _
 import decimal_precision as dp
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 3b5f235251f..a5bdf5ec0f8 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -175,9 +175,8 @@ class pos_order(osv.osv):
             cur_obj = self.pool.get('res.currency')
             cur = order.pricelist_id.currency_id
             for payment in order.statement_ids:
-                 res[order.id]['amount_paid'] +=  payment.amount
-            for payment in order.payments:
-                res[order.id]['amount_return']  += (payment.amount < 0 and payment.amount or 0)
+                res[order.id]['amount_paid'] +=  payment.amount
+                res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
             for line in order.lines:
                 if order.price_type!='tax_excluded':
                     res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
@@ -221,7 +220,6 @@ class pos_order(osv.osv):
             default = {}
         default.update({
             'state': 'draft',
-            'payments': [],
             'partner_id': False,
             'invoice_id': False,
             'account_move': False,
@@ -285,7 +283,6 @@ class pos_order(osv.osv):
             ('tax_excluded','Tax excluded')
         ], 'Price method', required=True),
         'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments',states={'draft': [('readonly', False)]},readonly=True),
-        'payments': fields.one2many('pos.payment', 'order_id', 'Order Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
         'state': fields.selection([('draft', 'Quotation'), ('payment', 'Payment'),
@@ -1046,6 +1043,7 @@ class pos_order_line(osv.osv):
                     tax_amount = 0.0
                     taxes = [t for t in line.product_id.taxes_id]
                     if line.qty == 0.0:
+                        res[line.id][f] = 0.0
                         continue
                     computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
                     for tax in computed_taxes:
@@ -1265,55 +1263,6 @@ class pos_order_line(osv.osv):
 
 pos_order_line()
 
-
-class pos_payment(osv.osv):
-    _name = 'pos.payment'
-    _description = 'Pos Payment'
-
-    def _journal_get(self, cr, uid, context=None):
-        obj = self.pool.get('account.journal')
-        ids = obj.search(cr, uid, [('type', '=', 'cash')])
-        res = obj.read(cr, uid, ids, ['id', 'name'], context)
-        res = [(r['id'], r['name']) for r in res]
-        return res
-
-    def _journal_default(self, cr, uid, context=None):
-        journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
-        if journal_list:
-            return journal_list[0]
-        else:
-            return False
-
-    _columns = {
-        'name': fields.char('Description', size=64),
-        'order_id': fields.many2one('pos.order', 'Order Ref', required=True, ondelete='cascade'),
-        'journal_id': fields.many2one('account.journal', "Journal", required=True),
-        'payment_id': fields.many2one('account.payment.term','Payment Term', select=True),
-        'payment_nb': fields.char('Piece Number', size=32),
-        'payment_name': fields.char('Payment Name', size=32),
-        'payment_date': fields.date('Payment Date', required=True),
-        'amount': fields.float('Amount', required=True),
-    }
-    _defaults = {
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.payment'),
-        'journal_id': _journal_default,
-        'payment_date':  lambda *a: time.strftime('%Y-%m-%d'),
-    }
-
-    def create(self, cr, user, vals, context=None):
-        if vals.get('journal_id') and vals.get('amount'):
-            return super(pos_payment, self).create(cr, user, vals, context)
-        return False
-
-    def write(self, cr, user, ids, values, context=None):
-        if 'amount' in values and not values['amount']:
-            return False
-        if 'journal_id' in values and not values['journal_id']:
-            return False
-        return super(pos_payment, self).write(cr, user, ids, values, context)
-
-pos_payment()
-
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index b079f6b9177..3e6a265b34e 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -9,7 +9,7 @@
             name="pos.invoice"
             auto="False"
             multi="True"
-            rml="account/report/invoice.rml"
+            rml="account/report/account_print_invoice.rml"
              />
 
         <report
diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/pos_sequence.xml
index 691b35a8f1a..399dccc634f 100644
--- a/addons/point_of_sale/pos_sequence.xml
+++ b/addons/point_of_sale/pos_sequence.xml
@@ -17,17 +17,6 @@
         <field name="padding">3</field>
     </record>
 
-    <record model="ir.sequence.type" id="seq_type_pos_payment">
-        <field name="name">POS Payment</field>
-        <field name="code">pos.payment</field>
-    </record>
-    <record model="ir.sequence" id="seq_pos_payment">
-        <field name="name">POS Payment</field>
-        <field name="code">pos.payment</field>
-        <field name="prefix">Payment/</field>
-        <field name="padding">2</field>
-    </record>
-
     <record model="ir.sequence.type" id="seq_type_pos_order_line">
         <field name="name">POS order line</field>
         <field name="code">pos.order.line</field>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 17420b1ffe9..7453682f566 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -706,7 +706,7 @@
         </record>
 
         <menuitem name="Configuration" parent="menu_point_root"
-            id="menu_point_config_product" sequence="25" groups="base.group_system"/>
+            id="menu_point_config_product" sequence="25" groups="base.group_system,group_pos_manager"/>
 
         <record model="ir.actions.act_window" id="action_product_input">
             <field name="name">Products</field>
@@ -732,7 +732,7 @@
                     parent="menu_point_config_product"
                     action="action_product_input"
                     id="products_for_input_operations"
-                    groups="base.group_system"/>
+                    groups="base.group_system,group_pos_manager"/>
 
         <record model="ir.actions.act_window" id="action_product_output">
             <field name="name">Products</field>
@@ -758,7 +758,7 @@
                     parent="menu_point_config_product"
                     action="action_product_output"
                     id="products_for_output_operations"
-                    groups="base.group_system"/>
+                    groups="base.group_system,group_pos_manager"/>
 
         <menuitem
             name="Input Operations" parent="menu_point_of_sale"
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a629929e204..d17eb2f33dc 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -78,10 +78,10 @@ class pos_details_summary(report_sxw.rml_parse):
 
         result = {}
         for obj in objects:
-            for payment in obj.payments:
-                if gift_journal_id and gift_journal_id == payment.journal_id.id:
+            for payment in obj.statement_ids:
+                if gift_journal_id and gift_journal_id == payment.statement_id.journal_id.id:
                     continue
-                result[payment.journal_id.name] = result.get(payment.journal_id.name, 0.0) + payment.amount
+                result[payment.statement_id.journal_id.name] = result.get(payment.statement_id.journal_id.name, 0.0) + payment.amount
         return result
 
     def _paid_total(self, objects):
diff --git a/addons/point_of_sale/report/pos_receipt_bis.rml b/addons/point_of_sale/report/pos_receipt_bis.rml
deleted file mode 100644
index ab8af5ca999..00000000000
--- a/addons/point_of_sale/report/pos_receipt_bis.rml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Receipt" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Dicount_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Amount">
-      <blockAlignment value="LEFT"/>
-          <blockValign value="TOP"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="Table_Discount_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_1" fontName="Helvetica-Bold" fontSize="9.0" leading="7" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8a" fontName="Helvetica" fontSize="7.0" leading="8.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9b" fontName="Helvetica" fontSize="8.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9b" fontName="Helvetica-Bold" fontSize="12.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right1" fontName="Helvetica-Bold" fontSize="9.0" leading="10.5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <para style="terp_default_8">[[ setLang(o.user_id.context_lang) ]]</para>
-    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
-    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
-    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
-    <para style="terp_default_Centre_9">Fax : [[ address and address.fax ]]</para>
-    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
-    <para style="terp_default_Centre_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Centre_9b">Operation N° : [[ o.name ]]</para>
-    <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="115.0,25.0,35.0" repeatRows="1" style="Tableau2">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(o.lines,'line') ]]</para>
-      <blockTable colWidths="115.0,25.0,35.0" style="Tableau3">
-        <tr>
-          <td>
-            <para style="terp_default_9b">[[ len(line.product_id.name) > 39 and line.product_id.name[:39] + '...' or line.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ '%.f' % line.qty ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % net(line.id) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="175.0" style="Table_Dicount_Total">
-      <tr>
-        <td>
-          <blockTable colWidths="97.0,78.0" style="Table_Total">
-            <tr>
-              <td>
-                <para style="terp_tblheader_Details">Discount : </para>
-              </td>
-              <td>
-                <para style="terp_default_Bold_9_Right">[[ not(disc(o.id)) and removeParentNode('blockTable') or disc(o.id) ]] [[ o.pricelist_id.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="97.0,78.0" style="Table_Discount_Total">
-            <tr>
-              <td>
-                <para style="terp_tblheader_Details">Total :</para>
-              </td>
-              <td>
-                <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-    <blockTable colWidths="97.0,78.0" style="Table_Amount">
-      <tr>
-        <td>
-          <para style="terp_default_2">[[ repeatIn(o.payments,'d') ]]</para>
-          <para style="terp_default_Bold_9_Right1">[[ d.name ]]:</para>
-          </td>
-        <td>
-          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
-        </td>
-      </tr>
-	</blockTable>
-
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index fb498336fb5..df0dfc877de 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -36,7 +36,7 @@
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
 	                         separator="1"
-	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
 	                         help="Cash Analysis created in last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index b149ebf3fb8..1ca4e9876ea 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -47,7 +47,7 @@
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
 	                         separator="1"
-	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
 	                         help="POS ordered created last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index d2bc03fd47f..70a98128c2a 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -3,13 +3,12 @@
 "access_pos_order","pos.order","model_pos_order","group_pos_user",1,1,1,1
 "access_pos_order_line","pos.order.line","model_pos_order_line","group_pos_user",1,1,1,1
 "access_pos_order_manager","pos.order manager","model_pos_order","group_pos_manager",1,0,0,0
-"access_pos_order_line_manager","pos.order.line manager","model_pos_order_line","group_pos_manager",1,1,1,1
-"access_pos_payment","pos.payment","model_pos_payment","group_pos_user",1,1,1,1
+"access_pos_order_line_manager","pos.order.line manager","model_pos_order_line","group_pos_manager",1,0,0,0
 "access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","group_pos_manager",1,1,1,1
 "access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","group_pos_manager",1,1,1,1
 "access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,1,1,0
 "access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","group_pos_user",1,0,0,0
-"access_account_move_pos_user","account.move pos_user","account.model_account_move","group_pos_user",1,0,0,0
+"access_account_move_pos_user","account.move pos_user","account.model_account_move","group_pos_user",1,1,1,0
 "access_account_account_pos_user","account.account pos_user","account.model_account_account","group_pos_user",1,0,0,0
 "access_stock_picking_pos_user","stock.picking pos_user","stock.model_stock_picking","group_pos_user",1,1,1,1
 "access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","group_pos_user",1,0,0,0
@@ -28,6 +27,12 @@
 "access_account_bank_statement_manager","account.bank.statement manager","account.model_account_bank_statement","group_pos_manager",1,1,1,1
 "access_account_bank_statement_system","account.bank.statement system","account.model_account_bank_statement","base.group_system",1,0,0,0
 "access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","group_pos_user",1,1,1,0
+"access_account_invoice_pos","account.invoice pos user","account.model_account_invoice","group_pos_user",1,1,1,0
+"access_account_invoice_pos_manager","account.invoice pos manager","account.model_account_invoice","group_pos_manager",1,0,0,0
+"access_account_invoice_line_pos","account.invoice.line pos user","account.model_account_invoice_line","group_pos_user",1,1,1,0
+"access_account_invoice_line_pos_manager","account.invoice.line pos manager","account.model_account_invoice_line","group_pos_manager",1,0,0,0
+"access_account_invoice_tax_pos","account.invoice.tax pos user","account.model_account_invoice_tax","group_pos_user",1,1,1,0
+"access_account_invoice_tax_pos_manager","account.invoice.tax pos manager","account.model_account_invoice_tax","group_pos_manager",1,0,0,0
 "access_account_period_pos","account.period pos user","account.model_account_period","group_pos_user",1,1,1,0
 "access_account_period_pos_manager","account.period pos manager","account.model_account_period","group_pos_manager",1,0,0,0
 "access_account_period_pos_system","account.period pos system","account.model_account_period","base.group_system",1,0,0,0
@@ -38,14 +43,16 @@
 "access_account_cashbox_line_manager","account.cashbox.line manager","account.model_account_cashbox_line","group_pos_manager",1,1,1,1
 "access_product_product","product.product","product.model_product_product","group_pos_user",1,0,0,0
 "access_product_template_pos_user","product.template pos user","product.model_product_template","group_pos_user",1,0,0,0
-"access_product_product_pos_manager","product.product.pos manager","product.model_product_product","group_pos_manager",1,0,0,0
-"access_product_template_pos_manager","product.template pos manager","product.model_product_template","group_pos_manager",1,0,0,0
+"access_product_product_pos_manager","product.product.pos manager","product.model_product_product","group_pos_manager",1,1,1,1
+"access_product_template_pos_manager","product.template pos manager","product.model_product_template","group_pos_manager",1,1,1,1
 "access_account_move_line","account.move.line","account.model_account_move_line","group_pos_user",1,1,1,0
 "access_account_move_line_manager","account.move.line manager","account.model_account_move_line","group_pos_manager",1,1,1,1
-"access_account_move","account.move","account.model_account_move","group_pos_user",1,1,1,0
+"access_account_move","account.move","account.model_account_move","group_pos_manager",1,0,0,0
 "access_account_journal","account.journal","account.model_account_journal","group_pos_user",1,1,1,0
 "access_account_journal_manager","account.journal manager","account.model_account_journal","group_pos_manager",1,0,0,0
 "access_account_journal_system","account.journal system","account.model_account_journal","base.group_system",1,0,0,0
+"access_account_journal_period_user","account.journal.period user","account.model_account_journal_period","group_pos_user",1,1,1,1
+"access_account_journal_period_manager","account.journal.period manager","account.model_account_journal_period","group_pos_manager",1,0,0,0
 "access_account_journal_view","account.journal.view","account.model_account_journal_view","group_pos_user",1,1,1,0
 "access_account_journal_view_manager","account.journal.view manager","account.model_account_journal_view","group_pos_manager",1,0,0,0
 "access_account_journal_view_system","account.journal.view system","account.model_account_journal_view","base.group_system",1,0,0,0
@@ -57,15 +64,14 @@
 "access_report_check_register","report.cash.register","model_report_cash_register","group_pos_manager",1,1,1,1
 "access_product_product_pos","product.product.pos","product.model_product_product","base.group_system",1,0,0,0
 "access_product_template_pos","product.template pos","product.model_product_template","base.group_system",1,1,1,1
+"access_ir_property_pos_manager","ir.property manager","base.model_ir_property","group_pos_manager",1,1,1,1
 "access_pos_order_system","pos.order system","model_pos_order","base.group_system",1,0,0,0
 "access_pos_order_line_system","pos.order.line system","model_pos_order_line","base.group_system",1,0,0,0
 "access_account_bank_statement_line_manager","account.bank.statement.line manager","account.model_account_bank_statement_line","group_pos_manager",1,1,1,1
 "access_account_invoice_manager","account.invoice manager","account.model_account_invoice","group_pos_manager",1,1,1,1
-"access_pos_payment_manager","pos.payment manager","model_pos_payment","group_pos_manager",1,0,0,0
 "access_report_transaction_pos_system","report.transaction.pos system","model_report_transaction_pos","base.group_system",1,1,1,1
 "access_account_bank_statement_line_system","account.bank.statement.line system","account.model_account_bank_statement_line","base.group_system",1,0,0,0
 "access_product_product_supplierinfo","product.supplierinfo system","product.model_product_supplierinfo","base.group_system",1,0,0,0
-"access_pos_payment_system","pos.payment system","model_pos_payment","base.group_system",1,0,0,0
 "access_product_product_supplierinfo_manager","product.supplierinfo manager","product.model_product_supplierinfo","group_pos_manager",1,0,0,0
 "access_product_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","group_pos_user",1,0,0,0
 "access_product_product_packaging_system","product.packaging system","product.model_product_packaging","base.group_system",1,0,0,0
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index d70fd1caa85..6163d65a36f 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -8,6 +8,13 @@
     <record id="group_pos_user" model="res.groups">
         <field name="name">Point of Sale / User</field>
     </record>
+    
+    <record model="ir.rule" id="pos_cash_statement_rule">
+        <field name="name">Registers</field>
+        <field name="model_id" search="[('model','=','account.bank.statement')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">[('user_id','!=',['base.user_root'])]</field>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 4b975b820cb..96187d78ce2 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -123,7 +123,7 @@ class pos_return(osv.osv_memory):
                    <button icon='gtk-cancel' special="cancel"
                                string="Cancel" />
                                    <button icon='gtk-ok' name= "create_returns"
-                       string="Return with Echange" type="object"/>
+                       string="Return with Exchange" type="object"/>
                                    <button icon='gtk-ok' name="create_returns2"
                         string="Refund Without Exchange" type="object"/>
                 </form>"""
@@ -209,7 +209,8 @@ class pos_return(osv.osv_memory):
                             'date': date_cur,
                             'date_planned': date_cur
                         })
-                        line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
+                        if qty != 0.0:
+                            line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
                 statementl_obj.create(cr, uid, {
                                                 'name': 'Refund %s'%order_id.name,
                                                 'statement_id': order_id.statement_ids[0].statement_id.id,
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e1b9b5af40b..3842ac5ebd3 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -439,7 +439,7 @@ class procurement_order(osv.osv):
             wf_service.trg_trigger(uid, 'procurement.order', id, cr)
         return True
 
-    def action_check_finnished(self, cr, uid, ids):
+    def action_check_finished(self, cr, uid, ids):
         return self.check_move_done(cr, uid, ids)
 
     def action_check(self, cr, uid, ids):
@@ -492,9 +492,9 @@ procurement_order()
 class StockPicking(osv.osv):
     _inherit = 'stock.picking'
 
-    def test_finnished(self, cursor, user, ids):
+    def test_finished(self, cursor, user, ids):
         wf_service = netsvc.LocalService("workflow")
-        res = super(StockPicking, self).test_finnished(cursor, user, ids)
+        res = super(StockPicking, self).test_finished(cursor, user, ids)
         for picking in self.browse(cursor, user, ids):
             for move in picking.move_lines:
                 if move.state == 'done' and move.procurements:
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index ff4325e248f..b4bcd1e1f04 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -187,7 +187,7 @@
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
-            <field name="condition">action_check_finnished()</field>
+            <field name="condition">action_check_finished()</field>
 			<field name="trigger_model">stock.move</field>
             <field name="trigger_expr_id">[move_id.id]</field>            
         </record>
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 0c6de9312c2..93c0e42fae2 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -35,12 +35,6 @@
 
         <workflow model="purchase.order" ref="test_purchase_1" action="purchase_confirm" />
 
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now confirmed">
-            <test expr="state">confirmed</test>
-        </assert>
-
-        <workflow model="purchase.order" ref="test_purchase_1" action="purchase_approve" uid="base.user_root" />
-
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now in progress">
             <test expr="state">approved</test>
         </assert>
diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml
index 4f28ccfafcf..2afd6c2fb62 100644
--- a/addons/purchase/test/procurement_buy.yml
+++ b/addons/purchase/test/procurement_buy.yml
@@ -76,7 +76,6 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr)  
-    wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_approve', cr)  
 -   
   I receive the order of the supplier ASUStek from the Incoming Shipments menu.
 -   
diff --git a/addons/purchase/test/purchase_from_manual.yml b/addons/purchase/test/purchase_from_manual.yml
index e7a608b7557..0c406635b85 100644
--- a/addons/purchase/test/purchase_from_manual.yml
+++ b/addons/purchase/test/purchase_from_manual.yml
@@ -56,7 +56,7 @@
   I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po1}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po1}
 -
   I check that the order which was initially in the confirmed state has transit to approved state.
 -
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
index a13c687c4a5..8c14611661c 100644
--- a/addons/purchase/test/purchase_from_order.yml
+++ b/addons/purchase/test/purchase_from_order.yml
@@ -56,7 +56,7 @@
   I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po0}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po0}
 -
   I check that the order which was initially in the confirmed state has transit to approved state.
 -
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index 6250772a872..d0c1cbcb527 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -56,7 +56,7 @@
  I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po2}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po2}
 -
  I check that the order which was initially in the confirmed state has transit to approved state.
 -
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 2c61e55c4e4..3351c265e3d 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -251,7 +251,7 @@
         </record>
 
         <record id="process_transition_action_validate0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;test_finnished&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;test_finished&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Validate&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_deliver0"/>
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 057e8469431..597def2c6aa 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-import decimal_precision as dp
 import time
 
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ae0f712f6b5..966564afb78 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -767,7 +767,7 @@ class stock_picking(osv.osv):
         self.log_picking(cr, uid, ids, context=context)
         return True
 
-    def test_finnished(self, cr, uid, ids):
+    def test_finished(self, cr, uid, ids):
         """ Tests whether the move is in done or cancel state or not.
         @return: True or False
         """
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 3254f7b6984..2a682833a1c 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -86,12 +86,12 @@
         <record id="trans_move_done" model="workflow.transition">
             <field name="act_from" ref="act_move"/>
             <field name="act_to" ref="act_done"/>
-            <field name="condition">test_finnished()</field>
+            <field name="condition">test_finished()</field>
         </record>
         <record id="trans_move_confirmed" model="workflow.transition">
             <field name="act_from" ref="act_move"/>
             <field name="act_to" ref="act_confirmed"/>
-            <field name="condition">not test_finnished()</field>
+            <field name="condition">not test_finished()</field>
         </record>
         <record id="trans_assigned_cancel" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>