From ecbc6996e7428c7f570cb3c06ef5ee85bdd05965 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 22 Feb 2012 18:36:38 +0530
Subject: [PATCH 001/126] [IMP]hr_holidays: Improved  button name and state and
 redonly in confirm and draft

bzr revid: mma@tinyerp.com-20120222130638-buhl4qhdto4gpm3j
---
 addons/hr_holidays/hr_holidays.py       | 18 +++++++++---------
 addons/hr_holidays/hr_holidays_view.xml | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 3bb7a8e4982..3dc8ae0467c 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -111,25 +111,25 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name': fields.char('Description', required=True, size=64),
-        'state': fields.selection([('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
-            ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
+        'state': fields.selection([('draft', 'New'), ('confirm', 'To Approve'), ('refuse', 'Refused'),
+            ('validate1', 'Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
             'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
             \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\
             \nThe state is \'Refused\', when holiday request is refused by manager.\
             \nThe state is \'Approved\', when holiday request is approved by manager.'),
         'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True),
-        'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}, select=True),
-        'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
-        'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
-        'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
+        'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True),
+        'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
         #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
-        'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)]}),
-        'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
+        'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'case_id': fields.many2one('crm.meeting', 'Meeting'),
-        'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
+        'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 22d4d6e567d..302ca4fe6ee 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -65,9 +65,9 @@
                 <form string="Leave Request">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_manager"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft'), ('state','!=','confirm')]}" width="130" string="Mode" groups="base.group_hr_manager"/>
                     <group attrs="{'invisible':[('holiday_type','=','employee')]}">
-                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
+                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
                         </group>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
@@ -89,11 +89,11 @@
                             <newline/>
                             <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
                             <group colspan="2" col="6">
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                                <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                             </group>
                         </page>
                     </notebook>
@@ -132,11 +132,11 @@
                         <newline/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
                         <group colspan="2" col="6">
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
-                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                            <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
+                            <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>
@@ -187,10 +187,10 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
                                 <button string="Refuse" name="refuse" states="confirm,validate,draft" type="workflow" icon="gtk-no"/>
-                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                                <button string="Reset to New" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
                     </notebook>
@@ -217,7 +217,7 @@
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state"/>
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                 </tree>

From cea795484d19f8a1fbd30271bfa5947a42d4101b Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 23 Feb 2012 11:13:05 +0530
Subject: [PATCH 002/126] [IMP]hr_evaluation: Addded Button in form and list
 view of interview question and set a position of button

bzr revid: mma@tinyerp.com-20120223054305-glcfp97hno82q8rs
---
 addons/hr_evaluation/hr_evaluation_view.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e5107c7b720..a0ac133d495 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -201,8 +201,6 @@
                     <newline/>
                     <group col="8" colspan="4">
                         <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
-                        <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
-                                icon="gtk-cancel"/>
                         <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"
                                 icon="gtk-execute"/>
                         <button name="button_done" string="Done" states="progress" type="object"
@@ -211,6 +209,8 @@
                                 icon="terp-stock_effects-object-colorize"/>
                         <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"
                                 icon="gtk-go-forward"/>
+                        <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
+                                icon="gtk-cancel"/>
                     </group>
               </form>
             </field>
@@ -316,7 +316,11 @@
                     <newline/>
                     <separator string="State" colspan="4"/>
                     <group colspan="4" col="6">
-                         <field name="state"/>
+                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
+                                <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
+                                <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                                <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
+                                <button string="Reset to Draft" name="survey_req_draft" states="done" type="object" icon="terp-stock_effects-object-colorize" />
                     </group>
                 </form>
             </field>
@@ -338,6 +342,8 @@
                     <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" colspan="2" states="waiting_answer"/>
                     <field name="state"/>
+                    <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
+                    <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
                 </tree>
             </field>
         </record>

From fc28796980955b346e3f8deed09350647b6e827f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 23 Feb 2012 18:42:52 +0530
Subject: [PATCH 003/126] [IMP] account, account_voucher : Improvedworkflow
 state name, button name and also the position.

bzr revid: mdi@tinyerp.com-20120223131252-b3x0zsbpczkadurz
---
 addons/account/account_invoice.py                       | 2 +-
 addons/account/account_invoice_view.xml                 | 4 ++--
 addons/account_voucher/account_voucher_pay_invoice.xml  | 2 +-
 addons/account_voucher/account_voucher_view.xml         | 2 +-
 addons/account_voucher/voucher_payment_receipt_view.xml | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 5e5ac5f482b..63191795ea3 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -202,7 +202,7 @@ class account_invoice(osv.osv):
             ('draft','Draft'),
             ('proforma','Pro-forma'),
             ('proforma2','Pro-forma'),
-            ('open','Open'),
+            ('open','Validate'),
             ('paid','Paid'),
             ('cancel','Cancelled')
             ],'State', select=True, readonly=True,
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 59977c252f9..ccaa033bea3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -207,11 +207,11 @@
                                 <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="terp-camera_test"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 345241cb4ee..7a6aad55516 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -19,7 +19,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <button name="invoice_open" position="after">
-                    <button name="invoice_pay_customer" type="object" string="Pay Invoice" states="open" icon="gtk-go-forward"/>
+                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" icon="gtk-go-forward"/>
                 </button>
             </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 53fdaef8c1f..c0061f15cd3 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -103,9 +103,9 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 1a8d3680f5f..e7c9f4f4616 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -251,10 +251,10 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
+                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
                     </group>
                 </form>
             </field>

From 71e4d0a81ec28c8545ddc07a398e4aff5a0abcad Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 24 Feb 2012 11:23:51 +0530
Subject: [PATCH 004/126] [IMP]hr_evaluation: Addded Button in search view
 which display next month deadline record of draft state

bzr revid: mma@tinyerp.com-20120224055351-jse9ui8rr72lr321
---
 addons/hr_evaluation/hr_evaluation_view.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index a0ac133d495..8a2aebcacdc 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -259,6 +259,9 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
+                    <filter icon="terp-go-month" name="next_month" string=" Month+1" 
+                         domain="[('date','&lt;=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]"
+                         help="Appraisal during next month"/>
                     <separator orientation="vertical"/>
                     <field name="employee_id" />
                     <field name="plan_id" widget="selection" />
@@ -282,6 +285,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
+             <field name="context">{"search_default_next_month":1}</field>
             <field name="help">Each employee may be assigned an Appraisal Plan. Such a plan defines the frequency and the way you manage your periodic personnel evaluation. You will be able to define steps and attach interviews to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager.</field>
         </record>
 

From 16afc71f02b352f1c2ae817cf33c3ddb6c4558ae Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 27 Feb 2012 14:12:25 +0530
Subject: [PATCH 005/126] [IMP]hr_evaluation: Removed print & set to draft
 button, Removed progress bar field, give access right, hide a group and
 notebook and removed a demo data

bzr revid: mma@tinyerp.com-20120227084225-8buhhzz5lg7zftv4
---
 addons/hr_evaluation/hr_evaluation.py         |  6 ---
 addons/hr_evaluation/hr_evaluation_data.xml   | 43 +------------------
 addons/hr_evaluation/hr_evaluation_view.xml   | 12 ++----
 .../report/hr_evaluation_report.py            |  3 --
 .../report/hr_evaluation_report_view.xml      |  1 -
 .../security/ir.model.access.csv              |  2 +-
 6 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 6e1983d7a11..27b36341284 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -167,7 +167,6 @@ class hr_evaluation(osv.osv):
             ('cancel','Cancelled'),
         ], 'State', required=True, readonly=True),
         'date_close': fields.date('Ending Date', select=True),
-        'progress': fields.float("Progress"),
     }
     _defaults = {
         'date': lambda *a: (parser.parse(datetime.now().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'),
@@ -245,7 +244,6 @@ class hr_evaluation(osv.osv):
         return True
 
     def button_done(self,cr, uid, ids, context=None):
-        self.write(cr, uid, ids,{'progress': 1 * 100}, context=context)
         self.write(cr, uid, ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
         return True
 
@@ -312,7 +310,6 @@ class hr_evaluation_interview(osv.osv):
         for id in self.browse(cr, uid, ids, context=context):
             flag = False
             wating_id = 0
-            tot_done_req = 1
             if not id.evaluation_id.id:
                 raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Appraisal."))
             records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id], context=context)[0].survey_request_ids
@@ -322,11 +319,8 @@ class hr_evaluation_interview(osv.osv):
                     continue
                 if child.state != "done":
                     flag = True
-                else:
-                    tot_done_req += 1
             if not flag and wating_id:
                 self.survey_req_waiting_answer(cr, uid, [wating_id], context=context)
-            hr_eval_obj.write(cr, uid, [id.evaluation_id.id], {'progress': tot_done_req * 100 / len(records)}, context=context)
         self.write(cr, uid, ids, { 'state': 'done'}, context=context)
         return True
 
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index ec4b46f8a62..bf482d2fcd7 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <record id="survey_2" model="survey">
-            <field name="title">Employee Appraisal</field>
+            <field name="title">Self Appraisal</field>
             <field name="max_response_limit">20</field>
             <field eval="[(6,0,[])]" name="users"/>
             <field name="type" ref="survey.survey_type1"/>
@@ -1157,37 +1157,11 @@ Once the form had been filled, the employee send it to his supervisor.
     </data>
 
     <data noupdate="1">
-        <record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Send to Subordinates</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="1" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">bottom-up</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="0" name="wait"/>
-        </record>
-        <record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Send to Managers</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="2" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">top-down</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="0" name="wait"/>
-        </record>
         <record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
             <field name="name">Send to Employee</field>
             <field eval="0" name="send_anonymous_manager"/>
-            <field eval="3" name="sequence"/>
+            <field eval="1" name="sequence"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="action">self</field>
             <field eval="0" name="send_anonymous_employee"/>
@@ -1196,19 +1170,6 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="0" name="send_answer_manager"/>
             <field eval="0" name="wait"/>
         </record>
-        <record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="name">Final Interview With Manager</field>
-            <field eval="0" name="send_anonymous_manager"/>
-            <field eval="4" name="sequence"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="action">final</field>
-            <field eval="0" name="send_anonymous_employee"/>
-            <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field eval="0" name="send_answer_manager"/>
-            <field eval="1" name="wait"/>
-        </record>
     </data>
 
     <data noupdate="1">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 8a2aebcacdc..e1dd5e0b96f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -160,15 +160,14 @@
                         <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="plan_id"/>
                         <field name="date"/>
-                        <field name="progress" widget="progressbar"/>
                     </group>
-                    <group col="2" colspan="1">
+                    <group col="2" colspan="1" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                         <separator string="Ending Summary" colspan="2"/>
                         <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')],'required':[('state','=','progress')]}"/>
                         <field name="date_close" readonly="1"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Appraisal">
+                        <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
                             <field name="survey_request_ids" nolabel="1" colspan="4" widget="one2many">
                                 <form string="Interview Appraisal">
                                     <group col="4" colspan="4">
@@ -190,11 +189,11 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Internal Notes">
+                        <page string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
                             <field name="note_action" colspan="4" nolabel="1"
                                 groups="base.group_hr_manager"/>
                         </page>
-                        <page string="Public Notes">
+                        <page string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
                             <field name="note_summary" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
@@ -303,7 +302,6 @@
                         <field name="evaluation_id"/>
                         <group col="2" colspan="2">
                             <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                         </group>
                         <field name="date_deadline"/>
                         <field name="response" readonly="1"/>
@@ -324,7 +322,6 @@
                                 <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
                                 <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
                                 <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
-                                <button string="Reset to Draft" name="survey_req_draft" states="done" type="object" icon="terp-stock_effects-object-colorize" />
                     </group>
                 </form>
             </field>
@@ -342,7 +339,6 @@
                     <field name="user_to_review_id"/>
                     <field name="response" readonly="1" invisible="True"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
                     <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" colspan="2" states="waiting_answer"/>
                     <field name="state"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index bd9e5874d10..8e931b9f041 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -31,7 +31,6 @@ class hr_evaluation_report(osv.osv):
         'create_date': fields.date('Create Date', readonly=True),
         'delay_date':fields.float('Delay to Start', digits=(16,2),readonly=True),
         'overpass_delay':fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
-        'progress_bar' : fields.float("Progress"),
         'day': fields.char('Day', size=128, readonly=True),
         'deadline': fields.date("Deadline", readonly=True),
         'request_id': fields.many2one('survey.request', 'Request_id', readonly=True),
@@ -77,7 +76,6 @@ class hr_evaluation_report(osv.osv):
                      to_char(s.create_date, 'MM') as month,
                      count(l.*) as nbr,
                      s.state,
-                     s.progress as progress_bar,
                      avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(3600*24) as  delay_date,
                      avg(extract('epoch' from age(s.date,CURRENT_DATE)))/(3600*24) as overpass_delay
                      from
@@ -96,7 +94,6 @@ class hr_evaluation_report(osv.osv):
                      s.date_close,
                      l.request_id,
                      s.rating,
-                     s.progress,
                      s.plan_id
             )
         """)
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index c70c1d27923..2950d704e89 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -20,7 +20,6 @@
                 <field name="rating" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Requests"/>
-                <field name="progress_bar" widget="progressbar"/>
                 <field name="delay_date"/>
                 <field name="overpass_delay"/>
             </tree>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index e3a79b55a45..f9b8897eb01 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -25,7 +25,7 @@ access_survey_page_hr_user,survey.page.hr.user,survey.model_survey_page,base.gro
 access_survey_response_hr_user,survey.response.hr.user,survey.model_survey_response,base.group_hr_user,1,1,1,0
 access_survey_history_hr_user,survey.history.hr.user,survey.model_survey_history,base.group_hr_user,1,1,1,0
 access_survey_request_hr_user,survey.request.hr.user,survey.model_survey_request,base.group_hr_user,1,1,1,0
-access_survey_question_column_heading_hr_user,survey.question.column.heading.hr.user,survey.model_survey_question_column_heading,base.group_hr_user,1,0,0,0
+access_survey_question_column_heading_hr_user,survey.question.column.heading.hr.user,survey.model_survey_question_column_heading,base.group_hr_user,1,1,1,0
 access_survey_response_line_hr_user,survey.response.line.hr.user,survey.model_survey_response_line,base.group_hr_user,1,1,1,0
 access_survey_tbl_column_heading_hr_user,survey.tbl.column.heading.hr.user,survey.model_survey_tbl_column_heading,base.group_hr_user,1,1,1,0
 access_base_calendar_attendee_survey_user,base.calendar.calendar.attendee.survey.user,base_calendar.model_calendar_attendee,base.group_survey_user,1,1,1,0

From a57180173fecfe6c24965da6dcdf58258c06f0c2 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 27 Feb 2012 14:23:07 +0530
Subject: [PATCH 006/126] [IMP]hr_holidays: Set a unconfirmed instead of new.

bzr revid: mma@tinyerp.com-20120227085307-yxthcol3lwegltgz
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 3dc8ae0467c..287558e5280 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -111,7 +111,7 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name': fields.char('Description', required=True, size=64),
-        'state': fields.selection([('draft', 'New'), ('confirm', 'To Approve'), ('refuse', 'Refused'),
+        'state': fields.selection([('draft', 'Unconfirmed'), ('confirm', 'To Approve'), ('refuse', 'Refused'),
             ('validate1', 'Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
             'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
             \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\

From 7f74731083ea8e3f6fbcec5aa7d3edef5803b1d7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 27 Feb 2012 18:45:57 +0530
Subject: [PATCH 007/126] [IMP]purchase: Fix Error of email template, added
 send button in workflow, change some state label name and its button position

bzr revid: mma@tinyerp.com-20120227131557-dl1ut04uypafpzwf
---
 addons/email_template/email_template.py |  2 ++
 addons/purchase/purchase.py             | 23 +++++++++++++++++++++--
 addons/purchase/purchase_view.xml       | 13 +++++++------
 addons/purchase/purchase_workflow.xml   | 22 ++++++++++++++++++++++
 4 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6c1571c5630..a6a2f9f2c82 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -56,6 +56,8 @@ class email_template(osv.osv):
            :param str model: model name of the document record this mail is related to.
            :param int res_id: id of the document record this mail is related to.
         """
+        if context is None:
+            context = {}
         if not template: return u""
         try:
             template = tools.ustr(template)
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 3d909c1085e..d342b7b1169 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -142,10 +142,11 @@ class purchase_order(osv.osv):
         return res
 
     STATE_SELECTION = [
-        ('draft', 'Request for Quotation'),
+        ('draft', 'Draft PO'),
         ('wait', 'Waiting'),
+        ('send', 'RFQ Sent'),
         ('confirmed', 'Waiting Approval'),
-        ('approved', 'Approved'),
+        ('approved', 'Purchase Order'),
         ('except_picking', 'Shipping Exception'),
         ('except_invoice', 'Invoice Exception'),
         ('done', 'Done'),
@@ -277,6 +278,24 @@ class purchase_order(osv.osv):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
 
+    def wkf_send_rfq(self, cr, uid, ids, context=None):
+        
+        mod_obj = self.pool.get('ir.model.data')
+        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'purchase.order')])
+        model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','email_compose_message_wizard_form')])
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+        self.write(cr, uid, ids, {'state' : 'send'})
+
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(resource_id,'form')],
+            'view_id': resource_id,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': {'active_model': 'purchase.order', 'mail.compose.message.mode':'mass_mail', 'mail.compose.template_id' :template_id},
+        }
     #TODO: implement messages system
     def wkf_confirm_order(self, cr, uid, ids, context=None):
         todo = []
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1c936055aff..ccdc9858125 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -194,17 +194,18 @@
                                 <field name="amount_total" sum="Total amount"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
-                            <group col="11" colspan="4">
+                            <group col="12" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
-                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
+                                <button name="send_rfq" states="draft" string="Send" icon="terp-mail-message-new"/>
+                                <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
-                                <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
+                                <button name="purchase_confirm" states="draft,send" string="Confirm Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                                <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
+                                <button name="purchase_approve" states="confirmed" string="Approve Order" icon="gtk-go-forward"/>
                                 <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+                                <button name="action_cancel_draft" states="cancel,send,confirmed" string="Set to Draft" type="object" icon="gtk-convert"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth,send" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoicing" groups="base.group_extended">
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index c978712c0a1..a7d67dd87a1 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -13,6 +13,12 @@
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
+        <record id="act_send" model="workflow.activity">
+            <field name="wkf_id" ref="purchase_order"/>
+            <field name="name">send</field>
+            <field name="kind">function</field>
+            <field name="action">wkf_send_rfq()</field>
+        </record>
         <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">confirmed</field>
@@ -90,6 +96,22 @@
             <field name="act_to" ref="act_confirmed"/>
             <field name="signal">purchase_confirm</field>
         </record>
+         <record id="trans_draft_send" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_send"/>
+            <field name="signal">send_rfq</field>
+        </record>
+        <record id="trans_send_confirmed" model="workflow.transition">
+            <field name="act_from" ref="act_send"/>
+            <field name="act_to" ref="act_confirmed"/>
+            <field name="signal">purchase_confirm</field>
+        </record>
+        <record id="trans_send_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_send"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">purchase_cancel</field>
+        </record>
+        
         <record id="trans_confirmed_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_cancel"/>

From 3e9fbd83ca03bc76ba62ca9a2fc3cc4888152ccc Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 28 Feb 2012 17:29:49 +0530
Subject: [PATCH 008/126] [IMP]purchase: Added a button receive invoice &
 receive product, improve view and related code, change label done to paid

bzr revid: mma@tinyerp.com-20120228115949-03tbq9mqcr0bwrt2
---
 addons/purchase/purchase.py       | 63 +++++++++++++++++++++++++++----
 addons/purchase/purchase_view.xml |  7 ++--
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d342b7b1169..b3bd23b392d 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -149,7 +149,7 @@ class purchase_order(osv.osv):
         ('approved', 'Purchase Order'),
         ('except_picking', 'Shipping Exception'),
         ('except_invoice', 'Invoice Exception'),
-        ('done', 'Done'),
+        ('done', 'Paid'),
         ('cancel', 'Cancelled')
     ]
 
@@ -274,28 +274,77 @@ class purchase_order(osv.osv):
         fiscal_position = supplier.property_account_position and supplier.property_account_position.id or False
         return {'value':{'partner_address_id': supplier_address['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
 
+    def view_invoice(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        inv_ids = []
+        for po in self.browse(cr, uid, ids, context=context):
+            if po.invoice_method == 'manual':
+                if not po.invoice_ids:
+                    raise osv.except_osv(_('Warring !'),
+                                         _('You have configure Invoice Control is: "%s", You must first Create all invoices related to this purchase order: "%s"') % (self._columns['invoice_method'].selection[0][1], po.name))
+            inv_ids+= [invoice.id for invoice in po.invoice_ids]
+
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
+        res_id = res and res[1] or False
+
+        return {
+            'name': _('Supplier Invoices'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': [res_id],
+            'res_model': 'account.invoice',
+            'context': "{'type':'in_invoice', 'journal_type': 'purchase'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'res_id': inv_ids and inv_ids[0] or False,
+        }
+
+    def view_picking(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        pick_ids = []
+        for po in self.browse(cr, uid, ids, context=context):
+            pick_ids += [picking.id for picking in po.picking_ids]
+
+        res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+        res_id = res and res[1] or False
+
+        return {
+            'name': _('Receptions'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': [res_id],
+            'res_model': 'stock.picking',
+            'context': "{'contact_display': 'partner'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'res_id': pick_ids and pick_ids[0] or False,
+        }
+
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
 
     def wkf_send_rfq(self, cr, uid, ids, context=None):
-        
         mod_obj = self.pool.get('ir.model.data')
         template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'purchase.order')])
-        model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','email_compose_message_wizard_form')])
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
         self.write(cr, uid, ids, {'state' : 'send'})
 
+        res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
+        res_id = res and res[1] or False
+
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'mail.compose.message',
-            'views': [(resource_id,'form')],
-            'view_id': resource_id,
+            'views': [(res_id,'form')],
+            'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context': {'active_model': 'purchase.order', 'mail.compose.message.mode':'mass_mail', 'mail.compose.template_id' :template_id},
+            'context': {'active_model': 'purchase.order','mail.compose.template_id' :template_id},
         }
+
     #TODO: implement messages system
     def wkf_confirm_order(self, cr, uid, ids, context=None):
         todo = []
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ccdc9858125..be0b8d17eed 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -194,16 +194,17 @@
                                 <field name="amount_total" sum="Total amount"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
-                            <group col="12" colspan="4">
+                            <group col="16" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                                 <button name="send_rfq" states="draft" string="Send" icon="terp-mail-message-new"/>
-                                <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="purchase_confirm" states="draft,send" string="Confirm Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approve Order" icon="gtk-go-forward"/>
-                                <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+                                <button name="view_invoice" string="Receive Invoice" icon="gtk-go-forward" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'),('state','!=', 'approved') ]}" />
+                                <button name="view_picking" states="approved" string="Receive Product" icon="gtk-go-forward" type="object"/>
                                 <button name="action_cancel_draft" states="cancel,send,confirmed" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth,send" string="Cancel" icon="gtk-cancel"/>
                             </group>

From 06b32aedf47be98eb803c85211f49116110ec20e Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Feb 2012 11:39:31 +0530
Subject: [PATCH 009/126] [IMP]purchase: Improve warning message and set a
 button attrs

bzr revid: mma@tinyerp.com-20120229060931-gsgg20m9mut5p10y
---
 addons/purchase/purchase.py       | 4 ++--
 addons/purchase/purchase_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b3bd23b392d..1ac38b05001 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -280,8 +280,8 @@ class purchase_order(osv.osv):
         for po in self.browse(cr, uid, ids, context=context):
             if po.invoice_method == 'manual':
                 if not po.invoice_ids:
-                    raise osv.except_osv(_('Warring !'),
-                                         _('You have configure Invoice Control is: "%s", You must first Create all invoices related to this purchase order: "%s"') % (self._columns['invoice_method'].selection[0][1], po.name))
+                    raise osv.except_osv(_('warning !'),
+                                         _('Your Invoicing Control is based on order lines, so please create invoice from Purchase order lines.'))
             inv_ids+= [invoice.id for invoice in po.invoice_ids]
 
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index be0b8d17eed..6090bca78df 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -203,8 +203,8 @@
                                 <button name="purchase_confirm" states="draft,send" string="Confirm Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approve Order" icon="gtk-go-forward"/>
-                                <button name="view_invoice" string="Receive Invoice" icon="gtk-go-forward" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'),('state','!=', 'approved') ]}" />
-                                <button name="view_picking" states="approved" string="Receive Product" icon="gtk-go-forward" type="object"/>
+                                <button name="view_invoice" string="Receive Invoice" icon="gtk-go-forward" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
+                                <button name="view_picking" string="Receive Product" icon="gtk-go-forward" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
                                 <button name="action_cancel_draft" states="cancel,send,confirmed" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth,send" string="Cancel" icon="gtk-cancel"/>
                             </group>

From 66eba554e45fd6797fdef07311bb44578f571209 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Feb 2012 11:43:32 +0530
Subject: [PATCH 010/126] [IMP]purchase:Added a Print Button in New state

bzr revid: mma@tinyerp.com-20120229061332-gagzxe9tf5pywhju
---
 addons/purchase/purchase.py       | 18 ++++++++++++++++++
 addons/purchase/purchase_view.xml |  1 +
 2 files changed, 19 insertions(+)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1ac38b05001..f3ec32f2208 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -322,6 +322,24 @@ class purchase_order(osv.osv):
             'res_id': pick_ids and pick_ids[0] or False,
         }
 
+    def view_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        self.write(cr, uid, ids, {'state' : 'send'})
+        
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        datas = {
+             'ids': [],
+             'model': 'purchase.order',
+             'form': data
+        }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'purchase.quotation',
+            'nodestroy': True,
+            'datas': datas,
+        }
+
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 6090bca78df..2a17c9bc58d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -197,6 +197,7 @@
                             <group col="16" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                                 <button name="send_rfq" states="draft" string="Send" icon="terp-mail-message-new"/>
+                                <button name="view_report" string="Print" states="draft" type="object" icon="gtk-print"/>
                                 <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>

From 5f50bd32e7cf7b87f769ded93bf69bce6ebf6dac Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Feb 2012 11:49:13 +0530
Subject: [PATCH 011/126] [IMP]purchase:Improve code state change by workflow

bzr revid: mma@tinyerp.com-20120229061913-oj8djiwaps5mdi1r
---
 addons/purchase/purchase.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f3ec32f2208..793d7e76fb1 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -323,9 +323,11 @@ class purchase_order(osv.osv):
         }
 
     def view_report(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
         if context is None:
             context = {}
-        self.write(cr, uid, ids, {'state' : 'send'})
+        for id in ids:
+            wf_service.trg_validate(uid, 'purchase.order', id, 'send_rfq', cr)
         
         data = self.read(cr, uid, ids, [], context=context)[0]
         datas = {

From 8082c6e4a3a41111c27d6362e7278b1d026fce2a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 29 Feb 2012 12:17:05 +0530
Subject: [PATCH 012/126] [IMP] account, account_voucher : Improved workflow
 state name, button name and also the position,Open payment in new window (and
 close voucher when paid), added 'sent' state and its related changes.

bzr revid: mdi@tinyerp.com-20120229064705-x1j7ll1yst2ez5mf
---
 addons/account/account_invoice.py             | 24 +++++++++++++-
 addons/account/account_invoice_view.xml       | 13 ++++----
 addons/account/account_invoice_workflow.xml   | 32 ++++++++++++++++++-
 addons/account_voucher/account_voucher.py     |  2 +-
 .../account_voucher_pay_invoice.xml           |  2 +-
 addons/account_voucher/invoice.py             |  2 +-
 .../voucher_payment_receipt_view.xml          |  2 +-
 addons/email_template/email_template.py       |  2 ++
 8 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 5e5ac5f482b..98379f67240 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -202,7 +202,8 @@ class account_invoice(osv.osv):
             ('draft','Draft'),
             ('proforma','Pro-forma'),
             ('proforma2','Pro-forma'),
-            ('open','Open'),
+            ('open','Validated'),
+            ('sent','Sent'),
             ('paid','Paid'),
             ('cancel','Cancelled')
             ],'State', select=True, readonly=True,
@@ -370,6 +371,27 @@ class account_invoice(osv.osv):
                      _('There is no Accounting Journal of type Sale/Purchase defined!'))
             else:
                 raise orm.except_orm(_('Unknown Error'), str(e))
+            
+    def invoice_sent(self, cr, uid, ids, *args):
+        email_template_obj = self.pool.get('email.template')
+        mod_obj = self.pool.get('ir.model.data')
+
+        template_id = email_template_obj.search(cr, uid, [('name', '=', 'Automated Invoice Notification Mail')])[0]
+        template = email_template_obj.browse(cr, uid, template_id)
+        model_data_id = mod_obj._get_id(cr, uid, 'mail', 'email_compose_message_wizard_form')
+        res_id = mod_obj.browse(cr, uid, model_data_id).res_id
+
+        self.write(cr, uid, ids, {'state' : 'sent'})
+
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(res_id, 'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context':{'active_model':'account.invoice', 'mail.compose.template_id': template.id},
+        }
 
     def confirm_paid(self, cr, uid, ids, context=None):
         if context is None:
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 59977c252f9..0aa7e48b6fc 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -299,16 +299,17 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,sent,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                                 <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                                    <button name="invoice_sent" string="Send By Email" icon="terp-mail-message-new" states="open"/>
+                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,proforma,sale,proforma2"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,sent,paid' icon="gtk-execute"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open,sent" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 2af1e192a9b..58c4150a736 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -30,6 +30,14 @@ action_number()
 write({'state':'open'})</field>
             <field name="kind">function</field>
         </record>
+
+        <record id="act_sent" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">sent</field>
+            <field name="action">invoice_sent()</field>
+            <field name="kind">function</field>
+        </record>
+
         <record model="workflow.activity" id="act_open_test">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">re-open</field>
@@ -58,13 +66,30 @@ write({'state':'cancel'})</field>
             <field name="act_to" ref="act_open"/>
             <field name="signal">invoice_open</field>
         </record>
-        <record id="t8" model="workflow.transition">
+        <record id="t_open_sent" model="workflow.transition">
+            <field name="act_from" ref="act_open"/>
+            <field name="act_to" ref="act_sent"/>
+            <field name="signal">invoice_sent</field>
+        </record>
+        <record id="t_open_paid" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_paid"/>
             <field name="trigger_model">account.move.line</field>
             <field name="trigger_expr_id">move_line_id_payment_get()</field>
             <field name="condition">test_paid()</field>
         </record>
+        <record id="t8" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
+            <field name="act_to" ref="act_paid"/>
+            <field name="trigger_model">account.move.line</field>
+            <field name="trigger_expr_id">move_line_id_payment_get()</field>
+            <field name="condition">test_paid()</field>
+        </record>
+        <record id="t_sent_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">invoice_cancel</field>
+        </record>
         <record id="t9" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
@@ -86,6 +111,11 @@ write({'state':'cancel'})</field>
             <field name="signal">invoice_cancel</field>
         </record>
 
+        <record id="open_test_to_sent" model="workflow.transition">
+            <field name="act_from" ref="act_open_test"/>
+            <field name="act_to" ref="act_sent"/>
+            <field name="signal">invoice_sent</field>
+        </record>
         <record id="open_test_to_paid" model="workflow.transition">
             <field name="act_from" ref="act_open_test"/>
             <field name="act_to" ref="act_paid"/>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 3ed173cca85..0a902fd48dc 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -772,7 +772,7 @@ class account_voucher(osv.osv):
 
     def proforma_voucher(self, cr, uid, ids, context=None):
         self.action_move_line_create(cr, uid, ids, context=context)
-        return True
+        return {'type': 'ir.actions.act_window_close'}
 
     def action_cancel_draft(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 345241cb4ee..f93da8d370f 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,7 +8,7 @@
            <field name="inherit_id" ref="account.invoice_form"/>
            <field name="arch" type="xml">
            <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" string="Payment" states="open" icon="gtk-go-forward"/>
+               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open,sent" icon="gtk-go-forward"/>
            </button>
            </field>
         </record>
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index b108bc14fe3..006a622e25f 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -36,7 +36,7 @@ class invoice(osv.osv):
             'res_model': 'account.voucher',
             'type': 'ir.actions.act_window',
             'nodestroy': True,
-            'target': 'current',
+            'target': 'new',
             'domain': '[]',
             'context': {
                 'default_partner_id': inv.partner_id.id,
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 241bd23d5bb..43e316d1091 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -403,10 +403,10 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6c1571c5630..a6a2f9f2c82 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -56,6 +56,8 @@ class email_template(osv.osv):
            :param str model: model name of the document record this mail is related to.
            :param int res_id: id of the document record this mail is related to.
         """
+        if context is None:
+            context = {}
         if not template: return u""
         try:
             template = tools.ustr(template)

From 8dcc88469eaf311966214c64d46715e095c3277b Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 29 Feb 2012 15:16:32 +0530
Subject: [PATCH 013/126] [IMP] sale: workflow improvements and send quatation
 in mail feature implementation

bzr revid: psi@tinyerp.com-20120229094632-wvu5h6w0avbhto1b
---
 addons/sale/edi/sale_order_action_data.xml | 20 +++++-----
 addons/sale/sale.py                        | 46 ++++++++++++++++++++--
 addons/sale/sale_view.xml                  | 13 +++---
 addons/sale/sale_workflow.xml              | 26 +++++++++++-
 4 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 3d7a554ff4a..56cee553b9e 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -2,14 +2,7 @@
 <openerp>
     <data>
         <!-- EDI Export + Send email Action  -->
-        <record id="ir_actions_server_edi_sale" model="ir.actions.server">
-            <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
-            <field name="state">code</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="sale.model_sale_order"/>
-            <field name="condition">True</field>
-            <field name="name">Auto-email confirmed sale orders</field>
-        </record>
+        
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -30,9 +23,18 @@
          so users can freely customize/delete them -->
     <data noupdate="1">
          <!-- bind the mailing server action to sale.order confirmed activity -->
+        <!--
+        <record id="ir_actions_server_edi_sale" model="ir.actions.server">
+            <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="condition">True</field>
+            <field name="name">Auto-email confirmed sale orders</field>
+        </record> 
         <record id="sale.act_wait_ship" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_sale"/>
-        </record>
+        </record> -->
 
 
         <!--Email template -->
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 82bfda7b580..c13fae41c20 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -201,10 +201,11 @@ class sale_order(osv.osv):
         'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
         'client_order_ref': fields.char('Customer Reference', size=64),
         'state': fields.selection([
-            ('draft', 'Quotation'),
+            ('draft', 'Draft Quotation'),
+            ('sent', 'Quotation Sent'),
             ('waiting_date', 'Waiting Schedule'),
-            ('manual', 'To Invoice'),
-            ('progress', 'In Progress'),
+            ('manual', 'Sale to Invoice'),
+            ('progress', 'Sale in Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
@@ -470,6 +471,17 @@ class sale_order(osv.osv):
         inv_obj.button_compute(cr, uid, [inv_id])
         return inv_id
 
+    def print_quotation(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        for id in ids:
+            wf_service.trg_validate(uid, 'sale.order', id, 'quotation_sent', cr)        
+        datas = {
+                 'model': 'sale.order',
+                 'ids': ids,
+                 'form': self.read(cr, uid, ids, context=context)[0],
+                 }
+        return {'type': 'ir.actions.report.xml', 'report_name': 'sale.order', 'datas': datas, 'nodestroy': True}    
+    
     def manual_invoice(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         wf_service = netsvc.LocalService("workflow")
@@ -658,6 +670,34 @@ class sale_order(osv.osv):
             self.log(cr, uid, o.id, message)
         return True
 
+    def action_quotation_sent(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'sale.order')], context=context)
+        model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','email_compose_message_wizard_form')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        #EDI EXport data
+        id = ids[0]
+        if not self.browse(cr, uid, id, context).partner_id.opt_out: 
+            order.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)
+        ctx = context.copy()
+        ctx.update({'active_model': 'sale.order', 'active_id': id, 'mail.compose.template_id': template_id})
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(resource_id,'form')],
+            'view_id': resource_id,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': ctx,
+            'nodestroy': True,
+        }
+
+    def _hook_message_sent(self, cr, uid, sale_id, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'sale.order', sale_id, 'quotation_sent', cr) 
+        return True
+      
     def procurement_lines_get(self, cr, uid, ids, *args):
         res = []
         for order in self.browse(cr, uid, ids, context={}):
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 90d3838f5a0..f47bb09e2fa 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -200,20 +200,21 @@
                                 <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
                             </group>
                             <group col="17" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                                <button name="action_quotation_sent" string="Send" type="object" icon="terp-mail-message-new" states="draft"/>
                                 <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
                                 <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                                <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
+                                <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
+                                <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
+                                <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>
+                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                                <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                                <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
                             </group>
                         </page>
                         <page string="Other Information">
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index 0ff5eb15ea0..59fce9f9d7b 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -13,6 +13,12 @@
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
+        <record id="act_sent" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_sale"/>
+            <field name="name">sent</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'sent'})</field>
+        </record>        
         <record id="act_router" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">router</field>
@@ -123,6 +129,24 @@
             <field name="signal">order_confirm</field>
         </record>
 
+        <record id="trans_draft_sent" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_sent"/>
+            <field name="signal">quotation_sent</field>
+        </record>
+
+        <record id="trans_sent_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel</field>
+        </record>
+        
+        <record id="trans_sent_router" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
+            <field name="act_to" ref="act_router"/>
+            <field name="signal">order_confirm</field>
+        </record>
+
         <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
@@ -180,7 +204,7 @@
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">manual_invoice</field>
         </record>
-
+        
         <record id="trans_invoice_invoice_end" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>

From 8dd0ad53f7ecac6078f1ab50b4132c7f711164f2 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 29 Feb 2012 15:25:58 +0530
Subject: [PATCH 014/126] [imp] mail, email_template: improvements

bzr revid: psi@tinyerp.com-20120229095558-ezomcdj23m6kcdlv
---
 addons/email_template/email_template.py              | 2 ++
 addons/email_template/wizard/mail_compose_message.py | 4 +++-
 addons/mail/mail_message.py                          | 4 +++-
 addons/mail/wizard/mail_compose_message.py           | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6c1571c5630..a6a2f9f2c82 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -56,6 +56,8 @@ class email_template(osv.osv):
            :param str model: model name of the document record this mail is related to.
            :param int res_id: id of the document record this mail is related to.
         """
+        if context is None:
+            context = {}
         if not template: return u""
         try:
             template = tools.ustr(template)
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index ef4572429a1..c68f884f7ef 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -95,19 +95,21 @@ class mail_compose_message(osv.osv_memory):
                     for fname, fcontent in attachment.iteritems():
                         data_attach = {
                             'name': fname,
-                            'datas': base64.b64encode(fcontent),
+                            'datas': fcontent,
                             'datas_fname': fname,
                             'description': fname,
                             'res_model' : self._name,
                             'res_id' : ids[0] if ids else False
                         }
                         att_ids.append(attachment_obj.create(cr, uid, data_attach))
+                    values['subtype'] = 'html'
                     values['attachment_ids'] = att_ids
         else:
             # restore defaults
             values = self.default_get(cr, uid, self.fields_get_keys(cr, uid), context)
             values.update(use_template=use_template, template_id=template_id)
 
+        values['subtype'] = 'html'    
         return {'value': values}
 
 
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 45a6019db3d..8e6472a265c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -517,7 +517,9 @@ class mail_message(osv.osv):
                     message.write({'state':'sent', 'message_id': res})
                 else:
                     message.write({'state':'exception'})
-
+                model_pool = self.pool.get(message.model)
+                if hasattr(model_pool, '_hook_message_sent'):
+                    model_pool._hook_message_sent(cr, uid, message.res_id, context=context)
                 # if auto_delete=True then delete that sent messages as well as attachments
                 message.refresh()
                 if message.state == 'sent' and message.auto_delete:
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 27ec13b2147..003ddd8b6c3 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -160,6 +160,7 @@ class mail_compose_message(osv.osv_memory):
             result.update({
                     'subtype' : 'plain', # default to the text version due to quoting
                     'body_text' : body,
+                    'body_html' : message_data.body_html,
                     'subject' : subject,
                     'attachment_ids' : [],
                     'model' : message_data.model or False,
@@ -238,7 +239,6 @@ class mail_compose_message(osv.osv_memory):
                     subtype=mail.subtype, headers=headers, context=context)
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
                 mail_message.send(cr, uid, [msg_id], context=context)
-
         return {'type': 'ir.actions.act_window_close'}
 
     def render_template(self, cr, uid, template, model, res_id, context=None):

From 98fc1ace87bcf80e55d7be1f069bb823a9a075f3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 29 Feb 2012 15:40:45 +0530
Subject: [PATCH 015/126] [IMP] account Improve the print button to call the
 invoice_sent signal and also invoice_sent is triggered only when mail is
 send.

bzr revid: mdi@tinyerp.com-20120229101045-w775o646hlu432ot
---
 addons/account/account_invoice.py           | 39 ++++++++++++++++++---
 addons/account/account_invoice_view.xml     |  4 +--
 addons/account/account_invoice_workflow.xml |  2 +-
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 98379f67240..51533353be4 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -372,25 +372,54 @@ class account_invoice(osv.osv):
             else:
                 raise orm.except_orm(_('Unknown Error'), str(e))
             
-    def invoice_sent(self, cr, uid, ids, *args):
+    def _hook_message_sent(self, cr, uid, invoice_id, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'account.invoice', invoice_id, 'invoice_sent', cr)
+        return True
+
+    def invoice_print(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        for id in ids:
+            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_sent', cr)
+        datas = {
+             'ids': ids,
+             'model': 'account.invoice',
+             'form': self.read(cr, uid, ids, context=context)[0]
+        }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.invoice',
+            'datas': datas,
+            'nodestroy' : True
+        }
+
+    def action_invoice_sent(self, cr, uid, ids, context=None):
         email_template_obj = self.pool.get('email.template')
         mod_obj = self.pool.get('ir.model.data')
 
-        template_id = email_template_obj.search(cr, uid, [('name', '=', 'Automated Invoice Notification Mail')])[0]
+        template_id = email_template_obj.search(cr, uid, [('model_id', '=', 'account.invoice')], context=context)[0]
         template = email_template_obj.browse(cr, uid, template_id)
         model_data_id = mod_obj._get_id(cr, uid, 'mail', 'email_compose_message_wizard_form')
-        res_id = mod_obj.browse(cr, uid, model_data_id).res_id
+        res_id = mod_obj.browse(cr, uid, model_data_id, context=context).res_id
 
-        self.write(cr, uid, ids, {'state' : 'sent'})
+        #EDI EXport data
+        id = ids[0]
+        invoice = self.browse(cr, uid, id, context)
+        if not invoice.partner_id.opt_out:
+            invoice.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)
+        ctx = context.copy()
+        ctx.update({'active_model': 'account.invoice', 'active_id': invoice.id, 'mail.compose.template_id': template.id})
 
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'mail.compose.message',
             'views': [(res_id, 'form')],
+            'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context':{'active_model':'account.invoice', 'mail.compose.template_id': template.id},
+            'context': ctx,
+            'nodestroy': True,
         }
 
     def confirm_paid(self, cr, uid, ids, context=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 0aa7e48b6fc..cd70edb2349 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -302,8 +302,8 @@
                                 <field name="state" widget="statusbar" statusbar_visible="draft,open,sent,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                                 <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="invoice_sent" string="Send By Email" icon="terp-mail-message-new" states="open"/>
-                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,proforma,sale,proforma2"/>
+                                    <button name="action_invoice_sent" type="object" string="Send By Email" icon="terp-mail-message-new" states="open"/>
+                                    <button name="invoice_print" string="Print Invoice" type="object" icon="gtk-print" states="open,proforma,sale,proforma2"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,sent,paid' icon="gtk-execute"/>
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 58c4150a736..7e536036628 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -34,7 +34,7 @@ write({'state':'open'})</field>
         <record id="act_sent" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">sent</field>
-            <field name="action">invoice_sent()</field>
+            <field name="action">write({'state':'sent'})</field>
             <field name="kind">function</field>
         </record>
 

From f4f13affad3ea93595a1d059be174447d64d16ff Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Feb 2012 15:46:53 +0530
Subject: [PATCH 016/126] [IMP]purchase: added message_hook method and improve
 workflow and button

bzr revid: mma@tinyerp.com-20120229101653-wiuo4am11s1kaa5h
---
 addons/purchase/purchase.py           | 16 ++++++++++++++--
 addons/purchase/purchase_view.xml     |  2 +-
 addons/purchase/purchase_workflow.xml |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 793d7e76fb1..9ebb084ecb2 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -346,14 +346,25 @@ class purchase_order(osv.osv):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
 
+    def _hook_message_sent(self, cr, uid, purchase_id, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'send_rfq', cr)
+        return True
+
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'purchase.order')])
-        self.write(cr, uid, ids, {'state' : 'send'})
 
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
 
+        #EDI EXport data
+        id = ids[0]
+        order = self.browse(cr, uid, id, context)
+        if not order.partner_id.opt_out: 
+            order.edi_export_and_email(template_ext_id='purchase.email_template_edi_purchase', context=context)
+        ctx = context.copy()
+        ctx.update({'active_model': 'purchase.order', 'active_id': id, 'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',
@@ -362,7 +373,8 @@ class purchase_order(osv.osv):
             'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context': {'active_model': 'purchase.order','mail.compose.template_id' :template_id},
+            'context': ctx,
+            'nodestroy': True,
         }
 
     #TODO: implement messages system
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 2a17c9bc58d..ad064bab696 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -196,7 +196,7 @@
                             </group>
                             <group col="16" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                                <button name="send_rfq" states="draft" string="Send" icon="terp-mail-message-new"/>
+                                <button name="wkf_send_rfq" states="draft" string="Send" type="object" icon="terp-mail-message-new"/>
                                 <button name="view_report" string="Print" states="draft" type="object" icon="gtk-print"/>
                                 <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index a7d67dd87a1..38010780c7f 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -17,7 +17,7 @@
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">send</field>
             <field name="kind">function</field>
-            <field name="action">wkf_send_rfq()</field>
+            <field name="action">write({'state':'send'})</field>
         </record>
         <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>

From 1e4d9f48d2b197400d9c4ca6e684101a1ada1e6a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Feb 2012 15:52:43 +0530
Subject: [PATCH 017/126] [IMP]purchase:revert email_template changes

bzr revid: mma@tinyerp.com-20120229102243-vvft6tu6wn2jnkrv
---
 addons/email_template/email_template.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index a6a2f9f2c82..6c1571c5630 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -56,8 +56,6 @@ class email_template(osv.osv):
            :param str model: model name of the document record this mail is related to.
            :param int res_id: id of the document record this mail is related to.
         """
-        if context is None:
-            context = {}
         if not template: return u""
         try:
             template = tools.ustr(template)

From d49739ff8a9fbd4bf3d59ff9d386c82a343b2900 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 29 Feb 2012 16:55:32 +0530
Subject: [PATCH 018/126] [IMP] account : Improve the workflow button
 visibility.

bzr revid: mdi@tinyerp.com-20120229112532-qc7bmge9d6naqqt1
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index cd70edb2349..e71f83b30f3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -306,7 +306,7 @@
                                     <button name="invoice_print" string="Print Invoice" type="object" icon="gtk-print" states="open,proforma,sale,proforma2"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,sent,paid' icon="gtk-execute"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='sent,paid' icon="gtk-execute"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open,sent" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>

From ae97d281d309c0c4ba3cae832a3be97dc0055fd2 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Feb 2012 17:07:11 +0530
Subject: [PATCH 019/126] [IMP]purchase:comment code of edi for pending now

bzr revid: mma@tinyerp.com-20120229113711-jq8in1oww9o03on2
---
 addons/purchase/purchase.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 9ebb084ecb2..eaf3e39ae3c 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -361,8 +361,8 @@ class purchase_order(osv.osv):
         #EDI EXport data
         id = ids[0]
         order = self.browse(cr, uid, id, context)
-        if not order.partner_id.opt_out: 
-            order.edi_export_and_email(template_ext_id='purchase.email_template_edi_purchase', context=context)
+        #if not order.partner_id.opt_out: 
+            #order.edi_export_and_email(template_ext_id='purchase.email_template_edi_purchase', context=context)
         ctx = context.copy()
         ctx.update({'active_model': 'purchase.order', 'active_id': id, 'mail.compose.template_id': template_id})
         return {

From 7650c331c5582fd25cae863a9ccdfb34e6b0abb9 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 29 Feb 2012 17:13:43 +0530
Subject: [PATCH 020/126] [IMP] sale: small change related to print order
 button

bzr revid: psi@tinyerp.com-20120229114343-we8n5tlhfxxe3xv8
---
 addons/sale/sale.py       | 4 ++--
 addons/sale/sale_view.xml | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c13fae41c20..a8b3f9d8f73 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -677,8 +677,8 @@ class sale_order(osv.osv):
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         #EDI EXport data
         id = ids[0]
-        if not self.browse(cr, uid, id, context).partner_id.opt_out: 
-            order.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)
+#        if not self.browse(cr, uid, id, context).partner_id.opt_out: 
+#            order.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)
         ctx = context.copy()
         ctx.update({'active_model': 'sale.order', 'active_id': id, 'mail.compose.template_id': template_id})
         return {
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f47bb09e2fa..e01bf8ab725 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -206,7 +206,6 @@
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="action_quotation_sent" string="Send" type="object" icon="terp-mail-message-new" states="draft"/>
-                                <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
                                 <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>

From 57586ad1accb095612481947fb2cc081e6eade4b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 29 Feb 2012 17:17:20 +0530
Subject: [PATCH 021/126] [IMP] account : Improve the workflow button
 visibility and code.

bzr revid: mdi@tinyerp.com-20120229114720-hx6sexngsi4hgfg7
---
 addons/account/account_invoice.py       | 4 ++--
 addons/account/account_invoice_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 51533353be4..3a82bfd9854 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -405,8 +405,8 @@ class account_invoice(osv.osv):
         #EDI EXport data
         id = ids[0]
         invoice = self.browse(cr, uid, id, context)
-        if not invoice.partner_id.opt_out:
-            invoice.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)
+#        if not invoice.partner_id.opt_out:
+#            invoice.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)
         ctx = context.copy()
         ctx.update({'active_model': 'account.invoice', 'active_id': invoice.id, 'mail.compose.template_id': template.id})
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index e71f83b30f3..35b8cd2cadf 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -303,7 +303,7 @@
                                 <field name="residual"/>
                                 <group col="8" colspan="4" groups="base.group_user">
                                     <button name="action_invoice_sent" type="object" string="Send By Email" icon="terp-mail-message-new" states="open"/>
-                                    <button name="invoice_print" string="Print Invoice" type="object" icon="gtk-print" states="open,proforma,sale,proforma2"/>
+                                    <button name="invoice_print" string="Print Invoice" type="object" icon="gtk-print" states="open"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='sent,paid' icon="gtk-execute"/>

From 16bfaa6fce17c8705a191b348d51b67970b1fa95 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 29 Feb 2012 18:23:19 +0530
Subject: [PATCH 022/126] [IMP] sale: small change

bzr revid: psi@tinyerp.com-20120229125319-8a71fmbcrv10383z
---
 addons/sale/sale.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a8b3f9d8f73..ba051d37a9e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -676,11 +676,10 @@ class sale_order(osv.osv):
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','email_compose_message_wizard_form')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         #EDI EXport data
-        id = ids[0]
 #        if not self.browse(cr, uid, id, context).partner_id.opt_out: 
 #            order.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)
         ctx = context.copy()
-        ctx.update({'active_model': 'sale.order', 'active_id': id, 'mail.compose.template_id': template_id})
+        ctx.update({'active_model': 'sale.order', 'active_id': id[0], 'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',

From c420db4bbfe6fe64bfc5488fda4705b2d67eb54b Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 29 Feb 2012 18:48:19 +0530
Subject: [PATCH 023/126] [IMP]hr_holidays: Set department readonly till
 approved.

bzr revid: mma@tinyerp.com-20120229131819-x8rmt9ew3a8uysmd
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 287558e5280..a999a3593f3 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -132,7 +132,7 @@ class hr_holidays(osv.osv):
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
-        'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
+        'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, store=True),
         'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),

From 120a4a9fd76abc284f22766b32b1683dbc73a24e Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 1 Mar 2012 10:57:38 +0530
Subject: [PATCH 024/126] [IMP]hr_holidays: Set department readonly via xml and
 revert in py file

bzr revid: mma@tinyerp.com-20120301052738-oaj8phgg1h4p4jq7
---
 addons/hr_holidays/hr_holidays.py       | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index a999a3593f3..287558e5280 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -132,7 +132,7 @@ class hr_holidays(osv.osv):
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
-        'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, store=True),
+        'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
         'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 302ca4fe6ee..3f8490942f3 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -76,7 +76,7 @@
                     <notebook colspan="4">
                         <page string="General">
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/>
+                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                             <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="number_of_days_temp"/>
@@ -121,7 +121,7 @@
                 <notebook colspan="4">
                     <page string="General">
                         <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                        <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/>
+                        <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                         <field name="number_of_days_temp"/>
                         <field name="double_validation" invisible="1"/>
                         <newline/>

From b4688cd91ba74dd4317539e63db82c5a8a787632 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 5 Mar 2012 10:41:17 +0530
Subject: [PATCH 025/126] [IMP]: Purchase: Changed string for invoiced field

bzr revid: mma@tinyerp.com-20120305051117-hmgatham6qkl3z76
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index eaf3e39ae3c..3b832cca7aa 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -180,7 +180,7 @@ class purchase_order(osv.osv):
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
-        'invoiced': fields.function(_invoiced, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
+        'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on receptions')], 'Invoicing Control', required=True,
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \

From 34d47a13ea5c3af61eb21501d495c1db74b6bcb2 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 5 Mar 2012 10:49:52 +0530
Subject: [PATCH 026/126] [REM]: Purchase: Removed print button [IMP]:
 purchase: renamed Receive product button name

bzr revid: mma@tinyerp.com-20120305051952-46lj68covxrod54s
---
 addons/purchase/purchase.py       | 20 --------------------
 addons/purchase/purchase_view.xml |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 3b832cca7aa..647b744e1c4 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -322,26 +322,6 @@ class purchase_order(osv.osv):
             'res_id': pick_ids and pick_ids[0] or False,
         }
 
-    def view_report(self, cr, uid, ids, context=None):
-        wf_service = netsvc.LocalService("workflow")
-        if context is None:
-            context = {}
-        for id in ids:
-            wf_service.trg_validate(uid, 'purchase.order', id, 'send_rfq', cr)
-        
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        datas = {
-             'ids': [],
-             'model': 'purchase.order',
-             'form': data
-        }
-        return {
-            'type': 'ir.actions.report.xml',
-            'report_name': 'purchase.quotation',
-            'nodestroy': True,
-            'datas': datas,
-        }
-
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ad064bab696..6dbdcfeeb0c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -197,7 +197,6 @@
                             <group col="16" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                                 <button name="wkf_send_rfq" states="draft" string="Send" type="object" icon="terp-mail-message-new"/>
-                                <button name="view_report" string="Print" states="draft" type="object" icon="gtk-print"/>
                                 <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
@@ -205,7 +204,7 @@
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approve Order" icon="gtk-go-forward"/>
                                 <button name="view_invoice" string="Receive Invoice" icon="gtk-go-forward" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
-                                <button name="view_picking" string="Receive Product" icon="gtk-go-forward" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
+                                <button name="view_picking" string="Receive Products" icon="gtk-go-forward" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
                                 <button name="action_cancel_draft" states="cancel,send,confirmed" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth,send" string="Cancel" icon="gtk-cancel"/>
                             </group>

From 900d064e3ea853108656215dece270b79781d8f5 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 5 Mar 2012 11:16:20 +0530
Subject: [PATCH 027/126] [IMP]: purchase: Improvements in purchase search
 view: used the same for RfQ and Purchase Orders

bzr revid: mma@tinyerp.com-20120305054620-zxzydncz12nj6ms5
---
 addons/purchase/purchase_view.xml             | 45 ++-----------------
 .../purchase_double_validation/__openerp__.py |  1 +
 .../purchase_double_validation_view.xml       | 16 +++++++
 .../purchase_requisition_view.xml             | 15 +------
 4 files changed, 22 insertions(+), 55 deletions(-)
 create mode 100644 addons/purchase_double_validation/purchase_double_validation_view.xml

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 6dbdcfeeb0c..42237c2a138 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -237,40 +237,6 @@
             </field>
         </record>
 
-       <record id="view_request_for_quotation_filter" model="ir.ui.view">
-            <field name="name">request.quotation.select</field>
-            <field name="model">purchase.order</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Purchase Order">
-                 <group>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase order which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]"  help="Approved purchase order"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]"  help="Purchase order which are in the exception state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
-                    <separator orientation="vertical"/>
-                    <field name="name" string="Reference"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By..." groups="base.group_extended">
-                    <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                     <separator orientation="vertical"/>
-                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                     <separator orientation="vertical"/>
-                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
-                </group>
-              </search>
-            </field>
-        </record>
-
         <record id="view_purchase_order_filter" model="ir.ui.view">
             <field name="name">purchase.order.list.select</field>
             <field name="model">purchase.order</field>
@@ -279,13 +245,10 @@
                 <search string="Search Purchase Order">
                  <group>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase orders which are in draft state"/>
-                    <filter icon="terp-gtk-jump-to-ltr" name="to_approve" string="To Approve" domain="[('state','in',('draft','wait','confirmed'))]" help="Purchase orders which are not approved yet."/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','=','approved')]"  help="Approved purchase orders"/>
-                    <filter icon="terp-accessories-archiver+" string="Done" domain="[('state','=','done')]" help="Purchase orders which are in done state."/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
+                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]"  help="Approved purchase orders"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator orientation="vertical"/>
                     <field name="name" string="Reference"/>
                     <field name="partner_id"/>
@@ -329,12 +292,12 @@
         </record>
 
         <record id="purchase_rfq" model="ir.actions.act_window">
-            <field name="name">Requests for Quotation</field>
+            <field name="name">Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="search_view_id" ref="view_request_for_quotation_filter"/>
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq"
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index ca79aa551fa..79f91bc9311 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -39,6 +39,7 @@ that exceeds minimum amount set by configuration wizard.
     'update_xml': [
         'purchase_double_validation_workflow.xml',
         'purchase_double_validation_installer.xml',
+        'purchase_double_validation_view.xml',
         'board_purchase_view.xml'
     ],
     'test': [
diff --git a/addons/purchase_double_validation/purchase_double_validation_view.xml b/addons/purchase_double_validation/purchase_double_validation_view.xml
new file mode 100644
index 00000000000..95b39a8045a
--- /dev/null
+++ b/addons/purchase_double_validation/purchase_double_validation_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+     <record model="ir.ui.view" id="purchase_order_search_inherit">
+        <field name="name">purchase.order.list.select.inherit</field>
+        <field name="type">form</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
+        <field name="arch" type="xml">
+            <xpath expr="/search/group/filter[@name='draft']" position="after">
+             <filter icon="terp-gtk-jump-to-ltr" name="to_approve" string="To Approve" domain="[('state','in',('wait','confirmed'))]" help="Purchase orders which are not approved yet."/>
+            </xpath>
+        </field>
+    </record>
+    </data>
+</openerp>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index bd47d093df0..60443497fc6 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -21,20 +21,7 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@name='not_invoiced']" position="after">
-             <separator orientation="vertical"/>
-             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
-            </xpath>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="request_for_quotation_inherit">
-        <field name="name">request.for.quotation.select.inherit</field>
-        <field name="type">form</field>
-        <field name="model">purchase.order</field>
-        <field name="inherit_id" ref="purchase.view_request_for_quotation_filter"/>
-        <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@name='not_invoiced']" position="after">
+            <xpath expr="/search/group/filter[@name='approved']" position="after">
              <separator orientation="vertical"/>
              <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
             </xpath>

From 314f9586d0c100577c4743b408c3b2c36f6d301c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 5 Mar 2012 16:18:56 +0530
Subject: [PATCH 028/126] [IMP] purchase : Remove the warning when 'based on PO
 lines' but generate the invoice instead.

bzr revid: mdi@tinyerp.com-20120305104856-5n9x4ntz8jitcywf
---
 addons/purchase/purchase.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 647b744e1c4..16abd4dab3e 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -276,12 +276,13 @@ class purchase_order(osv.osv):
 
     def view_invoice(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
+        wizard_obj = self.pool.get('purchase.order.line_invoice')
         inv_ids = []
         for po in self.browse(cr, uid, ids, context=context):
             if po.invoice_method == 'manual':
                 if not po.invoice_ids:
-                    raise osv.except_osv(_('warning !'),
-                                         _('Your Invoicing Control is based on order lines, so please create invoice from Purchase order lines.'))
+                    context.update({'active_ids' :  [line.id for line in po.order_line]})
+                    wizard_obj.makeInvoices(cr, uid, [], context=context)
             inv_ids+= [invoice.id for invoice in po.invoice_ids]
 
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')

From 5c6efbd235b6a0b174fc22bf51443646ed53ea30 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 5 Mar 2012 17:46:42 +0530
Subject: [PATCH 029/126] [IMP] purchase : Improved the code to get the invoice
 lines at first time when we create the invoice.

bzr revid: mdi@tinyerp.com-20120305121642-781krexsohokecfn
---
 addons/purchase/purchase.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 16abd4dab3e..b5f8568e5ca 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -283,8 +283,9 @@ class purchase_order(osv.osv):
                 if not po.invoice_ids:
                     context.update({'active_ids' :  [line.id for line in po.order_line]})
                     wizard_obj.makeInvoices(cr, uid, [], context=context)
+            
+        for po in self.browse(cr, uid, ids, context=context):
             inv_ids+= [invoice.id for invoice in po.invoice_ids]
-
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
         res_id = res and res[1] or False
 

From 876cac5546563e17ce2e0b1f04acf823f0539c13 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 6 Mar 2012 10:38:47 +0530
Subject: [PATCH 030/126] [IMP] sale: Added buttons to see invoice and delivery
 order on sale order from

bzr revid: psi@tinyerp.com-20120306050847-bbrjq8qrcxehom99
---
 addons/sale/sale.py       | 64 ++++++++++++++++++++++++++++++++++++---
 addons/sale/sale_view.xml |  2 ++
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ba051d37a9e..e031cac5964 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -513,6 +513,65 @@ class sale_order(osv.osv):
             'res_id': inv_ids and inv_ids[0] or False,
         }
 
+    def action_view_invoice(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        inv_ids = []
+        for so in self.browse(cr, uid, ids, context=context):
+            inv_ids+= [invoice.id for invoice in so.invoice_ids]
+    
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+        res_id = res and res[1] or False
+    
+        return {
+            'name': _('Customer Invoices'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': [res_id],
+            'res_model': 'account.invoice',
+            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'res_id': inv_ids and inv_ids[0] or False,
+        }
+    
+    def action_view_delivery(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        pick_ids = []
+        for so in self.browse(cr, uid, ids, context=context):
+            pick_ids += [picking.id for picking in so.picking_ids]
+            
+        if len(pick_ids) > 1:
+            res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_search')
+            res_id = res and res[1] or False,
+            return {
+                'name': _('Delivery Order'),
+                'view_type': 'search',
+                'view_mode': 'search',
+                'view_id': res_id,
+                'res_model': 'stock.picking',
+                'context': "{'type':'out'}",
+                'type': 'ir.actions.act_window',
+                'nodestroy': True,
+                'target': 'current',
+                'res_id': pick_ids or False,
+            }            
+        else:    
+            res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
+            res_id = res and res[1] or False,
+            return {
+                'name': _('Delivery Order'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'view_id': res_id,
+                'res_model': 'stock.picking',
+                'context': "{'type':'out'}",
+                'type': 'ir.actions.act_window',
+                'nodestroy': True,
+                'target': 'current',
+                'res_id': pick_ids and pick_ids[0] or False,
+            }
+
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
         res = False
         invoices = {}
@@ -675,11 +734,8 @@ class sale_order(osv.osv):
         template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'sale.order')], context=context)
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','email_compose_message_wizard_form')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        #EDI EXport data
-#        if not self.browse(cr, uid, id, context).partner_id.opt_out: 
-#            order.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)
         ctx = context.copy()
-        ctx.update({'active_model': 'sale.order', 'active_id': id[0], 'mail.compose.template_id': template_id})
+        ctx.update({'active_model': 'sale.order', 'active_id': ids[0], 'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e01bf8ab725..2a7b059016b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -210,6 +210,8 @@
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
                                 <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
+                                <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object"/><!-- attrs="{'invisible': ['|', ('order_policy','!=','prepaid'), '|', ('state','!=', 'manual'), ('invoiced','!=',True) ]}"/-->
+                                <button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object"/><!-- attrs="{'invisible': ['|', ('invoiced','=',True), ('state','!=', 'progress')]}"/-->
                                 <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>

From 3fe4b833294f749d03667550f089231137d9c053 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 6 Mar 2012 11:22:10 +0530
Subject: [PATCH 031/126] [IMP]hr_evaluation: renamed Button name Interview
 question to Answer Survey

bzr revid: mma@tinyerp.com-20120306055210-9eodpob4zmebs3z2
---
 addons/hr_evaluation/hr_evaluation_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e1dd5e0b96f..1f1b5af553c 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -173,7 +173,7 @@
                                     <group col="4" colspan="4">
                                         <field name="survey_id"/>
                                         <group col="2" colspan="2">
-                                            <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                            <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                                             <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                                         </group>
                                         <field name="date_deadline"/>
@@ -301,7 +301,7 @@
                         <field name="survey_id"/>
                         <field name="evaluation_id"/>
                         <group col="2" colspan="2">
-                            <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                            <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                         </group>
                         <field name="date_deadline"/>
                         <field name="response" readonly="1"/>
@@ -338,7 +338,7 @@
                     <field name="user_id" string="Interviewer"/>
                     <field name="user_to_review_id"/>
                     <field name="response" readonly="1" invisible="True"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" colspan="2" states="waiting_answer"/>
                     <field name="state"/>

From e64820b32a92cea24647a8a5525c37364487c207 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 7 Mar 2012 11:44:04 +0530
Subject: [PATCH 032/126] [IMP] sale: set attrs on open invoice and open
 delivery oder buttons

bzr revid: psi@tinyerp.com-20120307061404-uob7czxdiio8hmt8
---
 addons/sale/sale_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2a7b059016b..e7d2ab42223 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -210,8 +210,11 @@
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
                                 <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
-                                <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object"/><!-- attrs="{'invisible': ['|', ('order_policy','!=','prepaid'), '|', ('state','!=', 'manual'), ('invoiced','!=',True) ]}"/-->
-                                <button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object"/><!-- attrs="{'invisible': ['|', ('invoiced','=',True), ('state','!=', 'progress')]}"/-->
+                                <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object" 
+                                attrs="{'invisible': ['|','|','|',('state', 'not in', ('progress',)), ('invoiced', '=', True),'&amp;',('order_policy','=','picking'),
+                                								('state', '!=','done'),'&amp;','&amp;',('order_policy','=','postpaid'),('state', '=','progress'),('shipped','=',False)]}"/>
+								<button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object" 
+								attrs="{'invisible': ['|','|', ('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                                 <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>

From 116974c0d8dcd6da1c90a7847e9a11f74eb257cb Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 7 Mar 2012 11:54:12 +0530
Subject: [PATCH 033/126] [IMP] sale: improve action_view_delivery funtions

bzr revid: psi@tinyerp.com-20120307062412-82bdsvhif9cxktl2
---
 addons/sale/sale.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e031cac5964..d19d43a22cf 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -540,14 +540,13 @@ class sale_order(osv.osv):
         pick_ids = []
         for so in self.browse(cr, uid, ids, context=context):
             pick_ids += [picking.id for picking in so.picking_ids]
-            
         if len(pick_ids) > 1:
-            res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_search')
+            res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_tree')
             res_id = res and res[1] or False,
             return {
                 'name': _('Delivery Order'),
-                'view_type': 'search',
-                'view_mode': 'search',
+                'view_type': 'form',
+                'view_mode': 'tree',
                 'view_id': res_id,
                 'res_model': 'stock.picking',
                 'context': "{'type':'out'}",

From 553f0fe846c5e1c433165f59073b00ad0554d9be Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 7 Mar 2012 12:10:22 +0530
Subject: [PATCH 034/126] [imp] sale improve sale and mail

bzr revid: psi@tinyerp.com-20120307064022-4q3j3uqoao20eqqy
---
 addons/mail/wizard/mail_compose_message.py       |  3 ++-
 addons/mail/wizard/mail_compose_message_view.xml |  1 +
 addons/sale/edi/sale_order.py                    | 12 ++++++++++++
 addons/sale/sale.py                              |  5 +----
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 90ecbcb3607..2010d7d0f5a 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -100,6 +100,7 @@ class mail_compose_message(osv.osv_memory):
         if not result.get('email_from'):
             current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
             result['email_from'] = current_user.user_email or False
+        result['subtype'] = 'html'
         return result
 
     _columns = {
@@ -158,7 +159,7 @@ class mail_compose_message(osv.osv_memory):
                 if not (subject.startswith('Re:') or subject.startswith(re_prefix)):
                     subject = "%s %s" % (re_prefix, subject)
             result.update({
-                    'subtype' : 'plain', # default to the text version due to quoting
+                    'subtype' : message_data.subtype or 'plain', # default to the text version due to quoting
                     'body_text' : body,
                     'body_html' : message_data.body_html,
                     'subject' : subject,
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index d559d679c8b..3a44b040139 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -23,6 +23,7 @@
                     <notebook colspan="4">
                         <page string="Body">
                             <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
+                            <field name="body_html" invisible="1"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index d40d0b613ed..12aee8a1812 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -24,6 +24,7 @@ from dateutil.relativedelta import relativedelta
 
 from osv import fields, osv, orm
 from edi import EDIMixin
+from edi.models import edi
 from tools import DEFAULT_SERVER_DATE_FORMAT
 
 SALE_ORDER_LINE_EDI_STRUCT = {
@@ -64,6 +65,17 @@ SALE_ORDER_EDI_STRUCT = {
 class sale_order(osv.osv, EDIMixin):
     _inherit = 'sale.order'
 
+    def action_quotation_sent(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        sale_objs = self.browse(cr, uid, ids, context=context) 
+        edi_token = self.pool.get('edi.document').export_edi(cr, uid, sale_objs, context = context)[0]
+        web_root_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        edi_context = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
+        ctx = context.copy()
+        ctx.update(edi_context)
+        return super(sale_order, self).action_quotation_sent(cr, uid, ids, context=ctx)
+
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
         """Exports a Sale order"""
         edi_struct = dict(edi_struct or SALE_ORDER_EDI_STRUCT)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ba051d37a9e..d657eedd2bf 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -675,11 +675,8 @@ class sale_order(osv.osv):
         template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'sale.order')], context=context)
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','email_compose_message_wizard_form')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        #EDI EXport data
-#        if not self.browse(cr, uid, id, context).partner_id.opt_out: 
-#            order.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)
         ctx = context.copy()
-        ctx.update({'active_model': 'sale.order', 'active_id': id[0], 'mail.compose.template_id': template_id})
+        ctx.update({'active_model': 'sale.order', 'active_id': ids[0], 'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',

From 7947da855689976471cd67318527521dff21e75e Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 7 Mar 2012 15:40:46 +0530
Subject: [PATCH 035/126] [IMP]sale: update attrs on Open Invoice button

bzr revid: psi@tinyerp.com-20120307101046-yv27cggqlanh338i
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e7d2ab42223..2ad4059cb42 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -211,8 +211,8 @@
                                 <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
                                 <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
                                 <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object" 
-                                attrs="{'invisible': ['|','|','|',('state', 'not in', ('progress',)), ('invoiced', '=', True),'&amp;',('order_policy','=','picking'),
-                                								('state', '!=','done'),'&amp;','&amp;',('order_policy','=','postpaid'),('state', '=','progress'),('shipped','=',False)]}"/>
+                                		attrs="{'invisible': ['|','|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking'),
+                                		'&amp;','&amp;',('order_policy','=','postpaid'),('state', '=','progress'),('shipped','=',False)]}"/>
 								<button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object" 
 								attrs="{'invisible': ['|','|', ('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                                 <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>

From b16de17c746c1acd459f1bd95e5beb6d42268467 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 9 Mar 2012 10:59:48 +0530
Subject: [PATCH 036/126] [IMP] sale: revert the changes related to EDI

bzr revid: psi@tinyerp.com-20120309052948-iy1o89q06uj440oy
---
 addons/sale/edi/sale_order_action_data.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 56cee553b9e..3d7a554ff4a 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -2,7 +2,14 @@
 <openerp>
     <data>
         <!-- EDI Export + Send email Action  -->
-        
+        <record id="ir_actions_server_edi_sale" model="ir.actions.server">
+            <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="condition">True</field>
+            <field name="name">Auto-email confirmed sale orders</field>
+        </record>
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -23,18 +30,9 @@
          so users can freely customize/delete them -->
     <data noupdate="1">
          <!-- bind the mailing server action to sale.order confirmed activity -->
-        <!--
-        <record id="ir_actions_server_edi_sale" model="ir.actions.server">
-            <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
-            <field name="state">code</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="sale.model_sale_order"/>
-            <field name="condition">True</field>
-            <field name="name">Auto-email confirmed sale orders</field>
-        </record> 
         <record id="sale.act_wait_ship" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_sale"/>
-        </record> -->
+        </record>
 
 
         <!--Email template -->

From 99fac6333ae1e87b7e9685eb4afd94a8bc976604 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 16 Mar 2012 10:36:22 +0530
Subject: [PATCH 037/126] [IMP] stock : Improve the workflow button visibility.

bzr revid: mdi@tinyerp.com-20120316050622-7d7cldlkxdryq6o5
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ff3e1171dbf..c4ab0ac3462 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1210,7 +1210,7 @@
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
-                                <button name="action_assign" states="draft, confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                                <button name="action_assign" states="draft" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
                                 <button name="%(report_picking_list)d" string="Print Reception" type="action" icon="gtk-print" states="done"/>

From c55193994d0421b1d9e80c808a415d1dba7299d6 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 19 Mar 2012 10:57:15 +0530
Subject: [PATCH 038/126] [IMP] sale: improve the logic of open invoice and
 open delivery oder so they will work for multiple invoices and delivery
 orders, added set to draft button in sent state

bzr revid: psi@tinyerp.com-20120319052715-n7nga0ky12mwwtya
---
 addons/sale/sale.py       | 91 +++++++++++++++++++++------------------
 addons/sale/sale_view.xml |  4 +-
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index d19d43a22cf..3b7eff07cbf 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -516,60 +516,65 @@ class sale_order(osv.osv):
     def action_view_invoice(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         inv_ids = []
+        result = {}
         for so in self.browse(cr, uid, ids, context=context):
             inv_ids+= [invoice.id for invoice in so.invoice_ids]
-    
-        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
-        res_id = res and res[1] or False
-    
-        return {
-            'name': _('Customer Invoices'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'view_id': [res_id],
-            'res_model': 'account.invoice',
-            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-            'res_id': inv_ids and inv_ids[0] or False,
-        }
+        if len(inv_ids)>1:
+            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
+            result.update({
+                           'view_mode': 'tree,form',
+                           'res_id': inv_ids or False
+            })
+        else:
+            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+            result.update({
+                           'view_mode': 'form',
+                           'res_id': inv_ids and inv_ids[0] or False,
+            })
+        res_id = res and res[1] or False,
+        result.update({
+                    'name': _('Cutomer Invoice'),
+                    'view_type': 'form',
+                    'view_id': [res_id],
+                    'res_model': 'account.invoice',
+                    'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
+                    'type': 'ir.actions.act_window',
+                    'nodestroy': True,
+                    'target': 'current',
+        })
+        return result
+
     
     def action_view_delivery(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         pick_ids = []
+        result = {}
         for so in self.browse(cr, uid, ids, context=context):
             pick_ids += [picking.id for picking in so.picking_ids]
         if len(pick_ids) > 1:
             res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_tree')
-            res_id = res and res[1] or False,
-            return {
-                'name': _('Delivery Order'),
-                'view_type': 'form',
-                'view_mode': 'tree',
-                'view_id': res_id,
-                'res_model': 'stock.picking',
-                'context': "{'type':'out'}",
-                'type': 'ir.actions.act_window',
-                'nodestroy': True,
-                'target': 'current',
-                'res_id': pick_ids or False,
-            }            
-        else:    
+            result.update({
+                           'view_mode': 'tree,form',
+                           'res_id': pick_ids or False
+            })
+        else:
             res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
-            res_id = res and res[1] or False,
-            return {
-                'name': _('Delivery Order'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'view_id': res_id,
-                'res_model': 'stock.picking',
-                'context': "{'type':'out'}",
-                'type': 'ir.actions.act_window',
-                'nodestroy': True,
-                'target': 'current',
-                'res_id': pick_ids and pick_ids[0] or False,
-            }
+            result.update({
+                           'view_mode': 'form',
+                           'res_id': pick_ids and pick_ids[0] or False,
+            })
+        res_id = res and res[1] or False,
+        result.update({
+                    'name': _('Delivery Order'),
+                    'view_type': 'form',
+                    'view_id': res_id,
+                    'res_model': 'stock.picking',
+                    'context': "{'type':'out'}",
+                    'type': 'ir.actions.act_window',
+                    'nodestroy': True,
+                    'target': 'current',
+        })
+        return result
 
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
         res = False
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2ad4059cb42..8ff740144e8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -203,11 +203,11 @@
                                 <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                                <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
+                                <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="action_quotation_sent" string="Send" type="object" icon="terp-mail-message-new" states="draft"/>
                                 <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                                <button name="action_cancel_draft" states="sent,cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
                                 <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
                                 <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object" 

From 168ee7ed4fbacf82292229906321a9e279b124ca Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 19 Mar 2012 12:13:13 +0530
Subject: [PATCH 039/126] [IMP]hr_evaluation: Improvement in view of
 hr.evaluation.interview model

bzr revid: mma@tinyerp.com-20120319064313-copl2xbroairqlhz
---
 addons/hr_evaluation/hr_evaluation_view.xml | 27 +++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 1f1b5af553c..e67378df124 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -298,21 +298,18 @@
             <field name="arch" type="xml">
                 <form string="Interview Appraisal">
                     <group col="4" colspan="4">
-                        <field name="survey_id"/>
-                        <field name="evaluation_id"/>
-                        <group col="2" colspan="2">
-                            <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                        </group>
-                        <field name="date_deadline"/>
-                        <field name="response" readonly="1"/>
-                        <field name="user_to_review_id"/>
-                        <field name="user_id" string="Interviewer"/>
-                        <group col="2" colspan="2">
-                            <button string="Send Reminder Email"
-                            name="%(mail.action_email_compose_message_wizard)d"
-                            icon="terp-mail-message-new" type="action"
-                            states="waiting_answer"/>
-                            <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                         <field name="user_to_review_id"/>
+                         <field name="user_id" string="Interviewer"/>
+                         <field name="date_deadline"/>
+                          <group col="4" colspan="4">
+                                <field name="survey_id"/>
+                                <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                <newline/>
+                                <field name="evaluation_id"/>
+                                <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
+                                <newline/>
+                                <field name="response" readonly="1"/>
+                                <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                         </group>
                     </group>
                     <newline/>

From 1b2b933ecf3f57d98456032e32ad4c1c6886e6f1 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 19 Mar 2012 14:23:40 +0530
Subject: [PATCH 040/126] [IMP]hr_evaluation: added a done button in form view
 of appraisal tree view

bzr revid: mma@tinyerp.com-20120319085340-jd8gly8svdb3hvff
---
 addons/hr_evaluation/hr_evaluation_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e67378df124..e699b242bb6 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -185,6 +185,7 @@
                                     <separator string="State" colspan="4"/>
                                     <group colspan="4" col="6">
                                          <field name="state"/>
+                                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
                                     </group>
                                 </form>
                             </field>

From 6c2be6eba42e10cf7021a6bd1158283de8c2c3e2 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 21 Mar 2012 18:12:45 +0530
Subject: [PATCH 041/126] [IMP]sale: update the domain on Open delivery order
 button so it will work on web and gtk

bzr revid: psi@tinyerp.com-20120321124245-kfxrszc13za2cjtu
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8ff740144e8..55718664bcf 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -214,7 +214,7 @@
                                 		attrs="{'invisible': ['|','|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking'),
                                 		'&amp;','&amp;',('order_policy','=','postpaid'),('state', '=','progress'),('shipped','=',False)]}"/>
 								<button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object" 
-								attrs="{'invisible': ['|','|', ('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
+								attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                                 <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>

From 5488e8ae0a1bc91e18a12524edc2304b0d18d5b1 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 27 Mar 2012 17:14:44 +0530
Subject: [PATCH 042/126] [IMP] mail, account, sale, purchase: remove
 _hook_msg_sent from account, sale and purchase and revert all changes of mail
 as it will be done in other branch

bzr revid: psi@tinyerp.com-20120327114444-qj9z73j0zaq4kkd2
---
 addons/account/account_invoice.py               | 16 +++++++++++-----
 addons/mail/mail_message.py                     |  4 ----
 addons/mail/wizard/mail_compose_message.py      |  4 +---
 .../mail/wizard/mail_compose_message_view.xml   |  1 -
 addons/purchase/purchase.py                     | 17 ++++++++++++-----
 addons/sale/sale.py                             | 17 ++++++++++++-----
 6 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 3a82bfd9854..365200743d8 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -371,11 +371,6 @@ class account_invoice(osv.osv):
                      _('There is no Accounting Journal of type Sale/Purchase defined!'))
             else:
                 raise orm.except_orm(_('Unknown Error'), str(e))
-            
-    def _hook_message_sent(self, cr, uid, invoice_id, context=None):
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'account.invoice', invoice_id, 'invoice_sent', cr)
-        return True
 
     def invoice_print(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService('workflow')
@@ -1699,4 +1694,15 @@ class res_partner(osv.osv):
 
 res_partner()
 
+class mail_message(osv.osv):
+    _name = 'mail.message'
+    _inherit = 'mail.message'
+
+    def _postprocess_sent_message(self, cr, uid, message, context=None):
+        if message.model == 'account.invoice':
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'account.invoice', message.res_id, 'invoice_sent', cr)
+        return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
+
+mail_message()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f2565decb79..695b0b905e8 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -464,7 +464,6 @@ class mail_message(osv.osv):
         msg['sub_type'] = msg['subtype'] or 'plain'
         return msg
 
-
     def send(self, cr, uid, ids, auto_commit=False, context=None):
         """Sends the selected emails immediately, ignoring their current
            state (mails that have already been sent should not be passed
@@ -521,9 +520,6 @@ class mail_message(osv.osv):
                     message.write({'state':'sent', 'message_id': res})
                 else:
                     message.write({'state':'exception'})
-                model_pool = self.pool.get(message.model)
-                if hasattr(model_pool, '_hook_message_sent'):
-                    model_pool._hook_message_sent(cr, uid, message.res_id, context=context)
                 # if auto_delete=True then delete that sent messages as well as attachments
                 message.refresh()
                 if message.state == 'sent' and message.auto_delete:
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 4f1163c0d69..bc4a6fbe233 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -100,7 +100,6 @@ class mail_compose_message(osv.osv_memory):
         if not result.get('email_from'):
             current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
             result['email_from'] = current_user.user_email or False
-        result['subtype'] = 'html'
         return result
 
     _columns = {
@@ -159,9 +158,8 @@ class mail_compose_message(osv.osv_memory):
                 if not (subject.startswith('Re:') or subject.startswith(re_prefix)):
                     subject = "%s %s" % (re_prefix, subject)
             result.update({
-                    'subtype' : message_data.subtype or 'plain', # default to the text version due to quoting
+                    'subtype' : 'plain', # default to the text version due to quoting
                     'body_text' : body,
-                    'body_html' : message_data.body_html,
                     'subject' : subject,
                     'attachment_ids' : [],
                     'model' : message_data.model or False,
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 3a44b040139..d559d679c8b 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -23,7 +23,6 @@
                     <notebook colspan="4">
                         <page string="Body">
                             <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
-                            <field name="body_html" invisible="1"/>
                         </page>
                         <page string="Attachments">
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b5f8568e5ca..0093222d78d 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -328,11 +328,6 @@ class purchase_order(osv.osv):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
 
-    def _hook_message_sent(self, cr, uid, purchase_id, context=None):
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'send_rfq', cr)
-        return True
-
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'purchase.order')])
@@ -1020,4 +1015,16 @@ class procurement_order(osv.osv):
         return res
 
 procurement_order()
+
+class mail_message(osv.osv):
+    _name = 'mail.message'
+    _inherit = 'mail.message'
+    
+    def _postprocess_sent_message(self, cr, uid, message, context=None):
+        if message.model == 'purchase.order':
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'purchase.order', message.res_id, 'send_rfq', cr)
+        return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
+
+mail_message()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 3b7eff07cbf..50f6bf81153 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -752,11 +752,6 @@ class sale_order(osv.osv):
             'nodestroy': True,
         }
 
-    def _hook_message_sent(self, cr, uid, sale_id, context=None):
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'sale.order', sale_id, 'quotation_sent', cr) 
-        return True
-      
     def procurement_lines_get(self, cr, uid, ids, *args):
         res = []
         for order in self.browse(cr, uid, ids, context={}):
@@ -1520,4 +1515,16 @@ class sale_config_picking_policy(osv.osv_memory):
 
 sale_config_picking_policy()
 
+class mail_message(osv.osv):
+    _name = 'mail.message'
+    _inherit = 'mail.message'
+    
+    def _postprocess_sent_message(self, cr, uid, message, context=None):
+        if message.model == 'sale.order':
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'sale.order', message.res_id, 'quotation_sent', cr) 
+        return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
+
+mail_message()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From cede2bb069d3ae9566cf38e908e9668e6ef77db2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 27 Mar 2012 18:56:05 +0530
Subject: [PATCH 043/126] [IMP] account : Improved the code.

bzr revid: mdi@tinyerp.com-20120327132605-xnd1k0bo3qj9fu07
---
 addons/account/account_invoice.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 365200743d8..6b9b2b0e41c 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -392,18 +392,12 @@ class account_invoice(osv.osv):
         email_template_obj = self.pool.get('email.template')
         mod_obj = self.pool.get('ir.model.data')
 
-        template_id = email_template_obj.search(cr, uid, [('model_id', '=', 'account.invoice')], context=context)[0]
-        template = email_template_obj.browse(cr, uid, template_id)
-        model_data_id = mod_obj._get_id(cr, uid, 'mail', 'email_compose_message_wizard_form')
-        res_id = mod_obj.browse(cr, uid, model_data_id, context=context).res_id
+        template_id = email_template_obj.search(cr, uid, [('model_id', '=', 'account.invoice')], context=context)
+        res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
+        res_id = res and res[1] or False
 
-        #EDI EXport data
-        id = ids[0]
-        invoice = self.browse(cr, uid, id, context)
-#        if not invoice.partner_id.opt_out:
-#            invoice.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)
         ctx = context.copy()
-        ctx.update({'active_model': 'account.invoice', 'active_id': invoice.id, 'mail.compose.template_id': template.id})
+        ctx.update({'active_model': 'account.invoice', 'active_id': ids[0], 'mail.compose.template_id': template_id})
 
         return {
             'view_type': 'form',

From 4a274f3dda4c3958aae817effc109d1df462b2c4 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 28 Mar 2012 11:34:43 +0530
Subject: [PATCH 044/126] [IMP] account, purchase, sale: Improve code to add a
 link in mail

bzr revid: psi@tinyerp.com-20120328060443-34pimg3azu50dy4v
---
 addons/account/account_invoice.py           | 24 +++++++++------------
 addons/account/account_invoice_workflow.xml |  6 +++---
 addons/account/edi/invoice.py               | 13 +++++++++++
 addons/purchase/edi/purchase_order.py       | 13 +++++++++++
 addons/purchase/purchase.py                 |  9 ++------
 addons/sale/sale.py                         | 16 +++++++-------
 6 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 6b9b2b0e41c..dc2b70c0094 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -389,26 +389,22 @@ class account_invoice(osv.osv):
         }
 
     def action_invoice_sent(self, cr, uid, ids, context=None):
-        email_template_obj = self.pool.get('email.template')
         mod_obj = self.pool.get('ir.model.data')
-
-        template_id = email_template_obj.search(cr, uid, [('model_id', '=', 'account.invoice')], context=context)
+        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'account.invoice')], context=context)[0]
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-
         ctx = context.copy()
         ctx.update({'active_model': 'account.invoice', 'active_id': ids[0], 'mail.compose.template_id': template_id})
-
         return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'mail.compose.message',
-            'views': [(res_id, 'form')],
-            'view_id': res_id,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'context': ctx,
-            'nodestroy': True,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'mail.compose.message',
+                'views': [(res_id, 'form')],
+                'view_id': res_id,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': ctx,
+                'nodestroy': True,
         }
 
     def confirm_paid(self, cr, uid, ids, context=None):
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 7e536036628..faf38acd924 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -66,12 +66,12 @@ write({'state':'cancel'})</field>
             <field name="act_to" ref="act_open"/>
             <field name="signal">invoice_open</field>
         </record>
-        <record id="t_open_sent" model="workflow.transition">
+        <record id="open_to_sent" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_sent"/>
             <field name="signal">invoice_sent</field>
         </record>
-        <record id="t_open_paid" model="workflow.transition">
+        <record id="open_to_paid" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_paid"/>
             <field name="trigger_model">account.move.line</field>
@@ -85,7 +85,7 @@ write({'state':'cancel'})</field>
             <field name="trigger_expr_id">move_line_id_payment_get()</field>
             <field name="condition">test_paid()</field>
         </record>
-        <record id="t_sent_cancel" model="workflow.transition">
+        <record id="sent_to_cancel" model="workflow.transition">
             <field name="act_from" ref="act_sent"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
index d36e9163ba9..97b633d1740 100644
--- a/addons/account/edi/invoice.py
+++ b/addons/account/edi/invoice.py
@@ -21,6 +21,7 @@
 
 from osv import fields, osv, orm
 from edi import EDIMixin
+from edi.models import edi
 
 INVOICE_LINE_EDI_STRUCT = {
     'name': True,
@@ -71,6 +72,18 @@ INVOICE_EDI_STRUCT = {
 class account_invoice(osv.osv, EDIMixin):
     _inherit = 'account.invoice'
 
+    def action_invoice_sent(self, cr, uid, ids, context=None):
+        """"Override this method to add a link to mail"""
+        if context is None:
+            context = {}
+        invoice_objs = self.browse(cr, uid, ids, context=context) 
+        edi_token = self.pool.get('edi.document').export_edi(cr, uid, invoice_objs, context = context)[0]
+        web_root_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        edi_context = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
+        ctx = context.copy()
+        ctx.update(edi_context)
+        return super(account_invoice, self).action_invoice_sent(cr, uid, ids, context=ctx)
+
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
         """Exports a supplier or customer invoice"""
         edi_struct = dict(edi_struct or INVOICE_EDI_STRUCT)
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index b8359f3bf7f..8330bb21ec2 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -24,6 +24,7 @@ from dateutil.relativedelta import relativedelta
 
 from osv import fields, osv, orm
 from edi import EDIMixin
+from edi.models import edi
 from tools import DEFAULT_SERVER_DATE_FORMAT
 from tools.translate import _
 
@@ -61,6 +62,18 @@ PURCHASE_ORDER_EDI_STRUCT = {
 class purchase_order(osv.osv, EDIMixin):
     _inherit = 'purchase.order'
 
+    def wkf_send_rfq(self, cr, uid, ids, context=None):
+        """"Override this method to add a link to mail"""
+        if context is None:
+            context = {}
+        purchase_objs = self.browse(cr, uid, ids, context=context) 
+        edi_token = self.pool.get('edi.document').export_edi(cr, uid, purchase_objs, context = context)[0]
+        web_root_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        edi_context = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
+        ctx = context.copy()
+        ctx.update(edi_context)
+        return super(purchase_order, self).wkf_send_rfq(cr, uid, ids, context=ctx)
+
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
         """Exports a purchase order"""
         edi_struct = dict(edi_struct or PURCHASE_ORDER_EDI_STRUCT)
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0093222d78d..1e6f7602280 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -330,18 +330,13 @@ class purchase_order(osv.osv):
 
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
-        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'purchase.order')])
+        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'purchase.order')], context=context)[0]
 
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
 
-        #EDI EXport data
-        id = ids[0]
-        order = self.browse(cr, uid, id, context)
-        #if not order.partner_id.opt_out: 
-            #order.edi_export_and_email(template_ext_id='purchase.email_template_edi_purchase', context=context)
         ctx = context.copy()
-        ctx.update({'active_model': 'purchase.order', 'active_id': id, 'mail.compose.template_id': template_id})
+        ctx.update({'active_model': 'purchase.order', 'active_id': ids[0], 'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 50f6bf81153..4c450aca3a7 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -474,13 +474,13 @@ class sale_order(osv.osv):
     def print_quotation(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
-            wf_service.trg_validate(uid, 'sale.order', id, 'quotation_sent', cr)        
+            wf_service.trg_validate(uid, 'sale.order', id, 'quotation_sent', cr)
         datas = {
                  'model': 'sale.order',
                  'ids': ids,
                  'form': self.read(cr, uid, ids, context=context)[0],
-                 }
-        return {'type': 'ir.actions.report.xml', 'report_name': 'sale.order', 'datas': datas, 'nodestroy': True}    
+        }
+        return {'type': 'ir.actions.report.xml', 'report_name': 'sale.order', 'datas': datas, 'nodestroy': True}
     
     def manual_invoice(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
@@ -735,17 +735,17 @@ class sale_order(osv.osv):
 
     def action_quotation_sent(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
-        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'sale.order')], context=context)
-        model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','email_compose_message_wizard_form')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'sale.order')], context=context)[0]
+        res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
+        res_id = res and res[1] or False
         ctx = context.copy()
         ctx.update({'active_model': 'sale.order', 'active_id': ids[0], 'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'mail.compose.message',
-            'views': [(resource_id,'form')],
-            'view_id': resource_id,
+            'views': [(res_id,'form')],
+            'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
             'context': ctx,

From a85f78a48bb5a8681746925eaf6eb62243472453 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Apr 2012 11:58:17 +0530
Subject: [PATCH 045/126] [ADD]event_sale: Add event_items fields for
 product_ids and sales_ends fields.

bzr revid: atp@tinyerp.com-20120402062817-yjd1pay0kqolv8fe
---
 addons/event_sale/event_sale.py       | 30 +++++++++++++++++-
 addons/event_sale/event_sale_view.xml | 45 +++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index df115c0eef4..0208714b083 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -92,4 +92,32 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-
+    
+class event_event(osv.osv):
+    _inherit = 'event.event'
+    _columns = {
+        'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
+    }
+    
+class event_items(osv.osv):
+    _name = "event.items"
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'qty': fields.integer('Quantity'),
+        'price': fields.integer('Price'),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+        'discount': fields.integer('Discount'),
+        'event_id': fields.many2one('event.event', 'Event'),
+        'sales_end_date': fields.date('Sales End')
+        }
+    
+    def onchange_product_id(self, cr, uid, ids, product, context=None):
+        product_obj = self.pool.get('product.product')
+        data = {}
+        if not product:
+            return {'value': data}
+        price = product_obj.browse(cr, uid, product).list_price
+        uom = product_obj.browse(cr, uid, product).uom_id.id
+        data['price'] = price
+        data['uom_id'] = uom
+        return {'value': data}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 4387e3a725a..1eb15e944a9 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -29,5 +29,50 @@
                 </xpath>
              </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_event_form_inherit">
+            <field name="name">Events Inherit</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="event.view_event_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Event Items">
+                        <field name="event_item_ids" nolabel="1"/>
+                    </page>
+                </xpath>                
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_event_items_tree">
+            <field name="name">Event Items Tree</field>
+            <field name="model">event.items</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Event Items">
+                    <field name="product_id"/>
+                    <field name="price"/>
+                    <field name="uom_id"/>
+                    <field name="discount"/>                  
+                    <field name="sales_end_date"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_event_items_form">
+            <field name="name">Event Items Form</field>
+            <field name="model">event.items</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Event Items">
+                    <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+                    <field name="price"/>
+                    <field name="uom_id"/>
+                    <field name="discount"/>
+                    <field name="sales_end_date"/>
+                </form>
+            </field>
+        </record>
+        
     </data>
 </openerp>

From aa8e83ea2d44f8e59f4b6dee915f0aea101063fa Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 2 Apr 2012 18:06:51 +0530
Subject: [PATCH 046/126] [IMP] account, sale, purchase : Cleanup the use of
 dicts, remove the automatic email send by the EDI and use proper template
 based on an XML ID.

bzr revid: mdi@tinyerp.com-20120402123651-ekqw8z66ltpqnxgz
---
 addons/account/account_invoice.py                  | 7 ++++---
 addons/account/edi/invoice.py                      | 4 +---
 addons/account/edi/invoice_action_data.xml         | 4 ++++
 addons/purchase/edi/purchase_order.py              | 4 +---
 addons/purchase/edi/purchase_order_action_data.xml | 6 +++++-
 addons/purchase/purchase.py                        | 9 ++++-----
 addons/sale/edi/sale_order.py                      | 6 ++----
 addons/sale/edi/sale_order_action_data.xml         | 4 ++++
 addons/sale/sale.py                                | 7 ++++---
 9 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 8d0d185db23..d715778584f 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -388,11 +388,12 @@ class account_invoice(osv.osv):
 
     def action_invoice_sent(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
-        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'account.invoice')], context=context)[0]
+        template = mod_obj.get_object_reference(cr, uid, 'account', 'email_template_edi_invoice')
+        template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = context.copy()
-        ctx.update({'active_model': 'account.invoice', 'active_id': ids[0], 'mail.compose.template_id': template_id})
+        ctx = dict(context, active_model='account.invoice', active_id=ids[0])
+        ctx.update({'mail.compose.template_id': template_id})
         return {
                 'view_type': 'form',
                 'view_mode': 'form',
diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
index eb9f97c80db..6e4d601e987 100644
--- a/addons/account/edi/invoice.py
+++ b/addons/account/edi/invoice.py
@@ -79,9 +79,7 @@ class account_invoice(osv.osv, EDIMixin):
         invoice_objs = self.browse(cr, uid, ids, context=context) 
         edi_token = self.pool.get('edi.document').export_edi(cr, uid, invoice_objs, context = context)[0]
         web_root_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-        edi_context = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
-        ctx = context.copy()
-        ctx.update(edi_context)
+        ctx = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
         return super(account_invoice, self).action_invoice_sent(cr, uid, ids, context=ctx)
 
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index ce837c6662b..4dd225a493d 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -2,6 +2,7 @@
 <openerp>
     <data>
         <!-- EDI Export + Send email Action  -->
+        <!--
         <record id="ir_actions_server_edi_invoice" model="ir.actions.server">
             <field name="code">if (object.type in ('out_invoice', 'out_refund')) and not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)</field>
             <field eval="6" name="sequence"/>
@@ -11,6 +12,7 @@
             <field name="condition">True</field>
             <field name="name">Auto-email confirmed invoices</field>
         </record>
+        -->
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -31,9 +33,11 @@
          so users can freely customize/delete them -->
     <data noupdate="1">
         <!-- bind the mailing server action to invoice open activity -->
+        <!--
         <record id="account.act_open" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_invoice"/>
         </record>
+        -->
 
         <!--Email template -->
         <record id="email_template_edi_invoice" model="email.template">
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index 1994668b35b..3a82e990a14 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -69,9 +69,7 @@ class purchase_order(osv.osv, EDIMixin):
         purchase_objs = self.browse(cr, uid, ids, context=context) 
         edi_token = self.pool.get('edi.document').export_edi(cr, uid, purchase_objs, context = context)[0]
         web_root_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-        edi_context = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
-        ctx = context.copy()
-        ctx.update(edi_context)
+        ctx = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
         return super(purchase_order, self).wkf_send_rfq(cr, uid, ids, context=ctx)
 
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index c4a7f75819a..5fafa1f4b1a 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -2,6 +2,7 @@
 <openerp>
     <data>
         <!--Export edi document  -->
+        <!--
         <record id="ir_actions_server_edi_purchase" model="ir.actions.server">
             <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='purchase.email_template_edi_purchase', context=context)</field>
             <field name="state">code</field>
@@ -10,6 +11,7 @@
             <field name="condition">True</field>
             <field name="name">Auto-email confirmed purchase orders</field>
         </record>
+        -->
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -27,9 +29,11 @@
          so users can freely customize/delete them -->
     <data noupdate="1">
          <!-- bind the mailing server action to purchase.order confirmed activity -->
+        <!--
         <record id="purchase.act_confirmed" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_purchase"/>
         </record>
+        -->
 
         <!--Email template -->
         <record id="email_template_edi_purchase" model="email.template">
@@ -151,4 +155,4 @@ ${object.company_id.website or ''}
             ]]></field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 7e5c28d0050..19e3ce5db95 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -327,13 +327,12 @@ class purchase_order(osv.osv):
 
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
-        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'purchase.order')], context=context)[0]
-
+        template = mod_obj.get_object_reference(cr, uid, 'purchase', 'email_template_edi_purchase')
+        template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-
-        ctx = context.copy()
-        ctx.update({'active_model': 'purchase.order', 'active_id': ids[0], 'mail.compose.template_id': template_id})
+        ctx = dict(context, active_model='purchase.order', active_id=ids[0])
+        ctx.update({'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index 02c6ce617e9..b49f6c1e415 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -71,9 +71,7 @@ class sale_order(osv.osv, EDIMixin):
         sale_objs = self.browse(cr, uid, ids, context=context) 
         edi_token = self.pool.get('edi.document').export_edi(cr, uid, sale_objs, context = context)[0]
         web_root_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-        edi_context = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
-        ctx = context.copy()
-        ctx.update(edi_context)
+        ctx = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
         return super(sale_order, self).action_quotation_sent(cr, uid, ids, context=ctx)
 
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
@@ -226,4 +224,4 @@ class sale_order_line(osv.osv, EDIMixin):
             edi_doc_list.append(edi_doc)
         return edi_doc_list
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 9fcee173014..a92c87de46f 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -2,6 +2,7 @@
 <openerp>
     <data>
         <!-- EDI Export + Send email Action  -->
+        <!--
         <record id="ir_actions_server_edi_sale" model="ir.actions.server">
             <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
             <field name="state">code</field>
@@ -10,6 +11,7 @@
             <field name="condition">True</field>
             <field name="name">Auto-email confirmed sale orders</field>
         </record>
+        -->
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -29,9 +31,11 @@
          so users can freely customize/delete them -->
     <data noupdate="1">
          <!-- bind the mailing server action to sale.order confirmed activity -->
+        <!--
         <record id="sale.act_wait_ship" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_sale"/>
         </record>
+        -->
 
 
         <!--Email template -->
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9eb1336a0d9..8f88e28a3b8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -730,11 +730,12 @@ class sale_order(osv.osv):
 
     def action_quotation_sent(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
-        template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'sale.order')], context=context)[0]
+        template = mod_obj.get_object_reference(cr, uid, 'sale', 'email_template_edi_sale')
+        template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = context.copy()
-        ctx.update({'active_model': 'sale.order', 'active_id': ids[0], 'mail.compose.template_id': template_id})
+        ctx = dict(context, active_model='sale.order', active_id=ids[0])
+        ctx.update({'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',

From 3eb66d427a23399cc61fe3e4b5dcf7b84b99644a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 3 Apr 2012 11:27:24 +0530
Subject: [PATCH 047/126] [IMP] email_template : Remove the subtype equal to
 html.

bzr revid: mdi@tinyerp.com-20120403055724-fi7jvk30ptnydy61
---
 addons/email_template/wizard/mail_compose_message.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index c68f884f7ef..a4fd749979c 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -102,14 +102,12 @@ class mail_compose_message(osv.osv_memory):
                             'res_id' : ids[0] if ids else False
                         }
                         att_ids.append(attachment_obj.create(cr, uid, data_attach))
-                    values['subtype'] = 'html'
                     values['attachment_ids'] = att_ids
         else:
             # restore defaults
             values = self.default_get(cr, uid, self.fields_get_keys(cr, uid), context)
             values.update(use_template=use_template, template_id=template_id)
 
-        values['subtype'] = 'html'    
         return {'value': values}
 
 

From 95952a8d56abb3c69e3597991b3c3819e65c8775 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 17 Apr 2012 15:03:40 +0530
Subject: [PATCH 048/126] [ADD] added functionality which checks the available
 seats at the time of confirming registration, and set current date in demo
 data inorder to show the upcoming events

bzr revid: bde@tinyerp.com-20120417093340-824lazijkbf83m1x
---
 addons/event/event.py       | 12 ++++++++++++
 addons/event/event_demo.xml |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..071835fa240 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -102,6 +102,14 @@ class event_event(osv.osv):
             total_confirmed = self.event.register_current
             if total_confirmed < self.event.register_min or total_confirmed > self.event.register_max and self.event.register_max!=0:
                 raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (self.event.name))
+            
+    def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
+        total_confirmed = self.browse(cr, uid, ids, context=context).register_current
+        register_max = self.browse(cr, uid, ids, context=context).register_max
+        available_seats = register_max - total_confirmed
+        if no_of_registration > available_seats:
+            raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+
 
     def confirm_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
@@ -295,6 +303,10 @@ class event_registration(osv.osv):
     def registration_open(self, cr, uid, ids, context=None):
         """ Open Registration
         """
+        event_obj = self.pool.get('event.event')
+        event_id = self.browse(cr, uid, ids, context=context)[0].event_id.id
+        no_of_registration = self.browse(cr, uid, ids, context=context)[0].nb_register
+        event_obj.check_registration_limits_before(cr, uid, event_id, no_of_registration, context=context)
         res = self.confirm_registration(cr, uid, ids, context=context)
         self.mail_user(cr, uid, ids, context=context)
         return res
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 96bc64e12aa..d5907b4bebf 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -38,16 +38,16 @@
 
     <record id="event_1" model="event.event">
         <field name="name">Opera of Verdi</field>
-        <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
+        <field eval="time.strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
     <record id="event_2" model="event.event">
         <field name="name">Conference on ERP Business</field>
-        <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
+        <field eval="time.strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
     </record>

From 27d279e3c3e21233005efa5b4c2aca788044f912 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 17 Apr 2012 17:01:20 +0530
Subject: [PATCH 049/126] [IMP] improved the date manipulation in
 event/event_demo.xml

bzr revid: bde@tinyerp.com-20120417113120-cm6tro3par1vtpy2
---
 addons/event/event_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index d5907b4bebf..81dad07b5e4 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -38,16 +38,16 @@
 
     <record id="event_1" model="event.event">
         <field name="name">Opera of Verdi</field>
-        <field eval="time.strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
+        <field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
     <record id="event_2" model="event.event">
         <field name="name">Conference on ERP Business</field>
-        <field eval="time.strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
     </record>

From 89547acdfb6d883b6fc5c8790dbd2cc3abadedca Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 18 Apr 2012 14:56:37 +0530
Subject: [PATCH 050/126] [ADD] added text area in kanban view inorder to input
 number of seats

bzr revid: bde@tinyerp.com-20120418092637-uprsxgafbu1tl8vw
---
 addons/event/__openerp__.py           | 3 +++
 addons/event/event.py                 | 6 +++++-
 addons/event/event_view.xml           | 1 +
 addons/event/static/src/css/event.css | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..b9753835aeb 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,6 +54,9 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
+    'js': [
+        #'static/src/js/event.js',
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..27b8269db20 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -215,10 +215,13 @@ class event_event(osv.osv):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
         user = user_pool.browse(cr, uid, uid, context=context)
+        print "user", user
         curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
+        print "curr_reg_ids", curr_reg_ids
         #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
         if not curr_reg_ids:
-            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id,})]
+            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': 5})]
+            print "::::::::::::::", curr_reg_ids
         return register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)
 
     def unsubscribe_to_event(self, cr, uid, ids, context=None):
@@ -288,6 +291,7 @@ class event_registration(osv.osv):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def confirm_registration(self, cr, uid, ids, context=None):
+        print "confirm_registrationconfirm_registration"
         self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4e22569c3e1..d4bbe059084 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -203,6 +203,7 @@
                             </p>
                             <t t-if="record.register_avail.raw_value != 0">
                               <t t-if="!record.is_subscribed.raw_value">
+                                  <textarea class="no_of_seats"/>
                                   <button type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index a0f738e6323..52cf194dbe7 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -115,4 +115,7 @@ div.oe_fold_column{
    display: inline;
    background-color: #DC5F59;
  }
+ .no_of_seats{
+    width:40px;
+ }
 

From 6dbbf9e79d16f83d46087b50466c34827823e582 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 19 Apr 2012 12:23:06 +0530
Subject: [PATCH 051/126] [IMP] resolve conflicts

bzr revid: psi@tinyerp.com-20120419065306-2ie570l1mpu9jegt
---
 addons/mail/wizard/mail_compose_message.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 107ddfbe764..59554acd57b 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -259,12 +259,7 @@ class mail_compose_message(osv.osv_memory):
                         attachments=attachment, references=references, res_id=int(mail.res_id),
                         subtype=mail.subtype, headers=headers, context=context)]
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
-<<<<<<< TREE
-                mail_message.send(cr, uid, [msg_id], context=context)
-=======
                 mail_message.send(cr, uid, msg_ids, context=context)
-
->>>>>>> MERGE-SOURCE
         return {'type': 'ir.actions.act_window_close'}
 
     def render_template(self, cr, uid, template, model, res_id, context=None):

From 2a6a022d032bc3ebd52d93d2b9db8da8e3165bf2 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 19 Apr 2012 14:37:08 +0530
Subject: [PATCH 052/126] [IMP] remove conflicts

bzr revid: psi@tinyerp.com-20120419090708-ezvbeb00093ojkrt
---
 addons/account/account_invoice_view.xml |  9 +--
 addons/hr_holidays/hr_holidays_view.xml | 14 ----
 addons/sale/sale.py                     | 94 -------------------------
 addons/sale/sale_view.xml               | 67 ++++++------------
 4 files changed, 21 insertions(+), 163 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 88af88ac4e1..ac0fd9de962 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -303,18 +303,11 @@
                                     <button name="action_invoice_sent" type="object" string="Send By Email" icon="terp-mail-message-new" states="open"/>
                                     <button name="invoice_print" string="Print Invoice" type="object" icon="gtk-print" states="open"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='sent,paid' icon="gtk-execute"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open,sent" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-<<<<<<< TREE
-=======
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
->>>>>>> MERGE-SOURCE
                                 </group>
                             </group>
                         </page>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b0db225df25..3006f50302e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -87,17 +87,10 @@
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
-<<<<<<< TREE
                             <newline/>
                             <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
                             <group colspan="2" col="6">
                                 <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-=======
-                            <group colspan="4" col="8">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
->>>>>>> MERGE-SOURCE
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
@@ -138,17 +131,10 @@
                         <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                         <separator string="Reasons" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4"/>
-<<<<<<< TREE
                         <newline/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
                         <group colspan="2" col="6">
                             <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-=======
-                        <group colspan="4" col="8">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
-                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
->>>>>>> MERGE-SOURCE
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 43209ad4bcf..71846387f65 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1473,98 +1473,6 @@ class sale_order_line(osv.osv):
 
 sale_order_line()
 
-<<<<<<< TREE
-class sale_config_picking_policy(osv.osv_memory):
-    _name = 'sale.config.picking_policy'
-    _inherit = 'res.config'
-
-    _columns = {
-        'name': fields.char('Name', size=64),
-        'sale_orders': fields.boolean('Based on Sales Orders',),
-        'deli_orders': fields.boolean('Based on Delivery Orders'),
-        'task_work': fields.boolean('Based on Tasks\' Work'),
-        'timesheet': fields.boolean('Based on Timesheet'),
-        'order_policy': fields.selection([
-            ('manual', 'Invoice Based on Sales Orders'),
-            ('picking', 'Invoice Based on Deliveries'),
-        ], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."),
-        'charge_delivery': fields.boolean('Do you charge the delivery?'),
-        'time_unit': fields.many2one('product.uom','Main Working Time Unit')
-    }
-    _defaults = {
-        'order_policy': 'manual',
-        'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False,
-    }
-
-    def onchange_order(self, cr, uid, ids, sale, deli, context=None):
-        res = {}
-        if sale:
-            res.update({'order_policy': 'manual'})
-        elif deli:
-            res.update({'order_policy': 'picking'})
-        return {'value':res}
-
-    def execute(self, cr, uid, ids, context=None):
-        ir_values_obj = self.pool.get('ir.values')
-        data_obj = self.pool.get('ir.model.data')
-        menu_obj = self.pool.get('ir.ui.menu')
-        module_obj = self.pool.get('ir.module.module')
-        module_upgrade_obj = self.pool.get('base.module.upgrade')
-        module_name = []
-
-        group_id = data_obj.get_object(cr, uid, 'base', 'group_sale_salesman').id
-
-        wizard = self.browse(cr, uid, ids)[0]
-
-        if wizard.sale_orders:
-            menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').id
-            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
-
-        if wizard.deli_orders:
-            menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').id
-            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
-
-        if wizard.task_work:
-            module_name.append('project_timesheet')
-            module_name.append('project_mrp')
-            module_name.append('account_analytic_analysis')
-
-        if wizard.timesheet:
-            module_name.append('account_analytic_analysis')
-
-        if wizard.charge_delivery:
-            module_name.append('delivery')
-
-        if len(module_name):
-            module_ids = []
-            need_install = False
-            module_ids = []
-            for module in module_name:
-                data_id = module_obj.name_search(cr, uid , module, [], '=')
-                module_ids.append(data_id[0][0])
-
-            for module in module_obj.browse(cr, uid, module_ids):
-                if module.state == 'uninstalled':
-                    module_obj.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
-                    need_install = True
-                    cr.commit()
-            if need_install:
-                pooler.restart_pool(cr.dbname, update_module=True)[1]
-
-        if wizard.time_unit:
-            prod_id = data_obj.get_object(cr, uid, 'product', 'product_consultant').id
-            product_obj = self.pool.get('product.product')
-            product_obj.write(cr, uid, prod_id, {'uom_id':wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
-
-        ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)
-        if wizard.task_work and wizard.time_unit:
-            company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-            self.pool.get('res.company').write(cr, uid, [company_id], {
-                'project_time_mode_id': wizard.time_unit.id
-            }, context=context)
-
-sale_config_picking_policy()
-
 class mail_message(osv.osv):
     _name = 'mail.message'
     _inherit = 'mail.message'
@@ -1577,6 +1485,4 @@ class mail_message(osv.osv):
 
 mail_message()
 
-=======
->>>>>>> MERGE-SOURCE
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5c8db74b15d..025d27e48b1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -97,22 +97,27 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form layout="manual">
-                <div class="oe_form_topbar">
-                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
-                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                    <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                    <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    <div class="oe_form_topbar">
+                        <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
+                        <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
+                        <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order" icon="gtk-ok"/>
+                        <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
+                        <button name="action_quotation_sent" string="Send" type="object" icon="terp-mail-message-new" states="draft"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+                        <button name="action_cancel_draft" states="sent,cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                        <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
+                        <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
+                        <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object" 
+                                attrs="{'invisible': ['|','|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking'),
+                                '&amp;','&amp;',('order_policy','=','postpaid'),('state', '=','progress'),('shipped','=',False)]}"/>
+                        <button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object" 
+                                attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
+                        <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>
+                        <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                        <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
+                        <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Sales Order" layout="auto">
@@ -206,37 +211,6 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-<<<<<<< TREE
-                            <newline/>
-                            <group col="13" colspan="10">
-                                <field name="amount_untaxed" sum="Untaxed amount"/>
-                                <field name="amount_tax"/>
-                                <field name="amount_total"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
-                            </group>
-                            <group col="17" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                                <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                                <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order" icon="gtk-ok"/>
-                                <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                                <button name="action_quotation_sent" string="Send" type="object" icon="terp-mail-message-new" states="draft"/>
-                                <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                                <button name="action_cancel_draft" states="sent,cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
-                                <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
-                                <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object" 
-                                		attrs="{'invisible': ['|','|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking'),
-                                		'&amp;','&amp;',('order_policy','=','postpaid'),('state', '=','progress'),('shipped','=',False)]}"/>
-								<button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object" 
-								attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
-                                <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                            </group>
-=======
 
                             <div class="oe_right">
                                 <group col="2">
@@ -249,7 +223,6 @@
 
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
->>>>>>> MERGE-SOURCE
                         </page>
                         <page string="Other Information">
                             <group colspan="2" col="2" groups="base.group_extended" name="logistics">

From 6a15e8bf4a84355acdbf0bdb2fe3dd77e23108fb Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 19 Apr 2012 17:45:06 +0530
Subject: [PATCH 053/126] [ADD] added image on home page dashboard for event
 module

bzr revid: bde@tinyerp.com-20120419121506-o0fgrf39f306r9h0
---
 addons/event/event_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f3f3c165f93..bff081c1911 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-        <menuitem  name="Events" id="event_main_menu"/>
+        <menuitem  name="Events" id="event_main_menu" 
+            web_icon="images/icon.png"
+            web_icon_hover="images/icon.png"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
     <!-- EVENTS  -->

From edd102bc770c84f546dd45147bbc07feca762145 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 23 Apr 2012 11:37:44 +0530
Subject: [PATCH 055/126] [IMP]: Improve code.

bzr revid: atp@tinyerp.com-20120423060744-gx0jm63z8ba6cq5i
---
 addons/event/event.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index f8a15112bfa..a633dc41961 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -115,12 +115,10 @@ class event_event(osv.osv):
             
     def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
         available_seats = self.check_available_seats(cr, uid, ids, context=context)
-        if no_of_registration > available_seats:
-            if available_seats == 0:
-                raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
-            else:
-                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
-
+        if available_seats and no_of_registration > available_seats:
+             raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+        elif available_seats == 0:
+            raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
 
     def confirm_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
@@ -231,16 +229,10 @@ class event_event(osv.osv):
     }
 
     def subscribe_to_event(self, cr, uid, ids, context=None):
-        num_of_seats = int(context.get('ticket', 1))
-        available_seats = self.check_available_seats(cr, uid, ids, context=context)
-        if num_of_seats > available_seats:
-            if available_seats == 0:
-                raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
-            else:
-                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
-
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
+        num_of_seats = int(context.get('ticket', 1))
+        self.check_registration_limits_before(cr, uid, ids, num_of_seats, context=context)
         user = user_pool.browse(cr, uid, uid, context=context)
         curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
         #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe

From fa10c5cec773a0b68d52522ec500c3e87d35d76e Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 27 Apr 2012 15:02:42 +0530
Subject: [PATCH 056/126] [imp] change the event view.

bzr revid: nco@tinyerp.com-20120427093242-o9srduq715lbqt8t
---
 addons/event/__openerp__.py           |   2 +-
 addons/event/event.py                 |   5 +-
 addons/event/event_view.xml           | 119 ++++++++++++++++++++++----
 addons/event/static/src/css/event.css |  36 +++++++-
 addons/event_sale/__openerp__.py      |   5 +-
 addons/event_sale/event_sale.py       |  51 +++++++++--
 addons/event_sale/event_sale_view.xml |  92 +++++++++++---------
 7 files changed, 238 insertions(+), 72 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..6de6d2c62c1 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,7 +53,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'css': ['static/src/css/event.css'],
+    'css': ['static/src/css/*.css'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event.py b/addons/event/event.py
index a633dc41961..7eacad489ff 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -220,6 +220,8 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
+        'location_id': fields.many2one('res.company','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        
     }
 
     _defaults = {
@@ -408,6 +410,5 @@ class event_registration(osv.osv):
         return {'value': data}
 
 event_registration()
-
-
+    
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a9dbca304f4..efa5eb68384 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,6 +45,39 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
+
+		<!-- Event Item Tree view-->
+    	<record model="ir.ui.view" id="view_event_items_tree">
+            <field name="name">Event Items Tree</field>
+            <field name="model">event.items</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Event Items">
+                    <field name="product_id"  string="Ticket Type" />
+                    <field name="uom_id"/>
+                    <field name="sales_end_date"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                </tree>
+            </field>
+        </record>
+        <!-- Event Item Form View -->
+        <record model="ir.ui.view" id="view_event_items_form">
+            <field name="name">Event Items Form</field>
+            <field name="model">event.items</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Event Items">
+                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                    <field name="uom_id"/>
+                    <field name="discount"/>
+                    <field name="sales_end_date"/>
+                </form>
+            </field>
+        </record>
+
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
@@ -52,20 +85,75 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="date_begin"/>
-                        <field name="date_end"/>
-                        <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="user_id"/>
-                        <field name="address_id" />
-                    </group>
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+            	<sheet string="Event Form" layout="auto">
+            		<group col="2">
+            			<group col="2">
+		                	<div class="oe_event_title">
+		                    	<field name="name" nolabel="1"/>
+		                    </div>
+		                    <newline/>
+		                    <group colspan="4" string="vanue">
+                            	<div class="sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<field name="location_id" nolabel="1"/> 
+                        	</group>
+			             </group>	
+			             <group>
+			             	<div class="mapbox"> </div><newline/>
+		                    <!--table>
+		                        <tr>
+		                        <td width="70px" style="text-align:top;"  class="oe_td_border">
+		                            Where
+		                        </td>
+		                        <td width="150px">
+		                            <field name="address_id" nolabel="1"/>
+		                                
+		                        </td>
+		                        <td width="150px">
+									<span width="15px"> Start</span> <field name="date_begin" nolabel="1"/>   
+									<span width="15px"> End</span> <field name="date_end" nolabel="1"/>    
+		                        </td>
+		                        </tr>
+		                   </table-->   
+		                   <table>
+		                   	<tr>
+		                    	<td width="70px" class="oe_td_border">
+		                            Where
+		                        </td>
+		                        <td width="150px">
+		                            <field name="address_id" nolabel="1"/>
+		                        </td>
+		                        <td width="auto">
+                             		<table>
+										<tr>
+											<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
+										</tr>
+										<tr>
+											<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+										</tr>
+									</table>
+                                 
+		                        </td>
+		                     </tr>
+		                   </table>   
+		                      <!--field name="date_end" label="To" string="end"/-->
+					       
+			             </group>
+                    </group>	
                     <notebook colspan="4">
                     <page string="Event">
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -98,13 +186,7 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
+                        
                     </page>
                     <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -112,7 +194,7 @@
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info">
+                    <page string="Extra Info" groups="event.group_event_manager">
                         <group col="2" colspan="2">
                             <separator string="Registrations" colspan="2"/>
                             <field name="register_min"/>
@@ -129,6 +211,7 @@
                         </group>
                     </page>
                     </notebook>
+                    </sheet>
             </form>
             </field>
         </record>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 0d0282826b7..f8fe5c04c86 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -64,6 +64,7 @@ div.oe_fold_column{
     -webkit-font-smoothing: antialiased;
     outline: none;
 }
+
 .oe_event_button_unsubscribe {
   display: inline-block;
     border: 1px solid #AAA;
@@ -116,7 +117,36 @@ div.oe_fold_column{
    background-color: #DC5F59;
  }
  .no_of_seats{
-    width:25px;
-    
+    width:25px;    
  }
-
+.oe_event_title{
+  font-size: 25px;
+}
+.sub1
+{
+    float:left;
+}
+.sub2
+{
+    padding-left:50px;
+    text-align:left;
+}
+.mapbox
+{ 
+    width:380px;
+    height:200px;
+    border:1px; 
+    margin-left:auto; 
+    margin-right:auto; 
+    border:solid #677933;
+}
+.oe_td_border
+{
+	width: 5em;
+	padding: 2px;
+	border-right: 1px solid black;
+}
+.oe_td_date_border
+{
+	border-right:1px solid black;
+}
\ No newline at end of file
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index d8f689986e2..be60ed3fdf6 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -34,12 +34,15 @@ This module allows you to automatize and connect your registration creation with
 It defines a new kind of service products that offers you the possibility to choose an event category associated with it. When you encode a sale order for that product, you will be able to choose an existing event of that category and when you confirm your sale order it will automatically create a registration for this event.
 """,
     'author': 'OpenERP SA',
-    'depends': ['event','sale','sale_crm'],
+    'depends': ['event','sale','sale_crm','portal'],
     'update_xml': [
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
+    'js': ['static/src/js/*.js'],
+    'html': ['static/*.html'],
     'test':['test/confirm.yml'],
+    'css': ['static/src/css/*.css'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0208714b083..93be776d336 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import time
 from osv import fields, osv
 from tools.translate import _
 
@@ -92,13 +93,53 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-    
+  
 class event_event(osv.osv):
     _inherit = 'event.event'
     _columns = {
-        'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
-    }
-    
+                    'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
+                }
+
+    def make_order(self, cr, uid, ids, partner_id, context=None):
+        sale_order = self.pool.get('sale.order')
+        sale_order_line_obj = self.pool.get('sale.order.line')
+        res_partner_obj = self.pool.get('res.partner')
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        res_users_obj = self.pool.get('res.users')
+        customer = res_partner_obj.browse(cr, uid, partner_id, context=context)
+        partner_id = res_users_obj.browse(cr, uid, uid, context=context).partner_id.id
+        if not partner_id:
+            user_name = res_users_obj.browse(cr, uid, uid, context=context).name
+            partner_id =  res_partner_obj.create(cr, uid, {'name': user_name})
+        
+        price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+        
+        for order_lines in self.browse(cr, uid, ids, context=context):
+            if order_lines.event_item_ids:
+                product = order_lines.id
+                sale_id = sale_order.create(cr, uid, {
+                            'partner_id': partner_id,
+                            'pricelist_id': price_list,
+                            'partner_invoice_id': partner_id,
+                            'partner_shipping_id': partner_id,
+                            'date_order': order_lines.date_begin
+                })
+            
+                for line in order_lines.event_item_ids:
+                    
+                    sale_order_line_obj.create(cr, uid, {
+                        'order_id': sale_id,
+                        'name': order_lines.name,
+                        'product_uom_qty': line.qty,
+                        'product_id': product,
+                        'product_uom': line.uom_id.id,
+                        'price_unit': line.price,
+                        'date_planned': line.sales_end_date,
+                    }, context=context)
+            self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+        return True
+
+
 class event_items(osv.osv):
     _name = "event.items"
     _columns = {
@@ -110,7 +151,7 @@ class event_items(osv.osv):
         'event_id': fields.many2one('event.event', 'Event'),
         'sales_end_date': fields.date('Sales End')
         }
-    
+   
     def onchange_product_id(self, cr, uid, ids, product, context=None):
         product_obj = self.pool.get('product.product')
         data = {}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 1eb15e944a9..ff0ead161d5 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,49 +30,57 @@
              </field>
         </record>
         
-        <record model="ir.ui.view" id="view_event_form_inherit">
-            <field name="name">Events Inherit</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="event.view_event_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook[last()]" position="inside">
-                    <page string="Event Items">
-                        <field name="event_item_ids" nolabel="1"/>
-                    </page>
-                </xpath>                
-            </field>
-        </record>
+		<record model="ir.ui.view" id="view_event_form_inherit">
+			<field name="name">Events Inherit</field>
+			<field name="model">event.event</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="event.view_event_form"/>
+			<field name="arch" type="xml">
+				<xpath expr="//group[@string='vanue']" position="after">
+						<field name="event_item_ids" nolabel="1"/><newline/>
+						<div class="oe_right">
+							<button string="Order Now" name="make_order" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
+						</div>
+				</xpath>
+				<xpath expr="//group[@string='vanue']" position="attributes">
+                    <attribute name="string"></attribute>
+                </xpath>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_event_items_tree">
+			 <field name="name">Event Items Tree</field>
+			 <field name="model">event.items</field>
+			 <field name="type">tree</field>
+			 <field name="arch" type="xml">
+				 <tree string="Event Items">
+					 <field name="product_id"/>
+					 <field name="price"/>
+					 <field name="qty"/>
+					 <field name="uom_id"/>
+					 <field name="discount"/>
+					 <field name="sales_end_date"/>
+				 </tree>
+			 </field>
+		 </record>
+
+
+		<record model="ir.ui.view" id="view_event_items_form">
+			 <field name="name">Event Items Form</field>
+			 <field name="model">event.items</field>
+			 <field name="type">form</field>
+		 	 <field name="arch" type="xml">
+			 	 <form string="Event Items">
+			   	 	<field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+			        <field name="price"/>
+			        <field name="qty"/>
+					<field name="uom_id"/>
+					<field name="discount"/>
+					<field name="sales_end_date"/>
+				</form>
+		 	</field>
+		</record>
         
-        <record model="ir.ui.view" id="view_event_items_tree">
-            <field name="name">Event Items Tree</field>
-            <field name="model">event.items</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Event Items">
-                    <field name="product_id"/>
-                    <field name="price"/>
-                    <field name="uom_id"/>
-                    <field name="discount"/>                  
-                    <field name="sales_end_date"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="view_event_items_form">
-            <field name="name">Event Items Form</field>
-            <field name="model">event.items</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Event Items">
-                    <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-                    <field name="price"/>
-                    <field name="uom_id"/>
-                    <field name="discount"/>
-                    <field name="sales_end_date"/>
-                </form>
-            </field>
-        </record>
         
     </data>
 </openerp>

From 66814b5501edfc5aab0dd54eb161e488b8d23462 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 27 Apr 2012 15:16:34 +0530
Subject: [PATCH 057/126] [imp] event : remove unused code.

bzr revid: nco@tinyerp.com-20120427094634-foba34c88a4mn2ja
---
 addons/event/event.py                 |  2 +-
 addons/event/event_view.xml           | 63 ++++++++++-----------------
 addons/event/static/src/css/event.css |  9 +---
 addons/event_sale/__openerp__.py      |  3 --
 4 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 7eacad489ff..5e948c1a59b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -220,7 +220,7 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'location_id': fields.many2one('res.company','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'location_id': fields.many2one('res.company','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
         
     }
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index efa5eb68384..4e61844db80 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -103,50 +103,33 @@
 		                    </div>
 		                    <newline/>
 		                    <group colspan="4" string="vanue">
-                            	<div class="sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
                             	<field name="location_id" nolabel="1"/> 
                         	</group>
 			             </group>	
 			             <group>
-			             	<div class="mapbox"> </div><newline/>
-		                    <!--table>
-		                        <tr>
-		                        <td width="70px" style="text-align:top;"  class="oe_td_border">
-		                            Where
-		                        </td>
-		                        <td width="150px">
-		                            <field name="address_id" nolabel="1"/>
-		                                
-		                        </td>
-		                        <td width="150px">
-									<span width="15px"> Start</span> <field name="date_begin" nolabel="1"/>   
-									<span width="15px"> End</span> <field name="date_end" nolabel="1"/>    
-		                        </td>
-		                        </tr>
-		                   </table-->   
-		                   <table>
-		                   	<tr>
-		                    	<td width="70px" class="oe_td_border">
-		                            Where
-		                        </td>
-		                        <td width="150px">
-		                            <field name="address_id" nolabel="1"/>
-		                        </td>
-		                        <td width="auto">
-                             		<table>
-										<tr>
-											<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
-										</tr>
-										<tr>
-											<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-										</tr>
-									</table>
-                                 
-		                        </td>
-		                     </tr>
-		                   </table>   
-		                      <!--field name="date_end" label="To" string="end"/-->
-					       
+			             	<div class="oe_mapbox"> </div><newline/>
+		                    <table>
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="150px">
+			                            <field name="address_id" nolabel="1"/>
+			                        </td>
+			                        <td width="auto">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+											</tr>
+										</table>
+	                                 
+			                        </td>
+			                     </tr>
+		                     </table>   
 			             </group>
                     </group>	
                     <notebook colspan="4">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f8fe5c04c86..d89131fe82f 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -122,16 +122,11 @@ div.oe_fold_column{
 .oe_event_title{
   font-size: 25px;
 }
-.sub1
+.oe_sub1
 {
     float:left;
 }
-.sub2
-{
-    padding-left:50px;
-    text-align:left;
-}
-.mapbox
+.oe_mapbox
 { 
     width:380px;
     height:200px;
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index be60ed3fdf6..fb7134f6070 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -39,10 +39,7 @@ It defines a new kind of service products that offers you the possibility to cho
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'js': ['static/src/js/*.js'],
-    'html': ['static/*.html'],
     'test':['test/confirm.yml'],
-    'css': ['static/src/css/*.css'],
     'installable': True,
     'active': False,
 }

From 8d91d9a580d9a3333e09220cada6ecd4ed01fbce Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 30 Apr 2012 13:09:03 +0530
Subject: [PATCH 058/126] [IMP]: Improve code . remove unused code.

bzr revid: atp@tinyerp.com-20120430073903-52rcd0khdkcyx292
---
 addons/event/event_view.xml                   |  2 +-
 addons/event_sale/event_sale.py               | 23 ++++---
 addons/event_sale/event_sale_view.xml         |  9 +--
 addons/portal_event/__init__.py               | 22 ++++++
 addons/portal_event/__openerp__.py            | 40 +++++++++++
 addons/portal_event/portal_event.py           | 69 +++++++++++++++++++
 .../portal_event/security/ir.model.access.csv |  4 ++
 .../security/portal_event_security.xml        | 33 +++++++++
 8 files changed, 184 insertions(+), 18 deletions(-)
 create mode 100644 addons/portal_event/__init__.py
 create mode 100644 addons/portal_event/__openerp__.py
 create mode 100644 addons/portal_event/portal_event.py
 create mode 100644 addons/portal_event/security/ir.model.access.csv
 create mode 100644 addons/portal_event/security/portal_event_security.xml

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c6cf379ffb7..92e850c011e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -102,7 +102,7 @@
 		                    	<field name="name" nolabel="1"/>
 		                    </div>
 		                    <newline/>
-		                    <group colspan="4" string="vanue">
+		                    <group colspan="4" name="venue">
                             	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
                             	<field name="location_id" nolabel="1"/> 
                         	</group>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 1e0e745edce..911d316cca8 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -35,15 +35,6 @@ class product(osv.osv):
 
 product()
 
-class sale_order(osv.osv):
-    _inherit = 'sale.order'
-    _columns = {
-    'partner_id': fields.many2one('res.partner', 'Customer', readonly=False, states={'draft': [('readonly', False)]}, required=False, change_default=True, select=True),
-    'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=False, required=False, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
-    'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=False, required=False, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
-    }
-    
-
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _columns = {
@@ -108,13 +99,20 @@ class event_event(osv.osv):
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
 
-    def open_qoutation(self, cr, uid, ids, partner_id, context=None):
+    def make_quotation(self, cr, uid, ids, context=None):
         res = {}
         event_pool = self.pool.get('event.event')
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
         user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+        partner_pool = self.pool.get("res.partner")
+        new_partner_id = False
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if not partner_ids:
+            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+            partner_invoice_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
         for event_id in self.browse(cr, uid, ids, context=context):
             prod_pricelist_obj = self.pool.get('product.pricelist')
             sale_order_lines = []
@@ -122,6 +120,9 @@ class event_event(osv.osv):
             new_sale_id = sale_order.create(cr, uid, {
                 'date_order': event_id.date_begin,
                 'pricelist_id': price_list,
+                 'partner_id': new_partner_id, 
+                  'partner_invoice_id': partner_invoice_id,
+                 'partner_shipping_id': partner_shipping_id
                 })            
             if event_id.event_item_ids:
                 for items in event_id.event_item_ids:
@@ -145,7 +146,7 @@ class event_event(osv.osv):
                         'nodestroy': True,
                         'target': 'new',
                 }
-                self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+               # self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
         return res
 
 class event_items(osv.osv):
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 52a0723f950..7f1504b7b69 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -36,15 +36,12 @@
 			<field name="type">form</field>
 			<field name="inherit_id" ref="event.view_event_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//group[@string='vanue']" position="after">
+				<xpath expr="//group[@name='venue']" position="after">
 						<field name="event_item_ids" nolabel="1"/><newline/>
 						<div class="oe_right">
-							<button string="Order Now" name="open_qoutation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
+							<button string="Order Now" name="make_quotation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
 						</div>
 				</xpath>
-				<xpath expr="//group[@string='vanue']" position="attributes">
-                    <attribute name="string"></attribute>
-                </xpath>
 			</field>
 		</record>
 
@@ -53,7 +50,7 @@
 			 <field name="model">event.items</field>
 			 <field name="type">tree</field>
 			 <field name="arch" type="xml">
-				 <tree string="Event Items">
+				 <tree editable="top" string="Event Items">
 					 <field name="product_id"/>
 					 <field name="price"/>
 					 <field name="qty"/>
diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py
new file mode 100644
index 00000000000..70c078b769d
--- /dev/null
+++ b/addons/portal_event/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import portal_event
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
new file mode 100644
index 00000000000..88ca9815323
--- /dev/null
+++ b/addons/portal_event/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name' : "Portal Event",
+    'version' : "1.0",
+    'depends' : ["portal", "event_sale"],
+    'author' : "OpenERP SA",
+    'category': 'Portal',
+    'description': """
+This module defines 'portals' to customize the access to your OpenERP database
+for external users.
+    """,
+    'update_xml': [
+        'security/portal_event_security.xml',
+        'security/ir.model.access.csv',
+    ],    
+    'website': 'http://www.openerp.com',
+    'installable': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
new file mode 100644
index 00000000000..41a7d81bcc5
--- /dev/null
+++ b/addons/portal_event/portal_event.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from osv import fields, osv
+from tools.translate import _
+
+class event_event(osv.osv):
+    _inherit = 'event.event'
+
+    def make_quotation(self, cr, uid, ids, partner_id, context=None):
+        event_pool = self.pool.get('event.event')
+        register_pool = self.pool.get('event.registration')
+        sale_order_line_pool = self.pool.get('sale.order.line')
+        sale_order = self.pool.get('sale.order')
+        res_partner_obj = self.pool.get('res.partner')
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        res_users_obj = self.pool.get('res.users')
+        customer = res_partner_obj.browse(cr, uid, partner_id, context=context)
+        
+        partner_id = res_users_obj.browse(cr, uid, uid, context=context).partner_id.id
+        if not partner_id:
+              raise osv.except_osv(_('Error !'),
+                                    _('There is no Partner defined ' \
+                                            'for this event:'))
+        
+        user_name = res_users_obj.browse(cr, uid, uid, context=context).name
+        price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+        for event_id in self.browse(cr, uid, ids, context=context):
+            sale_order_lines = []
+            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+            new_sale_id = sale_order.create(cr, uid, {
+                            'partner_id': partner_id,
+                            'pricelist_id': price_list,
+                            'partner_invoice_id': partner_id,
+                            'partner_shipping_id': partner_id,
+                            'date_order': event_id.date_begin
+                })            
+            if event_id.event_item_ids:
+                for items in event_id.event_item_ids:
+                    product = items.product_id.id
+                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+                        'order_id': new_sale_id,                                
+                        'name': items.product_id.name,
+                        'product_uom_qty': items.qty,
+                        'product_id': items.product_id.id,
+                        'product_uom': items.uom_id.id,
+                        'price_unit': items.price,
+                        'date_planned': items.sales_end_date,
+                    }, context=context)
+        return True
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
new file mode 100644
index 00000000000..2ca1e3def91
--- /dev/null
+++ b/addons/portal_event/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
+access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
+access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
new file mode 100644
index 00000000000..64c077c7bb9
--- /dev/null
+++ b/addons/portal_event/security/portal_event_security.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        <!-- Creating Portal Group -->
+        
+        <record id="group_event_portal" model="res.groups">
+            <field name="name">Portal User</field>
+            <field ref="event.module_category_event_management" name="category_id"/>
+        </record>
+        
+        <record id="portal_event" model="res.portal">
+            <field name="name">Events Portal</field>
+            <field name="group_id" ref="group_event_portal"/>
+        </record>
+            
+        <!-- Sale Portal Access Rules -->
+        <record id="portal_event_rule" model="ir.rule">
+            <field name="name">Personal Events</field>
+            <field ref="event.model_event_event" name="model_id"/>
+            <field name="domain_force">[]</field>
+            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
+        </record>
+        
+        <record id="portal_registration_rule" model="ir.rule">
+            <field name="name">Personal Registrations</field>
+            <field ref="event.model_event_registration" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
+        </record>        
+        
+    </data>
+</openerp>
\ No newline at end of file

From 4443f39f3854ce511dfe68a6f7660c97513dea84 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 30 Apr 2012 15:14:54 +0530
Subject: [PATCH 059/126] [FIX]: Fix some code error. add security rules for
 event module

bzr revid: atp@tinyerp.com-20120430094454-hcz6w2xvllg7g2b7
---
 addons/event_sale/event_sale.py               | 81 +++++++++++--------
 addons/portal_event/portal_event.py           | 42 +++-------
 .../portal_event/security/ir.model.access.csv |  4 +-
 .../security/portal_event_security.xml        |  4 +-
 4 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 911d316cca8..ee48956324f 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -105,48 +105,59 @@ class event_event(osv.osv):
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
         partner_pool = self.pool.get("res.partner")
-        new_partner_id = False
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
         partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
         if not partner_ids:
             new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+        else:
+            new_partner_id = partner_ids[0]
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
         for event_id in self.browse(cr, uid, ids, context=context):
-            prod_pricelist_obj = self.pool.get('product.pricelist')
             sale_order_lines = []
             price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_sale_id = sale_order.create(cr, uid, {
-                'date_order': event_id.date_begin,
-                'pricelist_id': price_list,
-                 'partner_id': new_partner_id, 
-                  'partner_invoice_id': partner_invoice_id,
-                 'partner_shipping_id': partner_shipping_id
-                })            
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id,                                
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'product_uom': items.uom_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-                res = {
-                        'name': _('Quotation'),
-                        'view_type': 'form',
-                        'view_mode': 'form',
-                        'res_model': 'sale.order',
-                        'res_id': new_sale_id,
-                        'type': 'ir.actions.act_window',
-                        'nodestroy': True,
-                        'target': 'new',
-                }
-               # self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+            sale_ids = sale_order.search(cr, uid, [('date_order', '=', event_id.date_begin), ('partner_id', '=', new_partner_id)])
+            if not sale_ids:
+#                    raise osv.except_osv(_('Error !'),
+#                        _('sale order is already Exists for this event:'))
+#            else:          
+                new_sale_id = sale_order.create(cr, uid, {
+                    'date_order': event_id.date_begin,
+                    'pricelist_id': price_list,
+                     'partner_id': new_partner_id, 
+                      'partner_invoice_id': partner_invoice_id,
+                     'partner_shipping_id': partner_shipping_id
+                    })            
+                if event_id.event_item_ids:
+                    for items in event_id.event_item_ids:
+                        product = items.product_id.id
+                        sale_order_line = sale_order_line_pool.create(cr, uid, {
+                            'order_id': new_sale_id,                                
+                            'name': items.product_id.name,
+                            'product_uom_qty': items.qty,
+                            'product_id': items.product_id.id,
+                            'product_uom': items.uom_id.id,
+                            'price_unit': items.price,
+                            'date_planned': items.sales_end_date,
+                        }, context=context)
+                    view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+                    if view_id:
+                        res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+                    res = {
+                            'name': _('Quotation'),
+                            'view_type': 'form',
+                            'view_mode': 'form',
+                            'res_model': 'sale.order',
+                            'res_id': new_sale_id,
+                            'views':[(res_id,'form'), (False, 'tree')],
+                            'type': 'ir.actions.act_window',
+                            'nodestroy': True,
+                            'target': 'current',
+                    }
         return res
 
 class event_items(osv.osv):
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
index 41a7d81bcc5..570bd3131b6 100644
--- a/addons/portal_event/portal_event.py
+++ b/addons/portal_event/portal_event.py
@@ -26,44 +26,22 @@ from tools.translate import _
 class event_event(osv.osv):
     _inherit = 'event.event'
 
-    def make_quotation(self, cr, uid, ids, partner_id, context=None):
+    def make_quotation(self, cr, uid, ids, context=None):
         event_pool = self.pool.get('event.event')
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
-        res_partner_obj = self.pool.get('res.partner')
+        partner_pool = self.pool.get('res.partner')
         prod_pricelist_obj = self.pool.get('product.pricelist')
         res_users_obj = self.pool.get('res.users')
-        customer = res_partner_obj.browse(cr, uid, partner_id, context=context)
-        
-        partner_id = res_users_obj.browse(cr, uid, uid, context=context).partner_id.id
-        if not partner_id:
+        user = res_users_obj.browse(cr, uid, uid, context=context)
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if partner_ids:
+            res_users_obj.write(cr, uid, user.id, {'partner_id': partner_ids[0]})        
+        if not partner_ids:
               raise osv.except_osv(_('Error !'),
                                     _('There is no Partner defined ' \
                                             'for this event:'))
-        
-        user_name = res_users_obj.browse(cr, uid, uid, context=context).name
-        price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-        for event_id in self.browse(cr, uid, ids, context=context):
-            sale_order_lines = []
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_sale_id = sale_order.create(cr, uid, {
-                            'partner_id': partner_id,
-                            'pricelist_id': price_list,
-                            'partner_invoice_id': partner_id,
-                            'partner_shipping_id': partner_id,
-                            'date_order': event_id.date_begin
-                })            
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id,                                
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'product_uom': items.uom_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-        return True
+        res = super(event_event,self).make_quotation(cr, uid, ids, context)              
+
+        return res
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
index 2ca1e3def91..0b3dfe5f3b2 100644
--- a/addons/portal_event/security/ir.model.access.csv
+++ b/addons/portal_event/security/ir.model.access.csv
@@ -1,4 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
 access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
-access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
\ No newline at end of file
+access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
+access_product_product,product.product,product.model_product_product,portal_event.group_event_portal,1,0,0,0
+access_product_uom,product.uom,product.model_product_uom,portal_event.group_event_portal,1,0,0,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
index 64c077c7bb9..1202fcce3f5 100644
--- a/addons/portal_event/security/portal_event_security.xml
+++ b/addons/portal_event/security/portal_event_security.xml
@@ -5,12 +5,12 @@
         <!-- Creating Portal Group -->
         
         <record id="group_event_portal" model="res.groups">
-            <field name="name">Portal User</field>
+            <field name="name">Event Portal Groups</field>
             <field ref="event.module_category_event_management" name="category_id"/>
         </record>
         
         <record id="portal_event" model="res.portal">
-            <field name="name">Events Portal</field>
+            <field name="name">Portal User</field>
             <field name="group_id" ref="group_event_portal"/>
         </record>
             

From 2d6fba0621c1cbd5e1a6d52e3e71adbc3208b628 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 2 May 2012 12:37:22 +0530
Subject: [PATCH 060/126] [ADD]: Add event_items one2many fields into event
 form view.

bzr revid: atp@tinyerp.com-20120502070722-3twkfw14q89nznuo
---
 addons/event/event.py                 |   2 -
 addons/event/event_view.xml           | 152 ++++++++++++++++++++------
 addons/event/static/src/css/event.css |   3 +-
 addons/event_sale/event_sale.py       | 124 ++++++++++-----------
 addons/event_sale/event_sale_view.xml |  17 +--
 5 files changed, 184 insertions(+), 114 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5b14f25d733..62b1d79f969 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,7 +221,6 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'location_id': fields.many2one('res.partner','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
-        
     }
 
     _defaults = {
@@ -259,7 +258,6 @@ class event_event(osv.osv):
     _constraints = [
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
-
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 92e850c011e..5b9dfe41d09 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,42 +45,124 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-
-		<!-- Event Item Tree view-->
-    	<record model="ir.ui.view" id="view_event_items_tree">
-            <field name="name">Event Items Tree</field>
-            <field name="model">event.items</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Event Items">
-                    <field name="product_id"  string="Ticket Type" />
-                    <field name="uom_id"/>
-                    <field name="sales_end_date"/>
-                    <field name="price"/>
-                    <field name="qty"/>
-                </tree>
-            </field>
-        </record>
-        <!-- Event Item Form View -->
-        <record model="ir.ui.view" id="view_event_items_form">
-            <field name="name">Event Items Form</field>
-            <field name="model">event.items</field>
+    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+    
+        <record model="ir.ui.view" id="view_event_form">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Event Items">
-                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                    <field name="price"/>
-                    <field name="qty"/>
-                    <field name="uom_id"/>
-                    <field name="discount"/>
-                    <field name="sales_end_date"/>
-                </form>
+ 			 <form string="Events"  layout="manual">
+                <div class="oe_form_topbar">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+             <sheet string="Event Form" layout="auto">
+            	<group  colspan="4">
+            	     <group colspan="2">
+                        <field name="name"/>
+						 <field name="type" on_change="onchange_event_type(type,context)"/>
+						<field name="user_id"/>
+                        </group>
+			             <group colspan="2">
+			             	<div class="oe_mapbox oe_right"> </div><newline/>
+		                    <table align="right">
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="150px">
+			                            <field name="address_id" nolabel="1"/>
+			                        </td>
+			                        <td width="auto">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+											</tr>
+										</table>
+			                        </td>
+			                     </tr>
+		                     </table>   
+			             </group>  
+			         </group>
+                    <notebook colspan="4">
+                    <page string="Event">
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                            <tree string="Registration" editable="top">
+                                <field name="name" />
+                                <field name="email" />
+                                <field name="phone"/>
+                                <field name="nb_register" />
+                                <field name="state"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </tree>
+                            <form string="Registration">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                <field name="name"/>
+                                <group colspan="4" col="4">
+                                <field name="email"/>
+                                <field name="phone"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="nb_register"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                </group>
+                                    <group col="8" colspan="4">
+                                        <separator string="" colspan="4"/>
+                                        <newline/>
+                                        <field name="state" select="1" colspan="2"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </group>
+                            </form>
+                            </field>
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Extra Info">
+                        <group col="2" colspan="2">
+                            <separator string="Registrations" colspan="2"/>
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                            <field name="register_prospect"/>
+                            <field name="register_current"/>
+                            <field name="register_attended"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Emails" colspan="2"/>
+                            <field name="reply_to"/>
+                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
+                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
+                        </group>
+                    </page>
+                    </notebook>
+                    </sheet>
+            </form>
             </field>
         </record>
-
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
-
-        <record model="ir.ui.view" id="view_event_form">
+        
+       <!--  Event Page view -->
+       
+        <record model="ir.ui.view" id="view_event_page">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -126,7 +208,6 @@
 												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
 											</tr>
 										</table>
-	                                 
 			                        </td>
 			                     </tr>
 		                     </table>   
@@ -169,7 +250,6 @@
                                     </group>
                             </form>
                             </field>
-                        
                     </page>
                     <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -198,8 +278,8 @@
             </form>
             </field>
         </record>
-
-        <!-- Event tree view -->
+        
+       <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 7cf87ffc38c..cebf155081b 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -133,13 +133,14 @@ div.oe_fold_column{
     border:1px solid black; 
     margin-left:auto; 
     margin-right:auto; 
-    
+    text-align: right;
 }
 .oe_td_border
 {
 	width: 5em;
 	padding: 2px;
 	border-right: 1px solid black;
+	text-align: center;
 }
 .oe_td_date_border
 {
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index ee48956324f..81b69babebf 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -35,6 +35,7 @@ class product(osv.osv):
 
 product()
 
+
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _columns = {
@@ -98,75 +99,70 @@ class event_event(osv.osv):
     _columns = {
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
-
-    def make_quotation(self, cr, uid, ids, context=None):
-        res = {}
-        event_pool = self.pool.get('event.event')
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get("res.partner")
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if not partner_ids:
-            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        else:
-            new_partner_id = partner_ids[0]
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
-        for event_id in self.browse(cr, uid, ids, context=context):
-            sale_order_lines = []
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            sale_ids = sale_order.search(cr, uid, [('date_order', '=', event_id.date_begin), ('partner_id', '=', new_partner_id)])
-            if not sale_ids:
-#                    raise osv.except_osv(_('Error !'),
-#                        _('sale order is already Exists for this event:'))
-#            else:          
-                new_sale_id = sale_order.create(cr, uid, {
-                    'date_order': event_id.date_begin,
-                    'pricelist_id': price_list,
-                     'partner_id': new_partner_id, 
-                      'partner_invoice_id': partner_invoice_id,
-                     'partner_shipping_id': partner_shipping_id
-                    })            
-                if event_id.event_item_ids:
-                    for items in event_id.event_item_ids:
-                        product = items.product_id.id
-                        sale_order_line = sale_order_line_pool.create(cr, uid, {
-                            'order_id': new_sale_id,                                
-                            'name': items.product_id.name,
-                            'product_uom_qty': items.qty,
-                            'product_id': items.product_id.id,
-                            'product_uom': items.uom_id.id,
-                            'price_unit': items.price,
-                            'date_planned': items.sales_end_date,
-                        }, context=context)
-                    view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-                    if view_id:
-                        res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-                    res = {
-                            'name': _('Quotation'),
-                            'view_type': 'form',
-                            'view_mode': 'form',
-                            'res_model': 'sale.order',
-                            'res_id': new_sale_id,
-                            'views':[(res_id,'form'), (False, 'tree')],
-                            'type': 'ir.actions.act_window',
-                            'nodestroy': True,
-                            'target': 'current',
-                    }
-        return res
-
+#    def subscribe_to_event(self, cr, uid, ids, context=None):
+#        res = {}
+#        event_pool = self.pool.get('event.event')
+#        register_pool = self.pool.get('event.registration')
+#        sale_order_line_pool = self.pool.get('sale.order.line')
+#        sale_order = self.pool.get('sale.order')
+#        partner_pool = self.pool.get("res.partner")
+#        data_obj = self.pool.get("ir.model.data")
+#        prod_pricelist_obj = self.pool.get('product.pricelist')
+#        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+#        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+#        if not partner_ids:
+#            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+#        else:
+#            new_partner_id = partner_ids[0]
+#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
+#        for event_id in self.browse(cr, uid, ids, context=context):
+#            sale_order_lines = []
+#            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+#            new_sale_id = sale_order.create(cr, uid, {
+#                'date_order': event_id.date_begin,
+#                'pricelist_id': price_list,
+#                 'partner_id': new_partner_id, 
+#                  'partner_invoice_id': partner_invoice_id,
+#                 'partner_shipping_id': partner_shipping_id
+#                })  
+#            if event_id.event_item_ids:
+#                for items in event_id.event_item_ids:
+#                    product = items.product_id.id
+#                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+#                        'order_id': new_sale_id,                                
+#                        'name': items.product_id.name,
+#                        'product_uom_qty': items.qty,
+#                        'product_id': items.product_id.id,
+#                        'price_unit': items.price,
+#                        'date_planned': items.sales_end_date,
+#                    }, context=context)
+#            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+#            if view_id:
+#                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+#            res = {
+#                    'name': _('Quotation'),
+#                    'view_type': 'form',
+#                    'view_mode': 'form',
+#                    'res_model': 'sale.order',
+#                    'res_id': new_sale_id,
+#                    'views':[(res_id,'form'), (False, 'tree')],
+#                    'type': 'ir.actions.act_window',
+#                    'nodestroy': True,
+#                    'target': 'current',
+#            }
+#        return res
+    
 class event_items(osv.osv):
     _name = "event.items"
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'qty': fields.integer('Quantity'),
         'price': fields.integer('Price'),
-        'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+         'qty': fields.integer('QTY'),
+       # 'qty': fields.selection(_max_register, 'QTY'),
+        'uom_id': fields.many2one('product.uom', 'UoM'),
         'discount': fields.integer('Discount'),
         'event_id': fields.many2one('event.event', 'Event'),
         'sales_end_date': fields.date('Sales End')
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 7f1504b7b69..2176affac40 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -36,11 +36,10 @@
 			<field name="type">form</field>
 			<field name="inherit_id" ref="event.view_event_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//group[@name='venue']" position="after">
-						<field name="event_item_ids" nolabel="1"/><newline/>
-						<div class="oe_right">
-							<button string="Order Now" name="make_quotation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
-						</div>
+				<xpath expr="//notebook/page[@string='Extra Info']" position="after">
+                    <page string="Event Items">
+                    <field name="event_item_ids" nolabel="1"/>
+                   </page>
 				</xpath>
 			</field>
 		</record>
@@ -51,17 +50,16 @@
 			 <field name="type">tree</field>
 			 <field name="arch" type="xml">
 				 <tree editable="top" string="Event Items">
-					 <field name="product_id"/>
+					 <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
 					 <field name="price"/>
+					 <field name="uom_id" invisible="1"/>
 					 <field name="qty"/>
-					 <field name="uom_id"/>
 					 <field name="discount"/>
 					 <field name="sales_end_date"/>
 				 </tree>
 			 </field>
 		 </record>
 
-
 		<record model="ir.ui.view" id="view_event_items_form">
 			 <field name="name">Event Items Form</field>
 			 <field name="model">event.items</field>
@@ -71,13 +69,10 @@
 			   	 	<field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
 			        <field name="price"/>
 			        <field name="qty"/>
-					<field name="uom_id"/>
 					<field name="discount"/>
 					<field name="sales_end_date"/>
 				</form>
 		 	</field>
 		</record>
-        
-        
     </data>
 </openerp>

From 09dc29291da30ed5de8825412c9d4a2bd668a72a Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 2 May 2012 12:45:35 +0530
Subject: [PATCH 061/126] [IMP]impelment map widget.

bzr revid: vme@tinyerp.com-20120502071535-5h213fx2p5s0tlqi
---
 addons/event/__openerp__.py           |   1 +
 addons/event/event_view.xml           | 158 +++++++-------------------
 addons/event/static/src/css/event.css |   1 -
 addons/event/static/src/js/event.js   |  52 +++++++++
 4 files changed, 92 insertions(+), 120 deletions(-)
 create mode 100644 addons/event/static/src/js/event.js

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 6de6d2c62c1..85eb78f32f1 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,6 +54,7 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/*.css'],
+    'js': ['static/src/js/event.js'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 9276f77ed9d..87e29a641f2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,124 +45,42 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
-    
-        <record model="ir.ui.view" id="view_event_form">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
+
+		<!-- Event Item Tree view-->
+    	<record model="ir.ui.view" id="view_event_items_tree">
+            <field name="name">Event Items Tree</field>
+            <field name="model">event.items</field>
+            <field name="type">tree</field>
             <field name="arch" type="xml">
- 			 <form string="Events"  layout="manual">
-                <div class="oe_form_topbar">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-             <sheet string="Event Form" layout="auto">
-            	<group  colspan="4">
-            	     <group colspan="2">
-                        <field name="name"/>
-						 <field name="type" on_change="onchange_event_type(type,context)"/>
-						<field name="user_id"/>
-                        </group>
-			             <group colspan="2">
-			             	<div class="oe_mapbox oe_right"> </div><newline/>
-		                    <table align="right">
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="150px">
-			                            <field name="address_id" nolabel="1"/>
-			                        </td>
-			                        <td width="auto">
-	                             		<table>
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-											</tr>
-										</table>
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>  
-			         </group>
-                    <notebook colspan="4">
-                    <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" select="1" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                    </page>
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-                    </notebook>
-                    </sheet>
-            </form>
+                <tree string="Event Items">
+                    <field name="product_id"  string="Ticket Type" />
+                    <field name="uom_id"/>
+                    <field name="sales_end_date"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                </tree>
             </field>
         </record>
-        
-       <!--  Event Page view -->
-       
-        <record model="ir.ui.view" id="view_event_page">
+        <!-- Event Item Form View -->
+        <record model="ir.ui.view" id="view_event_items_form">
+            <field name="name">Event Items Form</field>
+            <field name="model">event.items</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Event Items">
+                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                    <field name="uom_id"/>
+                    <field name="discount"/>
+                    <field name="sales_end_date"/>
+                </form>
+            </field>
+        </record>
+
+    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+
+        <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -190,14 +108,14 @@
                         	</group>
 			             </group>	
 			             <group>
-			             	<div class="oe_mapbox"> </div><newline/>
+			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
 		                    <table>
 			                   	<tr>
 			                    	<td width="70px" class="oe_td_border">
 			                            Where
 			                        </td>
 			                        <td width="150px">
-			                            <field name="address_id" nolabel="1"/>
+			                            <field name="address_id" widget = "geo_address" nolabel="1"/>
 			                        </td>
 			                        <td width="auto">
 	                             		<table>
@@ -208,6 +126,7 @@
 												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
 											</tr>
 										</table>
+	                                 
 			                        </td>
 			                     </tr>
 		                     </table>   
@@ -250,6 +169,7 @@
                                     </group>
                             </form>
                             </field>
+                        
                     </page>
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -278,8 +198,8 @@
             </form>
             </field>
         </record>
-        
-       <!-- Event tree view -->
+
+        <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index cebf155081b..c9f9084a583 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -130,7 +130,6 @@ div.oe_fold_column{
 { 
     width:380px;
     height:200px;
-    border:1px solid black; 
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
new file mode 100644
index 00000000000..6081533397a
--- /dev/null
+++ b/addons/event/static/src/js/event.js
@@ -0,0 +1,52 @@
+openerp.event = function(instance){
+	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
+
+		init : function(){
+			this._super.apply(this,arguments);
+		},
+
+		start:function(){
+		},
+		
+	 	set_input_id:function(id){
+	 	},
+	 	set_value:function(value){
+	 		var self = this;
+			this.get_address(value).done(function(value){
+				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+				return self.list_addresses(address);
+			});
+			
+	 	},
+	 	get_address:function(value){
+	 		if (!value || value.length == 0){
+	 			return $.Deferred().reject();
+	 		}
+			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+	 	},
+
+	 	list_addresses: function(address){
+	 		var geocoder = new google.maps.Geocoder();
+			geocoder.geocode( { 'address': address}, function(results, status) 
+			{
+			if (status == google.maps.GeocoderStatus.OK){
+				var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+				var myOptions = {       
+					zoom: 17,       
+					center:  new google.maps.LatLng(lat,lng),       
+					mapTypeId: google.maps.MapTypeId.ROADMAP     
+				}
+		    	return new google.maps.Marker({
+				    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+				    position: new google.maps.LatLng(lat,lng)
+			 	 });
+	 		}
+			});
+			
+	 	},
+	 	get_value:function(){
+	 	}
+		
+	}));
+};
\ No newline at end of file

From e69395f0bc6adef3f500952d19def91b0f412dfc Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 2 May 2012 14:47:01 +0530
Subject: [PATCH 062/126] [IMP] Sale: Improve the domain on Open Invoice button
 as order_policy postpaid is removed now

bzr revid: psi@tinyerp.com-20120502091701-v4sb5hmnez24k9rn
---
 addons/sale/sale_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 483095aa976..38fa150f66d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -109,10 +109,9 @@
                         <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
                         <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
                         <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object" 
-                                attrs="{'invisible': ['|','|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking'),
-                                '&amp;','&amp;',('order_policy','=','postpaid'),('state', '=','progress'),('shipped','=',False)]}"/>
+                        attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object" 
-                                attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
+                        attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                         <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>
                         <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                         <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>

From bfe05098460c888fde44d03306f7fa29fd6ffcf7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 4 May 2012 17:01:36 +0530
Subject: [PATCH 063/126] [imp] add the event page view for user

bzr revid: nco@tinyerp.com-20120504113136-ws9nxquin9sk95vu
---
 addons/event/__openerp__.py                   |   1 +
 addons/event/event_view.xml                   | 131 ++++++++++-------
 addons/event/static/src/css/event.css         |  11 ++
 addons/event/static/src/js/event.js           |   6 +
 addons/event/static/src/xml/event_address.xml |   9 ++
 addons/event_sale/event_sale.py               | 134 ++++++++++--------
 addons/event_sale/event_sale_view.xml         |  85 ++++++-----
 7 files changed, 235 insertions(+), 142 deletions(-)
 create mode 100644 addons/event/static/src/xml/event_address.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 85eb78f32f1..88943b06654 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -55,6 +55,7 @@ Note that:
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/*.css'],
     'js': ['static/src/js/event.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 87e29a641f2..b4df8cb48ed 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -78,65 +78,27 @@
             </field>
         </record>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+<!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-            	<sheet string="Event Form" layout="auto">
-            		<group col="2">
-            			<group col="2">
-		                	<div class="oe_event_title">
-		                    	<field name="name" nolabel="1"/>
-		                    </div>
-		                    <newline/>
-		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
-                            	<field name="location_id" nolabel="1"/> 
-                        	</group>
-			             </group>	
-			             <group>
-			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-		                    <table>
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="150px">
-			                            <field name="address_id" widget = "geo_address" nolabel="1"/>
-			                        </td>
-			                        <td width="auto">
-	                             		<table>
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-											</tr>
-										</table>
-	                                 
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>
-                    </group>	
+                <form string="Events">
+                    <group col="6" colspan="4">
+                        <field name="name"/>
+                        <field name="date_begin"/>
+                        <field name="date_end"/>
+                        <field name="type" on_change="onchange_event_type(type,context)"/>
+                        <field name="user_id"/>
+                        <field name="address_id" />
+                    </group>
                     <notebook colspan="4">
                     <page string="Event">
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager">
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -169,7 +131,13 @@
                                     </group>
                             </form>
                             </field>
-                        
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                        <group col="4" colspan="2">
+                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        </group>
                     </page>
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -177,7 +145,7 @@
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info" groups="event.group_event_manager">
+                    <page string="Extra Info">
                         <group col="2" colspan="2">
                             <separator string="Registrations" colspan="2"/>
                             <field name="register_min"/>
@@ -194,6 +162,67 @@
                         </group>
                     </page>
                     </notebook>
+            </form>
+            </field>
+        </record>
+
+
+    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
+
+        <record model="ir.ui.view" id="view_event_page">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar" readonly="1">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+            	<sheet string="Event Form" layout="auto">
+            		<group col="2">
+            			<group col="2">
+		                	<div class="oe_event_title">
+		                    	<field name="name" nolabel="1" readonly="1"/>
+		                    </div>
+		                    <newline/>
+		                    <group colspan="4" name="venue">
+                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<field name="location_id" nolabel="1" readonly="1"/> 
+                        	</group>
+			             </group>	
+			             <group>
+			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+		                    <table>
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="auto">
+			                            <field name="address_id" widget ="geo_address" nolabel="1"/>
+			                        </td>
+			                        <td width="210px">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+											</tr>
+										</table>
+	                                 
+			                        </td>
+			                     </tr>
+		                     </table>   
+			             </group>
+                    </group>	
+                    <separator string="Event Details" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index c9f9084a583..f3f40834072 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -144,4 +144,15 @@ div.oe_fold_column{
 .oe_td_date_border
 {
 	border-right:1px solid black;
+}
+.oe_pager_group11 {
+  float: left;
+  height: 24px;
+  line-height: 24px;
+  display: inline-block;
+  border: 1px solid #ababab;
+  cursor: pointer;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
 }
\ No newline at end of file
diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index 6081533397a..bd59bc78818 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,8 +14,11 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
+				console.log("value",value,self);
+				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);
+				
 			});
 			
 	 	},
@@ -49,4 +52,7 @@ openerp.event = function(instance){
 	 	}
 		
 	}));
+
+	
+	
 };
\ No newline at end of file
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
new file mode 100644
index 00000000000..370da230e6b
--- /dev/null
+++ b/addons/event/static/src/xml/event_address.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	
+	<template>
+		<td t-name="address">
+			<t t-esc="record.street"/> <br/>
+			<t t-esc="record.city"/> <br/>
+			<t t-esc="record.country_id[1]"/>
+		</td>
+	</template>
\ No newline at end of file
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 81b69babebf..fa3a9c14f46 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -99,75 +99,93 @@ class event_event(osv.osv):
     _columns = {
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
-#    def subscribe_to_event(self, cr, uid, ids, context=None):
-#        res = {}
-#        event_pool = self.pool.get('event.event')
-#        register_pool = self.pool.get('event.registration')
-#        sale_order_line_pool = self.pool.get('sale.order.line')
-#        sale_order = self.pool.get('sale.order')
-#        partner_pool = self.pool.get("res.partner")
-#        data_obj = self.pool.get("ir.model.data")
-#        prod_pricelist_obj = self.pool.get('product.pricelist')
-#        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-#        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-#        if not partner_ids:
-#            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-#        else:
-#            new_partner_id = partner_ids[0]
-#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
-#        for event_id in self.browse(cr, uid, ids, context=context):
-#            sale_order_lines = []
-#            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-#            new_sale_id = sale_order.create(cr, uid, {
-#                'date_order': event_id.date_begin,
-#                'pricelist_id': price_list,
-#                 'partner_id': new_partner_id, 
-#                  'partner_invoice_id': partner_invoice_id,
-#                 'partner_shipping_id': partner_shipping_id
-#                })  
-#            if event_id.event_item_ids:
-#                for items in event_id.event_item_ids:
-#                    product = items.product_id.id
-#                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-#                        'order_id': new_sale_id,                                
-#                        'name': items.product_id.name,
-#                        'product_uom_qty': items.qty,
-#                        'product_id': items.product_id.id,
-#                        'price_unit': items.price,
-#                        'date_planned': items.sales_end_date,
-#                    }, context=context)
-#            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-#            if view_id:
-#                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-#            res = {
-#                    'name': _('Quotation'),
-#                    'view_type': 'form',
-#                    'view_mode': 'form',
-#                    'res_model': 'sale.order',
-#                    'res_id': new_sale_id,
-#                    'views':[(res_id,'form'), (False, 'tree')],
-#                    'type': 'ir.actions.act_window',
-#                    'nodestroy': True,
-#                    'target': 'current',
-#            }
-#        return res
+    def order_now(self, cr, uid, ids, context=None):
+        res = {}
+        event_pool = self.pool.get('event.event')
+        register_pool = self.pool.get('event.registration')
+        sale_order_line_pool = self.pool.get('sale.order.line')
+        sale_order = self.pool.get('sale.order')
+        partner_pool = self.pool.get("res.partner")
+        data_obj = self.pool.get("ir.model.data")
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if not partner_ids:
+            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+        else:
+            new_partner_id = partner_ids[0]
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
+        for event_id in self.browse(cr, uid, ids, context=context):
+            sale_order_lines = []
+            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+            new_sale_id = sale_order.create(cr, uid, {
+                'date_order': event_id.date_begin,
+                'pricelist_id': price_list,
+                 'partner_id': new_partner_id, 
+                  'partner_invoice_id': partner_invoice_id,
+                 'partner_shipping_id': partner_shipping_id
+                })  
+            if event_id.event_item_ids:
+                for items in event_id.event_item_ids:
+                    product = items.product_id.id
+                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+                        'order_id': new_sale_id,                                
+                        'name': items.product_id.name,
+                        'product_uom_qty': items.qty,
+                        'product_id': items.product_id.id,
+                        'price_unit': items.price,
+                        'date_planned': items.sales_end_date,
+                    }, context=context)
+            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+            if view_id:
+                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+            res = {
+                    'name': _('Quotation'),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'sale.order',
+                    'res_id': new_sale_id,
+                    'views':[(res_id,'form'), (False, 'tree')],
+                    'type': 'ir.actions.act_window',
+                    'nodestroy': True,
+                    'target': 'current',
+            }
+        return res
+    def subscribe_to_event(self, cr, uid, ids, context=None):
+        res = {}
+        data_obj = self.pool.get("ir.model.data")
+        view_id = data_obj._get_id(cr, uid, 'event', 'view_event_page')
+        if view_id:
+            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+        res = {
+                'name': _('Event Page'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'views':[(res_id,'form'), (False, 'tree')],
+                'res_model': 'event.event',
+                'res_id': ids[0],
+                'type': 'ir.actions.act_window',
+                'nodestroy': True,
+                'target': 'current',
+        }
+        return res
     
 class event_items(osv.osv):
     _name = "event.items"
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'price': fields.integer('Price'),
-         'qty': fields.integer('QTY'),
-       # 'qty': fields.selection(_max_register, 'QTY'),
+        'max_qty': fields.integer('Max Qty'),
+        'qty': fields.integer('QTY', type = 'integer'),
         'uom_id': fields.many2one('product.uom', 'UoM'),
         'discount': fields.integer('Discount'),
         'event_id': fields.many2one('event.event', 'Event'),
         'sales_end_date': fields.date('Sales End')
         }
-   
+
     def onchange_product_id(self, cr, uid, ids, product, context=None):
         product_obj = self.pool.get('product.product')
         data = {}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 72782d5c421..0110bc1df2c 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,49 +30,68 @@
              </field>
         </record>
         
+		<record model="ir.ui.view" id="view_event_page_inherit">
+			<field name="name">Events Inherit</field>
+			<field name="model">event.event</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="event.view_event_page"/>
+			<field name="arch" type="xml">
+				<xpath expr="//group[@name='venue']" position="after">
+					<field name="event_item_ids" nolabel="1">
+						 <tree editable="top" string="Event Items">
+							 <field name="product_id" readonly="1" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+							 <field name="sales_end_date" readonly="1"/>
+							 <field name="price" readonly="1"/>
+							 <field name="max_qty" readonly="1" groups="event.group_event_manager"/>
+							 <field name="qty"/>
+				 		</tree>
+					</field>
+					<newline/>
+					<div class="oe_right">
+						<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+					</div>
+				</xpath>
+			</field>
+		</record>
+
+
 		<record model="ir.ui.view" id="view_event_form_inherit">
 			<field name="name">Events Inherit</field>
 			<field name="model">event.event</field>
 			<field name="type">form</field>
 			<field name="inherit_id" ref="event.view_event_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//notebook/page[@string='Extra Info']" position="after">
-                    <page string="Event Items">
-                    <field name="event_item_ids" nolabel="1"/>
-                   </page>
+				<xpath expr="//page[@string='Extra Info']" position="after">
+					<page string="Event Item">
+						<field name="event_item_ids" nolabel="1">
+							 <tree editable="top" string="Event Items">
+								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+								 <field name="sales_end_date" />
+								 <field name="price"/>
+								 <field name="max_qty" groups="event.group_event_manager"/>
+								 <field name="qty"/>
+				 			</tree>
+						</field>
+						<newline/>
+						<div class="oe_right">
+							<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+						</div>
+					</page>
 				</xpath>
 			</field>
 		</record>
 
-		<record model="ir.ui.view" id="view_event_items_tree">
-			 <field name="name">Event Items Tree</field>
-			 <field name="model">event.items</field>
-			 <field name="type">tree</field>
-			 <field name="arch" type="xml">
-				 <tree editable="top" string="Event Items">
-					 <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-					 <field name="price"/>
-					 <field name="uom_id" invisible="1"/>
-					 <field name="qty"/>
-					 <field name="discount"/>
-					 <field name="sales_end_date"/>
-				 </tree>
-			 </field>
-		 </record>
+		<record id="view_event_kanban_inherit" model="ir.ui.view">
+            <field name="name">event.inherit.kanban</field>
+            <field name="model">event.event</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="event.view_event_kanban"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//div/t/t/input[@name='subscribe']" position="replace">
+            		<input type="hidden"/>
+                </xpath> 
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_event_items_form">
-			 <field name="name">Event Items Form</field>
-			 <field name="model">event.items</field>
-			 <field name="type">form</field>
-		 	 <field name="arch" type="xml">
-			 	 <form string="Event Items">
-			   	 	<field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-			        <field name="price"/>
-			        <field name="qty"/>
-					<field name="discount"/>
-					<field name="sales_end_date"/>
-				</form>
-		 	</field>
-		</record>
     </data>
 </openerp>

From 12f03240ef4084acb759d7d05a6313481940ed23 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 4 May 2012 17:17:41 +0530
Subject: [PATCH 064/126] [remove] remove the unused console statement.

bzr revid: nco@tinyerp.com-20120504114741-ik1ft1ln90188tpt
---
 addons/event/static/src/js/event.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index bd59bc78818..ed390d6af9e 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,7 +14,6 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
-				console.log("value",value,self);
 				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);

From 0a09dbed34812d416e9c52bc4226117ca3176b7e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 5 May 2012 23:03:40 +0530
Subject: [PATCH 065/126] [FIX]: Improve css file. Improve view.

bzr revid: atp@tinyerp.com-20120505173340-1jmgy4clza1gy6sh
---
 addons/event/event_view.xml           | 9 +++++----
 addons/event/static/src/css/event.css | 7 +++++++
 addons/event_sale/event_sale.py       | 5 +++--
 addons/event_sale/event_sale_view.xml | 6 +++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 42037637ea5..91c2590008d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -159,7 +159,7 @@
 		                    </div>
 		                    <newline/>
 		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<div class="oe_sub1"> Venue   : </div> 
                             	<field name="location_id" nolabel="1" readonly="1"/> 
                         	</group>
 			             </group>	
@@ -187,9 +187,10 @@
 			                     </tr>
 		                     </table>   
 			             </group>
-                    </group>	
-                    <separator string="Event Details" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1" readonly="1"/>
+                    </group>
+                    <separator string="" colspan="4"/>
+                    	<label string="Event Details:" colspan="4"/>
+                    	<field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 3ff0bb8564f..d53770071d0 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -125,6 +125,9 @@ div.oe_fold_column{
 .oe_sub1
 {
     float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
 }
 .oe_mapbox
 { 
@@ -133,6 +136,7 @@ div.oe_fold_column{
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
+    
 }
 .oe_td_border
 {
@@ -140,9 +144,12 @@ div.oe_fold_column{
 	padding: 2px;
 	border-right: 1px solid black;
 	text-align: center;
+	border-color: #DCDCDC;
+	
 	
 }
 .oe_td_date_border
 {
 	border-right:1px solid black;
+	border-color: #DCDCDC;
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index eb17f6ac59a..5097ea5b9f3 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -179,8 +179,9 @@ class event_items(osv.osv):
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'price': fields.integer('Price'),
-        'max_qty': fields.integer('Max.Quantity available'),
-        'qty': fields.integer('QTY', type ='integer'),
+        #Need to convert  this integer field in to dynamic selection.. TODO
+      #  'max_qty': fields.integer('Max.Quantity available'),
+        'qty': fields.integer('Quantity'),
         'uom_id': fields.many2one('product.uom', 'UoM'),
         'discount': fields.integer('Discount'),
         'event_id': fields.many2one('event.event', 'Event'),
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 9fb3fb9f81b..bf2e8833df7 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -42,8 +42,8 @@
 							 <field name="product_id" readonly="1" />
 							 <field name="sales_end_date" readonly="1"/>
 							 <field name="price" readonly="1"/>
-							 <field name="max_qty" readonly="1" groups="event.group_event_manager"/>
-							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
+							 <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
 				 		</tree>
 					</field>
 					<newline/>
@@ -68,7 +68,7 @@
 								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
 								 <field name="sales_end_date" />
 								 <field name="price"/>
-								 <field name="max_qty" groups="event.group_event_manager"/>
+								<!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
 								 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
 				 			</tree>
 						</field>

From 80a595d631f5335b068d445fc87644787d686d1d Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 5 May 2012 23:33:49 +0530
Subject: [PATCH 066/126] [FIX]: Remove unused space.

bzr revid: atp@tinyerp.com-20120505180349-tlrsdqqpjpm1haaf
---
 addons/event/__openerp__.py           |  2 +-
 addons/event/event_view.xml           | 93 +++++++++++++------------
 addons/event_sale/event_sale_view.xml | 97 +++++++++++++--------------
 3 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 88943b06654..e36914ee9fb 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,7 +53,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'css': ['static/src/css/*.css'],
+    'css': ['static/src/css/event.css'],
     'js': ['static/src/js/event.js'],
     'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 91c2590008d..34688f18efb 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -143,54 +143,53 @@
             <field name="arch" type="xml">
                 <form string="Events"  layout="manual">
                 <div class="oe_form_topbar" readonly="1">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-            	<sheet string="Event Form" layout="auto">
-            		<group col="2">
-            			<group col="2">
-		                	<div class="oe_event_title">
-		                    	<field name="name" nolabel="1" readonly="1"/>
-		                    </div>
-		                    <newline/>
-		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> 
-                            	<field name="location_id" nolabel="1" readonly="1"/> 
-                        	</group>
-			             </group>	
-			             <group>
-			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-		                    <table>
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="auto">
-			                            <field name="address_id" widget ="geo_address" nolabel="1"/>
-			                        </td>
-			                        <td width="210px">
-	                             		<table align="right">
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-											</tr>
-										</table>
-	                                 
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>
-                    </group>
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                   <div class="oe_right">
+                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                   </div>
+                </div>
+                <sheet string="Event Form" layout="auto">
+                   <group col="2">
+                     <group col="2">
+                       <div class="oe_event_title">
+                          <field name="name" nolabel="1" readonly="1"/>
+                       </div>
+                      <newline/>
+                      <group colspan="4" name="venue">
+                            <div class="oe_sub1"> Venue   : </div> 
+                              <field name="location_id" nolabel="1" readonly="1"/> 
+                      </group>
+                   </group>	
+                    <group>
+                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+                     <table>
+                       <tr>
+                         <td width="70px" class="oe_td_border">
+                             Where
+                         </td>
+                         <td width="auto">
+                             <field name="address_id" widget ="geo_address" nolabel="1"/>
+                         </td>
+                         <td width="210px">
+                             <table align="right">
+                              <tr>
+                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+                              </tr>
+                              <tr>
+                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+                              </tr>
+                            </table>
+                         </td>
+                       </tr>
+                     </table>
+                  </group>
+                  </group>
                     <separator string="" colspan="4"/>
-                    	<label string="Event Details:" colspan="4"/>
-                    	<field name="note" colspan="4" nolabel="1" readonly="1"/>
+                      <label string="Event Details:" colspan="4"/>
+                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index bf2e8833df7..ad752a36dd1 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,56 +30,55 @@
              </field>
         </record>
         
-		<record model="ir.ui.view" id="view_event_page_inherit">
-			<field name="name">Events Inherit</field>
-			<field name="model">event.event</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="event.view_event_page"/>
-			<field name="arch" type="xml">
-				<xpath expr="//group[@name='venue']" position="after">
-					<field name="event_item_ids" nolabel="1">
-						 <tree editable="top" string="Event Items">
-							 <field name="product_id" readonly="1" />
-							 <field name="sales_end_date" readonly="1"/>
-							 <field name="price" readonly="1"/>
-							 <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-				 		</tree>
-					</field>
-					<newline/>
-					<div class="oe_right">
-						<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-					</div>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_event_page_inherit">
+          <field name="name">Events Inherit</field>
+          <field name="model">event.event</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="event.view_event_page"/>
+          <field name="arch" type="xml">
+          <xpath expr="//group[@name='venue']" position="after">
+            <field name="event_item_ids" nolabel="1">
+               <tree editable="top" string="Event Items">
+                  <field name="product_id" readonly="1" />
+                   <field name="sales_end_date" readonly="1"/>
+                   <field name="price" readonly="1"/>
+                    <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+                   <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
+               </tree>
+              </field>
+               <newline/>
+               <div class="oe_right">
+                 <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+               </div>
+          </xpath>
+          </field>
+        </record>
 
-
-		<record model="ir.ui.view" id="view_event_form_inherit">
-			<field name="name">Events Inherit</field>
-			<field name="model">event.event</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="event.view_event_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="//page[@string='Extra Info']" position="after">
-					<page string="Event Item">
-						<field name="event_item_ids" nolabel="1">
-							 <tree editable="top" string="Event Items">
-								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-								 <field name="sales_end_date" />
-								 <field name="price"/>
-								<!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
-								 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
-				 			</tree>
-						</field>
-						<newline/>
-						<div class="oe_right">
-							<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-						</div>
-					</page>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_event_form_inherit">
+           <field name="name">Events Inherit</field>
+           <field name="model">event.event</field>
+           <field name="type">form</field>
+          <field name="inherit_id" ref="event.view_event_form"/>
+          <field name="arch" type="xml">
+           <xpath expr="//page[@string='Extra Info']" position="after">
+             <page string="Event Item">
+             <field name="event_item_ids" nolabel="1">
+             <tree editable="top" string="Event Items">
+                <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+                <field name="sales_end_date" />
+                <field name="price"/>
+                <!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
+                <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
+             </tree>
+            </field>
+            <newline/>
+            <div class="oe_right">
+                <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+            </div>
+             </page>
+           </xpath>
+          </field>
+        </record>
 
 		<record id="view_event_kanban_inherit" model="ir.ui.view">
             <field name="name">event.inherit.kanban</field>

From 20624a156e9edaa09db5267a6f68b60f2bd1a827 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 7 May 2012 10:56:45 +0530
Subject: [PATCH 067/126] [FIX]: Optimize code.

bzr revid: atp@tinyerp.com-20120507052645-5jkwjolm0tm3rb5c
---
 addons/event/event.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 62b1d79f969..2d5c85aef4a 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -104,13 +104,11 @@ class event_event(osv.osv):
                 raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (self.event.name))
             
     def check_available_seats(self, cr, uid, ids, context=None):
-        if isinstance(ids, list):
-            ids = ids[0]
-        else:
-            ids = ids 
-        total_confirmed = self.browse(cr, uid, ids, context=context).register_current
-        register_max = self.browse(cr, uid, ids, context=context).register_max
-        available_seats = register_max - total_confirmed
+        available_seats = False
+        for event in self.browse(cr, uid, ids, context=context):
+            total_confirmed = event.register_current
+            register_max = event.register_max
+            available_seats = register_max - total_confirmed
         return available_seats
             
     def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
@@ -317,9 +315,10 @@ class event_registration(osv.osv):
         """ Open Registration
         """
         event_obj = self.pool.get('event.event')
-        event_id = self.browse(cr, uid, ids, context=context)[0].event_id.id
-        no_of_registration = self.browse(cr, uid, ids, context=context)[0].nb_register
-        event_obj.check_registration_limits_before(cr, uid, event_id, no_of_registration, context=context)
+        for register in  self.browse(cr, uid, ids, context=context):
+            event_id = register.event_id.id
+            no_of_registration = register.nb_register
+            event_obj.check_registration_limits_before(cr, uid, [event_id], no_of_registration, context=context)
         res = self.confirm_registration(cr, uid, ids, context=context)
         self.mail_user(cr, uid, ids, context=context)
         return res

From 7a087d62406f33c43f102eb02ae6bd8e242488a0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 7 May 2012 15:40:32 +0530
Subject: [PATCH 068/126] [FIX]: Remove page view from form view and place it
 into event_sale module.

bzr revid: atp@tinyerp.com-20120507101032-e9q0u4cgng231i62
---
 addons/event/event_view.xml           | 61 -----------------
 addons/event_sale/event_sale.py       |  2 +-
 addons/event_sale/event_sale_view.xml | 99 +++++++++++++++++++++------
 3 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 34688f18efb..23257cd8efe 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -134,67 +134,6 @@
         </record>
 
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
-
-        <record model="ir.ui.view" id="view_event_page">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar" readonly="1">
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                   <div class="oe_right">
-                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                   </div>
-                </div>
-                <sheet string="Event Form" layout="auto">
-                   <group col="2">
-                     <group col="2">
-                       <div class="oe_event_title">
-                          <field name="name" nolabel="1" readonly="1"/>
-                       </div>
-                      <newline/>
-                      <group colspan="4" name="venue">
-                            <div class="oe_sub1"> Venue   : </div> 
-                              <field name="location_id" nolabel="1" readonly="1"/> 
-                      </group>
-                   </group>	
-                    <group>
-                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-                     <table>
-                       <tr>
-                         <td width="70px" class="oe_td_border">
-                             Where
-                         </td>
-                         <td width="auto">
-                             <field name="address_id" widget ="geo_address" nolabel="1"/>
-                         </td>
-                         <td width="210px">
-                             <table align="right">
-                              <tr>
-                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-                              </tr>
-                              <tr>
-                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-                              </tr>
-                            </table>
-                         </td>
-                       </tr>
-                     </table>
-                  </group>
-                  </group>
-                    <separator string="" colspan="4"/>
-                      <label string="Event Details:" colspan="4"/>
-                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
-                    </sheet>
-            </form>
-            </field>
-        </record>
-
         <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 5097ea5b9f3..0abbfc2cfb3 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -158,7 +158,7 @@ class event_event(osv.osv):
     def subscribe_to_event(self, cr, uid, ids, context=None):
         res = {}
         data_obj = self.pool.get("ir.model.data")
-        view_id = data_obj._get_id(cr, uid, 'event', 'view_event_page')
+        view_id = data_obj._get_id(cr, uid, 'event_sale', 'view_event_page')
         if view_id:
             res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
         res = {
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index ad752a36dd1..1c2d520beb8 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,30 +30,85 @@
              </field>
         </record>
         
-        <record model="ir.ui.view" id="view_event_page_inherit">
-          <field name="name">Events Inherit</field>
-          <field name="model">event.event</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="event.view_event_page"/>
-          <field name="arch" type="xml">
-          <xpath expr="//group[@name='venue']" position="after">
-            <field name="event_item_ids" nolabel="1">
-               <tree editable="top" string="Event Items">
-                  <field name="product_id" readonly="1" />
-                   <field name="sales_end_date" readonly="1"/>
-                   <field name="price" readonly="1"/>
-                    <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-                   <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-               </tree>
-              </field>
-               <newline/>
-               <div class="oe_right">
-                 <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-               </div>
-          </xpath>
-          </field>
+        
+    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
+
+        <record model="ir.ui.view" id="view_event_page">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar" readonly="1">
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                   <div class="oe_right">
+                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                   </div>
+                </div>
+                <sheet string="Event Form" layout="auto">
+                   <group col="2">
+                     <group col="2">
+                       <div class="oe_event_title">
+                          <field name="name" nolabel="1" readonly="1"/>
+                       </div>
+                      <newline/>
+                      <group colspan="4" name="venue">
+                            <div class="oe_sub1"> Venue   : </div> 
+                              <field name="location_id" nolabel="1" readonly="1"/> 
+                      </group>
+                       <field name="event_item_ids" nolabel="1">
+                         <tree editable="top" string="Event Items">
+                          <field name="product_id" readonly="1" />
+                          <field name="sales_end_date" readonly="1"/>
+                          <field name="price" readonly="1"/>
+                          <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+                          <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
+                         </tree>
+                       </field>
+                       <newline/>
+                      <div class="oe_right">
+                         <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+                      </div>
+                   </group>	
+                    <group>
+                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+                     <table>
+                       <tr>
+                         <td width="70px" class="oe_td_border">
+                             Where
+                         </td>
+                         <td width="auto">
+                             <field name="address_id" widget ="geo_address" nolabel="1"/>
+                         </td>
+                         <td width="210px">
+                             <table align="right">
+                              <tr>
+                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+                              </tr>
+                              <tr>
+                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+                              </tr>
+                            </table>
+                         </td>
+                         
+                       </tr>
+                     </table>
+                  </group>
+                  </group>
+                    <separator string="" colspan="4"/>
+                      <label string="Event Details:" colspan="4"/>
+                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
+                    </sheet>
+            </form>
+            </field>
         </record>
 
+        
+
+
         <record model="ir.ui.view" id="view_event_form_inherit">
            <field name="name">Events Inherit</field>
            <field name="model">event.event</field>

From 042e72de8d9c3f2838c6e1d443c83dc4da48c8c8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:12:10 +0530
Subject: [PATCH 069/126] [FIX]: Fix alignment in kanban view. add accessrights
 for event.items.

bzr revid: atp@tinyerp.com-20120509114210-r3tp1nnn5rvoipqy
---
 addons/event/event_view.xml           | 3 ++-
 addons/event/static/src/css/event.css | 4 ++--
 addons/event_sale/__openerp__.py      | 1 +
 addons/event_sale/event_sale_view.xml | 3 ---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 23257cd8efe..6432a50542e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -53,13 +53,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events">
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
                         <field name="address_id" />
+                        <field name="location_id"/> 
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index d53770071d0..f898647db23 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -37,7 +37,7 @@ div.oe_fold_column{
     border: 1px solid #ababab;
     color: #404040;
     font-size: 12px;
-    padding: 3px 10px;
+    padding: 0px !important;
     text-align: center;
     -o-background-size: 100% 100%;
     -moz-background-size: 100% 100%;
@@ -117,7 +117,7 @@ div.oe_fold_column{
    background-color: #DC5F59;
  }
  .no_of_seats{
-    width:25px;    
+    width:35px;    
  }
 .oe_event_title{
   font-size: 25px;
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index d8f689986e2..e235c31aa08 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -36,6 +36,7 @@ It defines a new kind of service products that offers you the possibility to cho
     'author': 'OpenERP SA',
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
+        'security/ir.model.access.csv',
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 1c2d520beb8..faaa157d356 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -127,9 +127,6 @@
              </tree>
             </field>
             <newline/>
-            <div class="oe_right">
-                <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-            </div>
              </page>
            </xpath>
           </field>

From d2faa8c8ea8e94a77c78d2538080e253a9fcf29e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:13:57 +0530
Subject: [PATCH 070/126] [ADD]: ADD security files

bzr revid: atp@tinyerp.com-20120509114357-ikyou2uf4uo3iwhd
---
 addons/event_sale/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 addons/event_sale/security/ir.model.access.csv

diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
new file mode 100644
index 00000000000..da2067dff00
--- /dev/null
+++ b/addons/event_sale/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_items,event.items,event.model_event_items,event.group_event_user,1,1,0,0

From 9ea1132374f4a170863c78fd78eb388d8910b98b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:30:11 +0530
Subject: [PATCH 071/126] [FIX]: Change model_id in security access right.

bzr revid: atp@tinyerp.com-20120509120011-f4224eeji0m8ix05
---
 addons/event_sale/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
index da2067dff00..8078ec3ff78 100644
--- a/addons/event_sale/security/ir.model.access.csv
+++ b/addons/event_sale/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_items,event.items,event.model_event_items,event.group_event_user,1,1,0,0
+access_event_items,event.items,event_sale.model_event_items,event.group_event_user,1,1,0,0

From 8d2723ac4f49e17c186cb701a250abd28015e432 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:42:44 +0530
Subject: [PATCH 072/126] [FIX]: Fix address template problem.

bzr revid: atp@tinyerp.com-20120509121244-ougokpvpe9i5dxkx
---
 addons/event/static/src/js/event.js           | 2 +-
 addons/event/static/src/xml/event_address.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index 0932d6ed776..4fb368d0845 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,7 +14,7 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
-				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);
 				
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
index 370da230e6b..14c7051cf7d 100644
--- a/addons/event/static/src/xml/event_address.xml
+++ b/addons/event/static/src/xml/event_address.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 	
 	<template>
-		<td t-name="address">
+		<td id = "address_text" t-name="address">
 			<t t-esc="record.street"/> <br/>
 			<t t-esc="record.city"/> <br/>
 			<t t-esc="record.country_id[1]"/>

From 9dc92d18d5d86459ade21c8d9985c0deda005f20 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 23:08:39 +0530
Subject: [PATCH 073/126] [Add]: Add css file into event_sale modules.

bzr revid: atp@tinyerp.com-20120509173839-q3y5egsp8xliyfvi
---
 addons/event/__openerp__.py                   |  2 --
 addons/event/event_view.xml                   |  4 +--
 addons/event/static/src/css/event.css         | 34 -------------------
 addons/event_sale/__openerp__.py              |  3 ++
 .../event_sale/static/src/css/event_page.css  | 31 +++++++++++++++++
 .../static/src/js/google_map.js}              |  0
 .../static/src/xml/event_address.xml          |  0
 7 files changed, 36 insertions(+), 38 deletions(-)
 create mode 100644 addons/event_sale/static/src/css/event_page.css
 rename addons/{event/static/src/js/event.js => event_sale/static/src/js/google_map.js} (100%)
 rename addons/{event => event_sale}/static/src/xml/event_address.xml (100%)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e36914ee9fb..ea0e4316ef5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,8 +54,6 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
-    'js': ['static/src/js/event.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6432a50542e..0d8a4478650 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -53,14 +53,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events">
-                    <group col="8" colspan="4">
+                    <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
                         <field name="address_id" />
-                        <field name="location_id"/> 
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
@@ -121,6 +120,7 @@
                             <field name="register_prospect"/>
                             <field name="register_current"/>
                             <field name="register_attended"/>
+                            <field name="location_id"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Emails" colspan="2"/>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f898647db23..b0f5db0e9d2 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -119,37 +119,3 @@ div.oe_fold_column{
  .no_of_seats{
     width:35px;    
  }
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-    
-}
-.oe_td_border
-{
-	width: 5em;
-	padding: 2px;
-	border-right: 1px solid black;
-	text-align: center;
-	border-color: #DCDCDC;
-	
-	
-}
-.oe_td_date_border
-{
-	border-right:1px solid black;
-	border-color: #DCDCDC;
-}
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index e235c31aa08..e4d9cd3897c 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -41,6 +41,9 @@ It defines a new kind of service products that offers you the possibility to cho
     ],
     'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
+    'css': ['static/src/css/event_page.css'],
+    'js': ['static/src/js/google_map.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/static/src/css/event_page.css b/addons/event_sale/static/src/css/event_page.css
new file mode 100644
index 00000000000..0f7b2a81e32
--- /dev/null
+++ b/addons/event_sale/static/src/css/event_page.css
@@ -0,0 +1,31 @@
+.oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 5em;
+    padding: 2px;
+    border-right: 1px solid black;
+    text-align: center;
+    border-color: #DCDCDC;
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
diff --git a/addons/event/static/src/js/event.js b/addons/event_sale/static/src/js/google_map.js
similarity index 100%
rename from addons/event/static/src/js/event.js
rename to addons/event_sale/static/src/js/google_map.js
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event_sale/static/src/xml/event_address.xml
similarity index 100%
rename from addons/event/static/src/xml/event_address.xml
rename to addons/event_sale/static/src/xml/event_address.xml

From 369e54b547b1ac590b40becb075c073f6a2047b8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 10 May 2012 11:10:50 +0530
Subject: [PATCH 074/126] [FIX]: Fix yaml as per event improvement.

bzr revid: atp@tinyerp.com-20120510054050-pjkux4vl1lgnlfxc
---
 addons/event/test/process/event_draft2done.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml
index d3f3d1fb466..dfe2b01cb33 100644
--- a/addons/event/test/process/event_draft2done.yml
+++ b/addons/event/test/process/event_draft2done.yml
@@ -9,6 +9,7 @@
    name: event
    date_begin: 2012-01-01 19:05:15
    date_end: 2012-01-01 20:05:15
+   register_max: 10
 -
   I create a registration for the event
 -
@@ -32,6 +33,15 @@
    I confirm the registration1
 -
    !python {model: event.registration}: |
+     event_pool = self.pool.get("event.event")
+     for register in self.browse(cr, uid, [ref("event_registration1")], context):
+         nb_register = register.nb_register
+         event_id = register.event_id.id
+         available_seats = event_pool.check_available_seats(cr, uid, [event_id], context=context)
+         if available_seats and nb_register > available_seats:
+             assert available_seats, "seats available."
+         elif available_seats == 0:
+             assert available_seats, "No Tickets Available."
      self.registration_open(cr, uid, [ref("event_registration1")],context=context)
 -
    I check that registration is "confirmed"

From b0a13bff6784fa4b9244dfa68865a53844975ea6 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 May 2012 17:15:13 +0530
Subject: [PATCH 075/126] [IMP]load script from addons side.

bzr revid: vme@tinyerp.com-20120511114513-bfco3w7u0itaq171
---
 addons/event_sale/static/src/js/google_map.js | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
index 4fb368d0845..179c26069cc 100644
--- a/addons/event_sale/static/src/js/google_map.js
+++ b/addons/event_sale/static/src/js/google_map.js
@@ -1,9 +1,9 @@
 openerp.event = function(instance){
 	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
 	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-
 		init : function(){
 			this._super.apply(this,arguments);
+			this.googleMapsLoaded = $.Deferred();
 		},
 
 		start:function(){
@@ -11,13 +11,27 @@ openerp.event = function(instance){
 		
 	 	set_input_id:function(id){
 	 	},
+	 	map_load: function() {
+	 		var self = this;
+	 		if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+			googleMapsCallback = function () {
+        		self.googleMapsLoaded.resolve();
+    		};
+			 $.ajax({
+	                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+	                dataType: "script"
+	            }).fail(self.googleMapsLoaded.reject);
+			return this.googleMapsLoaded.promise();
+		},
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
 				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-				return self.list_addresses(address);
-				
+				var defer = self.Map_Load();
+				defer.done(function(){
+					return self.render_map(address);	
+				})
 			});
 			
 	 	},
@@ -28,7 +42,7 @@ openerp.event = function(instance){
 			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
 	 	},
 
-	 	list_addresses: function(address){
+	 	render_map: function(address){
 	 		var geocoder = new google.maps.Geocoder();
 			geocoder.geocode( { 'address': address}, function(results, status) 
 			{

From 32ecb048dc3daa39573c37144683d3842490dbb2 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 May 2012 17:33:06 +0530
Subject: [PATCH 076/126] [IMP]perfect indentation.

bzr revid: vme@tinyerp.com-20120511120306-j72jwc1mm8kfdsq4
---
 addons/event_sale/static/src/js/google_map.js | 124 +++++++++---------
 1 file changed, 60 insertions(+), 64 deletions(-)

diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
index 179c26069cc..6fe69160447 100644
--- a/addons/event_sale/static/src/js/google_map.js
+++ b/addons/event_sale/static/src/js/google_map.js
@@ -1,68 +1,64 @@
 openerp.event = function(instance){
-	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-		init : function(){
-			this._super.apply(this,arguments);
-			this.googleMapsLoaded = $.Deferred();
-		},
+    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+    instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
+        init : function(){
+            this._super.apply(this,arguments);
+            this.googleMapsLoaded = $.Deferred();
+        },
+        start:function(){
+        },
 
-		start:function(){
-		},
-		
-	 	set_input_id:function(id){
-	 	},
-	 	map_load: function() {
-	 		var self = this;
-	 		if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-			googleMapsCallback = function () {
-        		self.googleMapsLoaded.resolve();
-    		};
-			 $.ajax({
-	                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-	                dataType: "script"
-	            }).fail(self.googleMapsLoaded.reject);
-			return this.googleMapsLoaded.promise();
-		},
-	 	set_value:function(value){
-	 		var self = this;
-			this.get_address(value).done(function(value){
-				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-				var defer = self.Map_Load();
-				defer.done(function(){
-					return self.render_map(address);	
-				})
-			});
-			
-	 	},
-	 	get_address:function(value){
-	 		if (!value || value.length == 0){
-	 			return $.Deferred().reject();
-	 		}
-			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
-	 	},
+        set_input_id:function(id){
+        },
+        map_load: function() {
+            var self = this;
+            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                googleMapsCallback = function () {
+                self.googleMapsLoaded.resolve();
+            };
+            $.ajax({
+                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                dataType: "script"
+            }).fail(self.googleMapsLoaded.reject);
+            return this.googleMapsLoaded.promise();
+        },
+        set_value:function(value){
+            var self = this;
+            this.get_address(value).done(function(value){
+            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            var defer = self.Map_Load();
+            defer.done(function(){
+                return self.render_map(address);	
+            });
+            });
+        },
+        get_address:function(value){
+            if (!value || value.length == 0){
+                return $.Deferred().reject();
+            }
+            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+        },
 
-	 	render_map: function(address){
-	 		var geocoder = new google.maps.Geocoder();
-			geocoder.geocode( { 'address': address}, function(results, status) 
-			{
-			if (status == google.maps.GeocoderStatus.OK){
-				var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-				var myOptions = {       
-					zoom: 17,       
-					center:  new google.maps.LatLng(lat,lng),       
-					mapTypeId: google.maps.MapTypeId.ROADMAP     
-				}
-		    	return new google.maps.Marker({
-				    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
-				    position: new google.maps.LatLng(lat,lng)
-			 	 });
-	 		}
-			});
-			
-	 	},
-	 	get_value:function(){
-	 	}
-		
-	}));
+        render_map: function(address){
+            var geocoder = new google.maps.Geocoder();
+            geocoder.geocode( { 'address': address}, function(results, status){
+                if (status == google.maps.GeocoderStatus.OK){
+                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+                    var myOptions = {
+                    zoom: 17,
+                    center:  new google.maps.LatLng(lat,lng),
+                    mapTypeId: google.maps.MapTypeId.ROADMAP
+                }
+                return new google.maps.Marker({
+                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    position: new google.maps.LatLng(lat,lng)
+                });
+                }
+            });
+        },
+        get_value:function(){
+        }
+
+    }));
 };
\ No newline at end of file

From 99e1ebfcd7a96cc6d9348b01462bb16c73f91e05 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 12:58:53 +0530
Subject: [PATCH 077/126] [FIX]: New event page view

bzr revid: atp@tinyerp.com-20120517072853-is1te37zsy3be4y6
---
 addons/event/__openerp__.py |   3 +
 addons/event/event_view.xml | 119 +++++++++++++++++++++++++++++++++++-
 2 files changed, 120 insertions(+), 2 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..e05754eb992 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -53,6 +54,8 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
+  #  'js': ['static/src/js/google_map.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 7a41153acd8..c6e16a240ae 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -47,7 +47,7 @@
 
 <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
-        <record model="ir.ui.view" id="view_event_form">
+<!--         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -132,7 +132,119 @@
                     </notebook>
             </form>
             </field>
-        </record>
+        </record> -->
+
+    <record model="ir.ui.view" id="view_event_form">
+        <field name="name">Events</field>
+        <field name="model">event.event</field>
+        <field name="type">form</field>
+        <field name="priority">20</field>
+        <field name="arch" type="xml">
+            <form string="Preview" layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                <group colspan="4" col="2">
+                        <field name="name" class="oe_form_title" width="60%%" nolabel="1"/>
+                </group>
+                <group colspan="4" col="5" class="oe_form_group_label_border" style="margin-top: 20px;">
+                     <field name="address_id" widget ="geo_address" string="Venue"/> 
+                 </group>
+                 <group colspan="2" col="2" class="oe-listview-content">    
+                    <label string="Ticket Description"/>
+                     <label string="Quantity"/>
+                     <field nolabel="1" name="full_name" />
+                      <field nolabel="1" name="register_max" />
+                     </group>   
+                     <newline/>
+                     <group colspan="2">
+                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" align="Right"/>
+                      </group>                
+ <!--                <notebook colspan="4">
+                    <page string="Event">
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                            <tree string="Registration" editable="top">
+                                <field name="name" />
+                                <field name="email" />
+                                <field name="phone"/>
+                                <field name="nb_register" />
+                                <field name="state"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </tree>
+                            <form string="Registration">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                <field name="name"/>
+                                <group colspan="4" col="4">
+                                <field name="email"/>
+                                <field name="phone"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="nb_register"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                </group>
+                                    <group col="8" colspan="4">
+                                        <separator string="" colspan="4"/>
+                                        <newline/>
+                                        <field name="state" select="1" colspan="2"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </group>
+                            </form>
+                            </field>
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                        <group col="4" colspan="2">
+                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        </group>
+                    </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Extra Info">
+                        <group col="2" colspan="2">
+                            <separator string="Registrations" colspan="2"/>
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                            <field name="register_prospect"/>
+                            <field name="register_current"/>
+                            <field name="register_attended"/>
+                            <field name="location_id"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Emails" colspan="2"/>
+                            <field name="reply_to"/>
+                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
+                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
+                        </group>
+                    </page>
+
+                </notebook> -->
+                      <separator colspan="4" string="Details"/>
+                    <field name="note" nolabel="1" colspan="4"/>
+                 </sheet>
+
+            </form>
+        </field>
+    </record>
+
 
 
         <!-- Event tree view -->
@@ -160,6 +272,7 @@
                 </tree>
             </field>
         </record>
+
         
         <!-- Event Kanban View -->
 	
@@ -211,6 +324,7 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
+                                <a string="Edit" icon="gtk-edit" type="edit"/>                                  
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
@@ -218,6 +332,7 @@
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
+                                                              
                             </t>
                         </div>
                       </div>

From 08cd412d78a55cc86d841bf9220920ef576dd3d8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 13:00:46 +0530
Subject: [PATCH 078/126] [ADD]: Add event google map file.

bzr revid: atp@tinyerp.com-20120517073046-i47jypr9p6ndckox
---
 addons/event/static/src/js/google_map.js      | 69 +++++++++++++++++++
 addons/event/static/src/xml/event_address.xml |  9 +++
 2 files changed, 78 insertions(+)
 create mode 100644 addons/event/static/src/js/google_map.js
 create mode 100644 addons/event/static/src/xml/event_address.xml

diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
new file mode 100644
index 00000000000..2209001f29d
--- /dev/null
+++ b/addons/event/static/src/js/google_map.js
@@ -0,0 +1,69 @@
+openerp.event = function(instance){
+    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+    instance.event.GoogleMapConnecter = instance.web.Class.extend({
+    	init : function(){
+//    		call ajex to render map load
+    		
+    	},
+        render_map: function(address){
+            var geocoder = new google.maps.Geocoder();
+            geocoder.geocode( { 'address': address}, function(results, status){
+                if (status == google.maps.GeocoderStatus.OK){
+                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+                    var myOptions = {
+                    zoom: 17,
+                    center:  new google.maps.LatLng(lat,lng),
+                    mapTypeId: google.maps.MapTypeId.ROADMAP
+                }
+                return new google.maps.Marker({
+                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    position: new google.maps.LatLng(lat,lng)
+                });
+                }
+            });
+            map_load: function() {
+                var self = this;
+                if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                    googleMapsCallback = function () {
+                    self.googleMapsLoaded.resolve();
+                };
+                $.ajax({
+                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                    dataType: "script"
+                }).fail(self.googleMapsLoaded.reject);
+                return this.googleMapsLoaded.promise();
+            },
+            
+    }),
+    
+    instance.event.GeoAddress = instance.web.form.Many2OneField.extend(_.extend({}, {
+        init : function(){
+            this._super();
+            this.googleMapsLoaded = $.Deferred();
+        },
+
+
+        set_value:function(value){
+            var self = this;
+            this.get_address(value).done(function(value){
+            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            var defer = self.map_load();
+            defer.done(function(){
+                return self.render_map(address);	
+            });
+            });
+        },
+        get_address:function(value){
+            if (!value || value.length == 0){
+                return $.Deferred().reject();
+            }
+            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+        },
+
+        },
+        get_value:function(){
+        }
+
+    }));
+};
\ No newline at end of file
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
new file mode 100644
index 00000000000..14c7051cf7d
--- /dev/null
+++ b/addons/event/static/src/xml/event_address.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	
+	<template>
+		<td id = "address_text" t-name="address">
+			<t t-esc="record.street"/> <br/>
+			<t t-esc="record.city"/> <br/>
+			<t t-esc="record.country_id[1]"/>
+		</td>
+	</template>
\ No newline at end of file

From 96fde61acf012673b4f0a197b7a9b62d10ee9b5e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 16:09:41 +0530
Subject: [PATCH 079/126] [ADD]: Event page

bzr revid: atp@tinyerp.com-20120517103941-6ngwqfkiow8f4ugq
---
 addons/event/event.py       | 39 ++++++++++++++++++++--
 addons/event/event_view.xml | 66 ++++++++++++++-----------------------
 2 files changed, 62 insertions(+), 43 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 38ad0027c9d..d029ba22acd 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -218,7 +218,8 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'location_id': fields.many2one('res.partner','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
+        'available_qty': fields.integer('Availabel Quantity'),
+      
     }
 
     _defaults = {
@@ -226,7 +227,41 @@ class event_event(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
     }
-
+    
+    def order_now(self, cr, uid, ids, context=None):
+          register_pool = self.pool.get('event.registration')
+          user_pool = self.pool.get('res.users')
+          data_obj = self.pool.get('ir.model.data')
+          user = user_pool.browse(cr, uid, uid, context=context)
+          for event in self.browse(cr, uid, ids, context):
+              self.check_registration_limits_before(cr, uid, ids, event.available_qty, context=context)
+              curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , event.id)])
+        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
+              print "event.curre_reg_ids",event.available_qty
+              if not curr_reg_ids and event.available_qty > 0:
+                print "cccccccccccc",event.available_qty  
+                curr_reg_ids = [register_pool.create(cr, 1, {'event_id': event.id ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': event.available_qty})]
+              elif event.available_qty > 0:
+                print "mmmmmmm",event.available_qty
+                register_pool.write(cr, uid, curr_reg_ids, {'nb_register': event.available_qty}, context=context)
+              if event.available_qty > 0:  
+                register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)      
+          view_id = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
+          if view_id:
+              res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+          res = {
+                    'name': _('Registration'),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'event.registration',
+                    'res_id': curr_reg_ids[0],
+                    'views':[(res_id,'form'), (False, 'tree')],
+                    'type': 'ir.actions.act_window',
+                    'nodestroy': True,
+                    'target': 'current',
+          }
+          return res
+         
     def subscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c6e16a240ae..27ff18d1457 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -152,25 +152,33 @@
                 </div>
                 <sheet layout="auto">
                 <group colspan="4" col="2">
-                        <field name="name" class="oe_form_title" width="60%%" nolabel="1"/>
+                        <field name="name" class="oe_form_title" width="80%%" nolabel="1"/>
                 </group>
-                <group colspan="4" col="5" class="oe_form_group_label_border" style="margin-top: 20px;">
+                <group colspan="2" col="2"  class="oe_form_group_label_border">
                      <field name="address_id" widget ="geo_address" string="Venue"/> 
                  </group>
-                 <group colspan="2" col="2" class="oe-listview-content">    
-                    <label string="Ticket Description"/>
-                     <label string="Quantity"/>
-                     <field nolabel="1" name="full_name" />
-                      <field nolabel="1" name="register_max" />
-                     </group>   
-                     <newline/>
-                     <group colspan="2">
-                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" align="Right"/>
-                      </group>                
- <!--                <notebook colspan="4">
+                 <newline/>
+                     <group colspan="2" col="2" class="oe-listview-content">    
+                        <label string="Ticket Description"/>
+                        <label string="Quantity"/>
+                        <field nolabel="1" name="full_name" />
+                        <field nolabel="1" name="available_qty" />
+                     </group> 
+                 <newline/>
+                 <group colspan="2" col="2">
+                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" />
+                 </group>                
+                 <notebook colspan="4">
                     <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
+                         <group colspan="2" col="2" class="oe_form_group_label_border">
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                        </group>
+                        <group colspan="2" col="2" class="oe_form_group_label_border">
+                            <field name="register_current"/> 
+                            <field name="register_prospect"/>
+                            <field name="register_attended"/>
+                        </group>
                         <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
@@ -204,39 +212,15 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
                     </page>
+                
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                         <field name="speaker_confirmed"/>
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                            <field name="location_id"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-
-                </notebook> -->
+                </notebook>
                       <separator colspan="4" string="Details"/>
                     <field name="note" nolabel="1" colspan="4"/>
                  </sheet>

From 4a02e98d42678b9becec3bacf4d65906596bfdf7 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 21 May 2012 18:54:58 +0530
Subject: [PATCH 080/126] [FIX]: Add osv memory wizard for event
 preview.Refactor code as per new specification.

bzr revid: atp@tinyerp.com-20120521132458-xozrh3vcz4wbo6t5
---
 addons/event/__openerp__.py                |   3 +-
 addons/event/event.py                      |  37 +----
 addons/event/event_view.xml                | 110 +------------
 addons/event/static/src/css/event.css      | 181 ++++++++++++++-------
 addons/event/static/src/js/google_map.js   |  87 +++++-----
 addons/event/wizard/__init__.py            |   1 +
 addons/event/wizard/event_preview.py       |  56 +++++++
 addons/event/wizard/event_preview_view.xml |  67 ++++++++
 addons/event_sale/event_sale_view.xml      |   2 +-
 addons/mail/static/src/css/mail.css        |   1 +
 10 files changed, 300 insertions(+), 245 deletions(-)
 create mode 100644 addons/event/wizard/event_preview.py
 create mode 100644 addons/event/wizard/event_preview_view.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e05754eb992..577a9ba9f3c 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -46,6 +46,7 @@ Note that:
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
+         'wizard/event_preview_view.xml',
         'event_view.xml',
         'report/report_event_registration_view.xml',
         'board_association_view.xml',
@@ -54,7 +55,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-  #  'js': ['static/src/js/google_map.js'],
+    'js': ['static/src/js/google_map.js'],
     'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index d029ba22acd..dfa35ad50b2 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -219,49 +219,14 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'available_qty': fields.integer('Availabel Quantity'),
+         'sale_end_date': fields.datetime('SalesEnd'),
       
     }
-
     _defaults = {
         'state': 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
     }
-    
-    def order_now(self, cr, uid, ids, context=None):
-          register_pool = self.pool.get('event.registration')
-          user_pool = self.pool.get('res.users')
-          data_obj = self.pool.get('ir.model.data')
-          user = user_pool.browse(cr, uid, uid, context=context)
-          for event in self.browse(cr, uid, ids, context):
-              self.check_registration_limits_before(cr, uid, ids, event.available_qty, context=context)
-              curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , event.id)])
-        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
-              print "event.curre_reg_ids",event.available_qty
-              if not curr_reg_ids and event.available_qty > 0:
-                print "cccccccccccc",event.available_qty  
-                curr_reg_ids = [register_pool.create(cr, 1, {'event_id': event.id ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': event.available_qty})]
-              elif event.available_qty > 0:
-                print "mmmmmmm",event.available_qty
-                register_pool.write(cr, uid, curr_reg_ids, {'nb_register': event.available_qty}, context=context)
-              if event.available_qty > 0:  
-                register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)      
-          view_id = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
-          if view_id:
-              res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-          res = {
-                    'name': _('Registration'),
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'event.registration',
-                    'res_id': curr_reg_ids[0],
-                    'views':[(res_id,'form'), (False, 'tree')],
-                    'type': 'ir.actions.act_window',
-                    'nodestroy': True,
-                    'target': 'current',
-          }
-          return res
-         
     def subscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 27ff18d1457..730f6cb6573 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -47,7 +47,7 @@
 
 <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
-<!--         <record model="ir.ui.view" id="view_event_form">
+        <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -120,7 +120,6 @@
                             <field name="register_prospect"/>
                             <field name="register_current"/>
                             <field name="register_attended"/>
-                            <field name="location_id"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Emails" colspan="2"/>
@@ -132,104 +131,7 @@
                     </notebook>
             </form>
             </field>
-        </record> -->
-
-    <record model="ir.ui.view" id="view_event_form">
-        <field name="name">Events</field>
-        <field name="model">event.event</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Preview" layout="manual">
-                <div class="oe_form_topbar">
-                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                </div>
-                <sheet layout="auto">
-                <group colspan="4" col="2">
-                        <field name="name" class="oe_form_title" width="80%%" nolabel="1"/>
-                </group>
-                <group colspan="2" col="2"  class="oe_form_group_label_border">
-                     <field name="address_id" widget ="geo_address" string="Venue"/> 
-                 </group>
-                 <newline/>
-                     <group colspan="2" col="2" class="oe-listview-content">    
-                        <label string="Ticket Description"/>
-                        <label string="Quantity"/>
-                        <field nolabel="1" name="full_name" />
-                        <field nolabel="1" name="available_qty" />
-                     </group> 
-                 <newline/>
-                 <group colspan="2" col="2">
-                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" />
-                 </group>                
-                 <notebook colspan="4">
-                    <page string="Event">
-                         <group colspan="2" col="2" class="oe_form_group_label_border">
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                        </group>
-                        <group colspan="2" col="2" class="oe_form_group_label_border">
-                            <field name="register_current"/> 
-                            <field name="register_prospect"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" select="1" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                    </page>
-                
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
-                      <separator colspan="4" string="Details"/>
-                    <field name="note" nolabel="1" colspan="4"/>
-                 </sheet>
-
-            </form>
-        </field>
-    </record>
-
-
+        </record>
 
         <!-- Event tree view -->
 
@@ -257,6 +159,7 @@
             </field>
         </record>
 
+
         
         <!-- Event Kanban View -->
 	
@@ -308,7 +211,9 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
-                                <a string="Edit" icon="gtk-edit" type="edit"/>                                  
+                                 <button name="%(action_event_preview)d" type="action">
+                                 <span>Preview</span>
+                                 </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
@@ -316,7 +221,6 @@
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
-                                                              
                             </t>
                         </div>
                       </div>
@@ -584,7 +488,7 @@
           <field name="view_mode">tree,form,calendar,graph</field>
           <field name="context">{}</field>
           <field name="search_view_id" ref="view_registration_search"/>
-        </record>
+        </record>view_
 
         <menuitem
             name="Registrations"
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 4a2d8d558fb..cdf92810392 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -33,69 +33,25 @@ div.oe_fold_column{
   padding:0px !important;
 }
 .oe_event_button_subscribe {
-    display: inline-block;
-    border: 1px solid #ababab;
-    color: #404040;
-    font-size: 12px;
-    padding: 0px !important;
-    text-align: center;
-    -o-background-size: 100% 100%;
-    -moz-background-size: 100% 100%;
-    -webkit-background-size: auto auto !important;
-    background-size: 100% 100%;
-    background: #d8d8d8 none;
-    background: none, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
-    background: none, -webkit-linear-gradient(#efefef, #d8d8d8);
-    background: none, -moz-linear-gradient(#efefef, #d8d8d8);
-    background: none, -o-linear-gradient(top, #efefef, #d8d8d8);
-    background: none, -khtml-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
-    background: -ms-linear-gradient(top, #efefef, #d8d8d8);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef', endColorstr='#d8d8d8',GradientType=0 );
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
-    -webkit-font-smoothing: antialiased;
-    outline: none;
+  color: white;
+  background-color: #8a89ba;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
+  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
 }
 
 .oe_event_button_unsubscribe {
-  display: inline-block;
-    border: 1px solid #AAA;
-    color: #404040;
-    font-size: 12px;
-    padding: 3px 10px;
-    text-align: center;
-    -o-background-size: 100% 100%;
-    -moz-background-size: 100% 100%;
-    -webkit-background-size: auto auto !important;
-    background-size: 100% 100%;
-    background: #AAA none;
-    background: none, -webkit-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
-    background: none, -webkit-linear-gradient(#AAA, #AAA);
-    background: none, -moz-linear-gradient(#AAA, #AAA);
-    background: none, -o-linear-gradient(top, #AAA, #AAA);
-    background: none, -khtml-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
-    background: -ms-linear-gradient(top, #AAA, #AAA);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#AAA, endColorstr='#AAA',GradientType=0 );
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
-    -webkit-font-smoothing: antialiased;
-    outline: none;
+  color: white;
+  background-color: #8a89ba;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
+  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);;
 }
 .oe_event_button_subscribe:hover {
   cursor: pointer;
@@ -120,3 +76,108 @@ div.oe_fold_column{
     width:35px;
     
  }
+ .oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 7em;
+    padding: 5px;
+    border-right: 1px solid black;
+    text-align: right;
+    border-color: #DCDCDC;
+    border-spacing:5em
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
+
+td.oe_sale_end_date
+{
+    padding:5px;
+}
+td.oe_qty
+{
+    width: 80px;
+    text-align:right;
+    padding:5px;
+}
+
+.oe_order_button
+{
+    height:25px;
+    position: absolute;
+    left:330px;
+    padding: 5px;
+}
+ 
+.oe_a
+{
+    position: absolute;
+    left: 22%;
+}
+
+td.oe_b
+{
+    position:relative;
+    left: 60%;
+}
+
+textarea.field_text
+{
+    width: 765px;
+    height: 318px;
+}
+
+td.oe_form_group_nested
+{
+    padding: 5px;
+}
+.oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 5em;
+    padding: 2px;
+    border-right: 1px solid black;
+    text-align: center;
+    border-color: #DCDCDC;
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
index 2209001f29d..7d2681a7369 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/event/static/src/js/google_map.js
@@ -1,11 +1,24 @@
 openerp.event = function(instance){
-    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-    instance.event.GoogleMapConnecter = instance.web.Class.extend({
-    	init : function(){
-//    		call ajex to render map load
-    		
-    	},
-        render_map: function(address){
+    instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
+    
+    instance.web.GoogleMapConnector = instance.web.Class.extend({
+        init: function(){
+            this.googleMapsLoaded = $.Deferred();
+            this.map_load();
+        },
+        map_load: function() {
+            var self = this;
+            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                googleMapsCallback = function () {
+                self.googleMapsLoaded.resolve();
+            };
+            $.ajax({
+                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                dataType: "script"
+            }).fail(self.googleMapsLoaded.reject);
+            return this.googleMapsLoaded.promise();
+        },
+        render_map: function(address,$element){
             var geocoder = new google.maps.Geocoder();
             geocoder.geocode( { 'address': address}, function(results, status){
                 if (status == google.maps.GeocoderStatus.OK){
@@ -16,54 +29,40 @@ openerp.event = function(instance){
                     mapTypeId: google.maps.MapTypeId.ROADMAP
                 }
                 return new google.maps.Marker({
-                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    map : new google.maps.Map($element,myOptions),
                     position: new google.maps.LatLng(lat,lng)
                 });
                 }
             });
-            map_load: function() {
-                var self = this;
-                if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                    googleMapsCallback = function () {
-                    self.googleMapsLoaded.resolve();
-                };
-                $.ajax({
-                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                    dataType: "script"
-                }).fail(self.googleMapsLoaded.reject);
-                return this.googleMapsLoaded.promise();
-            },
-            
-    }),
-    
-    instance.event.GeoAddress = instance.web.form.Many2OneField.extend(_.extend({}, {
-        init : function(){
-            this._super();
-            this.googleMapsLoaded = $.Deferred();
         },
-
-
-        set_value:function(value){
-            var self = this;
-            this.get_address(value).done(function(value){
-            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-            var defer = self.map_load();
-            defer.done(function(){
-                return self.render_map(address);	
-            });
-            });
+    });
+    instance.event.Many2OneAddress = instance.web.form.FieldMany2One.extend({
+        init: function(field_manager, node){
+          this._super(field_manager, node);
+          this.map = new instance.web.GoogleMapConnector(); 
         },
         get_address:function(value){
+            var self = this;
             if (!value || value.length == 0){
                 return $.Deferred().reject();
             }
-            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+            (value instanceof Array)?value = parseInt(value[0]):false;
+            var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
+            data.read_ids(value,["street","city","country_id"]).done(function(value){
+                var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+                self.map.googleMapsLoaded.done(function(){
+                    self.map.render_map(address,document.getElementById("oe_mapbox"));
+                })
+            });
+        },
+        set_value:function(value){
+            this._super(value);
+            this.get_address(value);
         },
 
-        },
-        get_value:function(){
+        render_value:function(no_recurse){
+            this.get_address(this.get("value"));
+            this._super(no_recurse);
         }
-
-    }));
+    });
 };
\ No newline at end of file
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index 92e33960484..d1350fb43b8 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -21,4 +21,5 @@
 
 
 import event_confirm
+import event_preview
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_preview.py b/addons/event/wizard/event_preview.py
new file mode 100644
index 00000000000..4a490ad930e
--- /dev/null
+++ b/addons/event/wizard/event_preview.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+    
+class event_preview(osv.osv_memory):
+    _name = 'event.preview'
+    _inherit= 'event.event'
+    _columns = {
+     'qty': fields.integer('Quantity'),
+     'sale_end_date': fields.datetime('SalesEnd'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        event_pool = self.pool.get('event.event')
+        data_obj = self.pool.get('ir.model.data')
+        res_id = data_obj._get_id(cr, uid, 'event', 'view_event_preview')
+        if res_id:
+            event_preview_id = data_obj.browse(cr, uid, res_id, context=context).res_id
+
+        record_ids = context and context.get('active_ids', []) or []
+        res = {}
+        for event in event_pool.browse(cr, uid, record_ids, context=context):
+            if 'name' in fields:
+                res.update({'name': event.name})
+            if 'date_begin' in fields:
+                res.update({'date_begin': event.date_begin or False})
+            if 'address_id' in fields:
+                res.update({'address_id': event.address_id and event.address_id.id or False})
+            if 'date_end' in fields:
+                res.update({'date_end': event.date_end})
+            if 'note' in fields:
+                res.update({'note': event.note})
+        return res
+    
+event_preview()   
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_preview_view.xml b/addons/event/wizard/event_preview_view.xml
new file mode 100644
index 00000000000..1d2aead8b28
--- /dev/null
+++ b/addons/event/wizard/event_preview_view.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>  
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="view_event_preview">
+        <field name="name">Events</field>
+        <field name="model">event.preview</field>
+        <field name="type">form</field>
+        <field name="priority">20</field>
+        <field name="arch" type="xml">
+            <form string="Preview" layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                    <group colspan="4" col="2">
+                            <field name="name"  nolabel="1" class="oe_form_title" width="60%%" />
+		                     <div id = "oe_mapbox" class="oe_mapbox"> </div>
+		                     <table>
+		                       <tr>
+		                         <td width="70px" class="oe_td_border">
+		                             Where
+		                         </td>
+		                         <td width="auto">
+		                             <field name="address_id" widget ="many2one_Geo_address" nolabel="1"/>
+		                         </td>
+		                         <td width="210px">
+		                             <table align="right">
+		                              <tr>
+		                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+		                              </tr>
+		                              <tr>
+		                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+		                              </tr>
+		                            </table>
+		                         </td>
+		                         
+		                       </tr>
+		                     </table>
+
+                        <group colspan="2">
+                        </group>
+                    </group> 
+                      <separator colspan="4" string="Details" nolabel="1"/>
+                    <field name="note" colspan="4" nolabel="1"/>
+                 </sheet>
+            </form>
+        </field>
+    </record>
+    
+    <record model="ir.actions.act_window" id="action_event_preview">
+            <field name="name">Preview</field>
+            <field name="res_model">event.preview</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">current</field>
+        </record>
+
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index faaa157d356..d0e00c9a8bf 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -57,7 +57,7 @@
                       <newline/>
                       <group colspan="4" name="venue">
                             <div class="oe_sub1"> Venue   : </div> 
-                              <field name="location_id" nolabel="1" readonly="1"/> 
+                              <field name="address_id_id" nolabel="1"/> 
                       </group>
                        <field name="event_item_ids" nolabel="1">
                          <tree editable="top" string="Event Items">
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 895ca575f08..554f8085fb5 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,3 +1,4 @@
+
 /* ------------------------------ */
 /* Wall                           */
 /* ------------------------------ */

From 551e096786e0fcb610594c683af08c2cb6d9c06c Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 22 May 2012 16:49:07 +0530
Subject: [PATCH 081/126] [IMP] misc

bzr revid: psi@tinyerp.com-20120522111907-thfo7hydk7endomn
---
 addons/account/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index bb00607b26d..e8ce943ddb8 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -205,7 +205,7 @@ class account_invoice(osv.osv):
             ('proforma2','Pro-forma'),
             ('open','Open'),
             ('sent','Sent'),
-            ('paid','Paid')
+            ('paid','Paid'),
             ('cancel','Cancelled'),
             ],'State', select=True, readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \

From 9667dc00f23598adc07fbd16582a8d9accc04eda Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 23 May 2012 12:38:11 +0530
Subject: [PATCH 082/126] [IMP] purchase_double_validation : Improved the use
 of xpath in view inheritance.

bzr revid: mdi@tinyerp.com-20120523070811-y7bj2z2uvfullj4i
---
 .../purchase_double_validation_view.xml                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase_double_validation/purchase_double_validation_view.xml b/addons/purchase_double_validation/purchase_double_validation_view.xml
index 95b39a8045a..e6b255e3245 100644
--- a/addons/purchase_double_validation/purchase_double_validation_view.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_view.xml
@@ -7,8 +7,8 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@name='draft']" position="after">
-             <filter icon="terp-gtk-jump-to-ltr" name="to_approve" string="To Approve" domain="[('state','in',('wait','confirmed'))]" help="Purchase orders which are not approved yet."/>
+            <xpath expr="//filter[@name='draft']" position="after">
+                <filter icon="terp-gtk-jump-to-ltr" name="to_approve" string="To Approve" domain="[('state','in',('wait','confirmed'))]" help="Purchase orders which are not approved yet."/>
             </xpath>
         </field>
     </record>

From 240072e886346c375a18ed76ec5d573da619a4b3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 23 May 2012 12:39:20 +0530
Subject: [PATCH 083/126] [IMP] purchase_requisition : Improved the use of
 xpath in view inheritance.

bzr revid: mdi@tinyerp.com-20120523070920-jbkmsgfubdeyx7mk
---
 addons/purchase_requisition/purchase_requisition_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 830401e1843..9a9d2bfa105 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -21,9 +21,8 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@name='approved']" position="after">
-             <separator orientation="vertical"/>
-             <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
+            <xpath expr="//filter[@name='approved']" position="after">
+                <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
             </xpath>
         </field>
     </record>

From bd9a28164eb31b132d39ce9508fc0dc4dde24a0d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 23 May 2012 14:56:01 +0530
Subject: [PATCH 084/126] [IMP] hr_holidays : Rename 'Approved' into
 'Validate'.

bzr revid: mdi@tinyerp.com-20120523092601-9zvf1ly3ndjh9n8f
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c9fafe40ff9..4aec17aeb52 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -67,7 +67,7 @@
                 <div class="oe_form_topbar">
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
                     <div class="oe_right">

From a61bdccb23129e76d0510e15c17430751fc53805 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 23 May 2012 14:58:28 +0530
Subject: [PATCH 085/126] [IMP] hr_holidays : Rename 'Approved' into
 'Validate'.

bzr revid: mdi@tinyerp.com-20120523092828-vmigxxqv71zqhx4l
---
 addons/hr_holidays/hr_holidays_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 4aec17aeb52..a9359d8ecf5 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -119,7 +119,7 @@
                 <div class="oe_form_topbar">
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
                     <div class="oe_right">
@@ -178,7 +178,7 @@
                     <!--field name="type"/-->
                     <field name="state"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Validate" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -263,7 +263,7 @@
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Validate" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                 </tree>
             </field>
         </record>

From 56114256580a84b316619d18e556686e0c8e3ad6 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 23 May 2012 15:09:36 +0530
Subject: [PATCH 086/126] [IMP] sale: change the display sequence of Advance
 invoice button

bzr revid: psi@tinyerp.com-20120523093936-e6npxekas7opx5y0
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8da67115f8b..75e886d13bd 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -111,11 +111,11 @@
                         attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 
                         attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
+                        <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="draft,manual"/>
                         <button name="cancel" states="draft,sent" string="Cancel Order"/>
                         <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
                         <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
                         <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
-                        <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="draft,manual"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>

From c1ecc8b74342578ac0532eebacc0b0ee187f2899 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 23 May 2012 15:15:16 +0530
Subject: [PATCH 087/126] [IMP] sale: Update the display place of Set to Draft
 button on sale order form

bzr revid: psi@tinyerp.com-20120523094516-aeyvr8q0ak9lh2xz
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 75e886d13bd..1b247fffc76 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -104,9 +104,9 @@
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
                         <button name="action_quotation_sent" string="Send" type="object" states="draft"/>
                         <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
-                        <button name="action_cancel_draft" states="sent,cancel" string="Set to Draft" type="object"/>
                         <button name="print_quotation" string="Print Quotation" type="object" states="draft"/>
                         <button name="order_confirm" states="draft,sent" string="Confirm Order" />
+                        <button name="action_cancel_draft" states="sent,cancel" string="Set to Draft" type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
                         attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 

From f49019248b0d3a33ecdc01753fd043c8fac5b699 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 23 May 2012 17:50:56 +0530
Subject: [PATCH 088/126] [IMP] hr_evaluation: Remove required true from rating
 field

bzr revid: psi@tinyerp.com-20120523122056-vxcwmh5nodjm3ql6
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 8914344732b..3e9138a1175 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -175,7 +175,7 @@
                     </group>
                     <group col="2" colspan="1" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                         <separator string="Ending Summary" colspan="2"/>
-                        <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')],'required':[('state','=','progress')]}"/>
+                        <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]"/>
                         <field name="date_close" readonly="1"/>
                     </group>
                     <notebook colspan="4">

From 9ba2021cddfb6bbdc227190a8507157074e3098d Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 23 May 2012 18:03:15 +0530
Subject: [PATCH 089/126] [IMP] misc

bzr revid: psi@tinyerp.com-20120523123315-ti04623w0bb9sw9w
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 3e9138a1175..9611ec382e9 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -175,7 +175,7 @@
                     </group>
                     <group col="2" colspan="1" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                         <separator string="Ending Summary" colspan="2"/>
-                        <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]"/>
+                        <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
                         <field name="date_close" readonly="1"/>
                     </group>
                     <notebook colspan="4">

From 8cab7496e44a7145d2d56ffc187f561e07ffb0eb Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 23 May 2012 18:25:34 +0530
Subject: [PATCH 090/126] [IMP] sale: Make visible Send and Print Quotation
 botton to sent state and allow editing sale order in sent state

bzr revid: psi@tinyerp.com-20120523125534-4zcd145wzi24ykva
---
 addons/sale/sale.py       | 24 ++++++++++++------------
 addons/sale/sale_view.xml |  5 ++---
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 55225cd169c..7e774cb64d5 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -198,8 +198,8 @@ class sale_order(osv.osv):
 
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True,
-            readonly=True, states={'draft': [('readonly', False)]}, select=True),
-        'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+            readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
+        'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
         'client_order_ref': fields.char('Customer Reference', size=64),
         'state': fields.selection([
@@ -213,31 +213,31 @@ class sale_order(osv.osv):
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
-        'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
+        'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
-        'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)]}, select=True),
-        'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
-        'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
-        'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
+        'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
+        'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, required=True, change_default=True, select=True),
+        'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."),
+        'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Shipping address for current sales order."),
 
         'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
         'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')],
-            'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
+            'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
             help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([
                 ('manual', 'On Demand'),
                 ('picking', 'On Delivery Order'),
                 ('prepaid', 'Before Delivery'),
-            ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)]},
+            ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
             help="""This field controls how invoice and delivery operations are synchronized.
   - With 'On Demand', the invoice is created manually when needed.
   - With 'On Delivery Order', a draft invoice is generated after all pickings have been processed.
   - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist for current sales order."),
-        'project_id': fields.many2one('account.analytic.account', 'Contract/Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sales order."),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."),
+        'project_id': fields.many2one('account.analytic.account', 'Contract/Analytic Account', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
 
-        'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
+        'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),
         'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."),
         'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1b247fffc76..b8e54d92e41 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -102,11 +102,10 @@
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                        <button name="action_quotation_sent" string="Send" type="object" states="draft"/>
+                        <button name="action_quotation_sent" string="Send" type="object" states="draft,sent"/>
                         <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
-                        <button name="print_quotation" string="Print Quotation" type="object" states="draft"/>
+                        <button name="print_quotation" string="Print Quotation" type="object" states="draft,sent"/>
                         <button name="order_confirm" states="draft,sent" string="Confirm Order" />
-                        <button name="action_cancel_draft" states="sent,cancel" string="Set to Draft" type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
                         attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 

From 7f93ac0dc3347972904d4321038bb530f5bc95a6 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 18:49:56 +0530
Subject: [PATCH 091/126] [FIX]: ADD google map in event form view. remove
 preveiw wizard.

bzr revid: atp@tinyerp.com-20120523131956-ttslmltvzscz024o
---
 addons/event/__openerp__.py                |   1 -
 addons/event/event.py                      |   6 +
 addons/event/event_view.xml                | 124 +++++++++++++--------
 addons/event/static/src/css/event.css      |  65 +----------
 addons/event/wizard/__init__.py            |   1 -
 addons/event/wizard/event_preview.py       |  56 ----------
 addons/event/wizard/event_preview_view.xml |  67 -----------
 7 files changed, 86 insertions(+), 234 deletions(-)
 delete mode 100644 addons/event/wizard/event_preview.py
 delete mode 100644 addons/event/wizard/event_preview_view.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 577a9ba9f3c..5f02bb8a05e 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -46,7 +46,6 @@ Note that:
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
-         'wizard/event_preview_view.xml',
         'event_view.xml',
         'report/report_event_registration_view.xml',
         'board_association_view.xml',
diff --git a/addons/event/event.py b/addons/event/event.py
index dfa35ad50b2..ef33b6ebc52 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,6 +221,12 @@ class event_event(osv.osv):
         'available_qty': fields.integer('Availabel Quantity'),
          'sale_end_date': fields.datetime('SalesEnd'),
       
+     'city': fields.related('address_id', 'city', type='char', string='City'),
+     'street': fields.related('address_id', 'street', type='char', string='Street'),
+     'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
+     'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
+     'zip': fields.related('address_id','zip', type="char", string="Zip"),      
+      
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 730f6cb6573..0964f52e36b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -52,19 +52,82 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="date_begin"/>
-                        <field name="date_end"/>
-                        <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="user_id"/>
-                        <field name="address_id" />
-                    </group>
-                    <notebook colspan="4">
-                    <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
+            <form string="Events" layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/> 
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                <group colspan="4">
+                  <group col="2" colspan="2" class="oe_form_group_label_border"  >
+                  <field name="name" required="1" nolabel="1" class="oe_form_title" /><br/><br/><br/>
+                    <field name="type" on_change="onchange_event_type(type,context)"/>
+                    <field name="user_id"/>
+                    <field name="address_id" widget ="many2one_Geo_address"/>
+                  </group>
+                  <group colspan="2" col="2">
+                    <div id = "oe_mapbox" class="oe_mapbox">
+                    </div>
+                  </group>  
+                  <group colspan="4">
+                     <group col="4" colspan="2" class="oe_form_group_label_border" >
+                           <field name="register_min"/>
+                           <field name="register_max"/>
+                     </group>
+                     <group colspan="2" col="2">
+	                   <div>
+	                        <table  width="400px" >
+	                         <tr>
+	                           <td  class="oe_td_border">
+	                               Where :
+	                           </td>
+	                           <td width="auto">
+	                            <field name="street" nolabel="1" readonly="1"/><br/>
+	                             <field name="state_id" nolabel="1" readonly="1"/><br/>
+	                              <field name="city" nolabel="1" readonly="1"/><br/>
+	                               <field name="country_id" nolabel="1" readonly="1"/><br/>
+	                               <field name="zip" nolabel="1" readonly="1"/><br/>
+	                           </td>
+	                           <td width="10px" >
+	                               <table width="150px" >
+	                                <tr >
+	                                  <td class="oe_td_date_border">Start: </td><td width="auto"><field name="date_begin" nolabel="1" /></td>
+	                                </tr>
+	                                <tr >
+	                                  <td class="oe_td_date_border">End</td><td width="auto"><field name="date_end" nolabel="1" /></td>
+	                                </tr><newline/>
+	                              </table>
+	                           </td>
+	                         </tr>
+	                       </table>
+	                    </div>
+                     </group>
+                  </group>
+                  </group>
+                <notebook colspan="4">
+                <page string="Event Details">
+                <separator colspan="4" string="Details" nolabel="1"/>
+                <field name="note" colspan="4" nolabel="1"/>    
+                </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Event Registration">
+	                     <group col="6" colspan="4" class="oe_form_group_label_border" >
+                            <field name="register_current"/>
+                            <field name="register_prospect"/>
+                            <field name="register_attended"/>
+	                     </group> 
+	                     <br/>
+	                     <br/>                   
                         <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
@@ -98,37 +161,9 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
                     </page>
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-                    </notebook>
+                </notebook>
+                </sheet>
             </form>
             </field>
         </record>
@@ -211,9 +246,6 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
-                                 <button name="%(action_event_preview)d" type="action">
-                                 <span>Preview</span>
-                                 </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index cdf92810392..160e0d82b1c 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -93,7 +93,9 @@ div.oe_fold_column{
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
+
 }
+
 .oe_td_border
 {
     width: 7em;
@@ -109,75 +111,12 @@ div.oe_fold_column{
     border-color: #DCDCDC;
 }
 
-td.oe_sale_end_date
-{
-    padding:5px;
-}
-td.oe_qty
-{
-    width: 80px;
-    text-align:right;
-    padding:5px;
-}
-
-.oe_order_button
-{
-    height:25px;
-    position: absolute;
-    left:330px;
-    padding: 5px;
-}
- 
-.oe_a
-{
-    position: absolute;
-    left: 22%;
-}
-
-td.oe_b
-{
-    position:relative;
-    left: 60%;
-}
-
 textarea.field_text
 {
     width: 765px;
     height: 318px;
 }
-
 td.oe_form_group_nested
 {
     padding: 5px;
 }
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-}
-.oe_td_border
-{
-    width: 5em;
-    padding: 2px;
-    border-right: 1px solid black;
-    text-align: center;
-    border-color: #DCDCDC;
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index d1350fb43b8..92e33960484 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -21,5 +21,4 @@
 
 
 import event_confirm
-import event_preview
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_preview.py b/addons/event/wizard/event_preview.py
deleted file mode 100644
index 4a490ad930e..00000000000
--- a/addons/event/wizard/event_preview.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-
-    
-class event_preview(osv.osv_memory):
-    _name = 'event.preview'
-    _inherit= 'event.event'
-    _columns = {
-     'qty': fields.integer('Quantity'),
-     'sale_end_date': fields.datetime('SalesEnd'),
-    }
-    def default_get(self, cr, uid, fields, context=None):
-        event_pool = self.pool.get('event.event')
-        data_obj = self.pool.get('ir.model.data')
-        res_id = data_obj._get_id(cr, uid, 'event', 'view_event_preview')
-        if res_id:
-            event_preview_id = data_obj.browse(cr, uid, res_id, context=context).res_id
-
-        record_ids = context and context.get('active_ids', []) or []
-        res = {}
-        for event in event_pool.browse(cr, uid, record_ids, context=context):
-            if 'name' in fields:
-                res.update({'name': event.name})
-            if 'date_begin' in fields:
-                res.update({'date_begin': event.date_begin or False})
-            if 'address_id' in fields:
-                res.update({'address_id': event.address_id and event.address_id.id or False})
-            if 'date_end' in fields:
-                res.update({'date_end': event.date_end})
-            if 'note' in fields:
-                res.update({'note': event.note})
-        return res
-    
-event_preview()   
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_preview_view.xml b/addons/event/wizard/event_preview_view.xml
deleted file mode 100644
index 1d2aead8b28..00000000000
--- a/addons/event/wizard/event_preview_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<openerp>
-    <data>
-
-    <record model="ir.ui.view" id="view_event_preview">
-        <field name="name">Events</field>
-        <field name="model">event.preview</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Preview" layout="manual">
-                <div class="oe_form_topbar">
-                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                </div>
-                <sheet layout="auto">
-                    <group colspan="4" col="2">
-                            <field name="name"  nolabel="1" class="oe_form_title" width="60%%" />
-		                     <div id = "oe_mapbox" class="oe_mapbox"> </div>
-		                     <table>
-		                       <tr>
-		                         <td width="70px" class="oe_td_border">
-		                             Where
-		                         </td>
-		                         <td width="auto">
-		                             <field name="address_id" widget ="many2one_Geo_address" nolabel="1"/>
-		                         </td>
-		                         <td width="210px">
-		                             <table align="right">
-		                              <tr>
-		                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-		                              </tr>
-		                              <tr>
-		                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-		                              </tr>
-		                            </table>
-		                         </td>
-		                         
-		                       </tr>
-		                     </table>
-
-                        <group colspan="2">
-                        </group>
-                    </group> 
-                      <separator colspan="4" string="Details" nolabel="1"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                 </sheet>
-            </form>
-        </field>
-    </record>
-    
-    <record model="ir.actions.act_window" id="action_event_preview">
-            <field name="name">Preview</field>
-            <field name="res_model">event.preview</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">current</field>
-        </record>
-
-
-    </data>
-</openerp>
\ No newline at end of file

From e21492a8bf490e64d7323967541d9e83e1b791ca Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 19:14:48 +0530
Subject: [PATCH 092/126] [REM]: Remove unused code and refactor code as per
 specification

bzr revid: atp@tinyerp.com-20120523134448-9vqtiufzjgmmaq0b
---
 addons/event/__openerp__.py                   |   1 -
 addons/event/event.py                         |  13 +-
 addons/event/static/src/xml/event_address.xml |   9 --
 addons/event_sale/__openerp__.py              |   4 -
 addons/event_sale/event_sale.py               | 105 ----------------
 addons/event_sale/event_sale_view.xml         | 114 ------------------
 .../event_sale/security/ir.model.access.csv   |   2 -
 .../event_sale/static/src/css/event_page.css  |  31 -----
 addons/event_sale/static/src/js/google_map.js |  64 ----------
 .../static/src/xml/event_address.xml          |   9 --
 addons/portal_event/__init__.py               |  22 ----
 addons/portal_event/__openerp__.py            |  40 ------
 addons/portal_event/portal_event.py           |  47 --------
 .../portal_event/security/ir.model.access.csv |   6 -
 .../security/portal_event_security.xml        |  33 -----
 15 files changed, 5 insertions(+), 495 deletions(-)
 delete mode 100644 addons/event/static/src/xml/event_address.xml
 delete mode 100644 addons/event_sale/security/ir.model.access.csv
 delete mode 100644 addons/event_sale/static/src/css/event_page.css
 delete mode 100644 addons/event_sale/static/src/js/google_map.js
 delete mode 100644 addons/event_sale/static/src/xml/event_address.xml
 delete mode 100644 addons/portal_event/__init__.py
 delete mode 100644 addons/portal_event/__openerp__.py
 delete mode 100644 addons/portal_event/portal_event.py
 delete mode 100644 addons/portal_event/security/ir.model.access.csv
 delete mode 100644 addons/portal_event/security/portal_event_security.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index f9f7ef6c416..c491dd06138 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,7 +54,6 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'js': ['static/src/js/google_map.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 5f72b3d40b6..a15d1d92557 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -218,14 +218,11 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'available_qty': fields.integer('Availabel Quantity'),
-         'sale_end_date': fields.datetime('SalesEnd'),
-      
-     'city': fields.related('address_id', 'city', type='char', string='City'),
-     'street': fields.related('address_id', 'street', type='char', string='Street'),
-     'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
-     'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
-     'zip': fields.related('address_id','zip', type="char", string="Zip"),      
+         'city': fields.related('address_id', 'city', type='char', string='City'),
+         'street': fields.related('address_id', 'street', type='char', string='Street'),
+         'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
+         'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
+         'zip': fields.related('address_id','zip', type="char", string="Zip"),      
       
     }
     _defaults = {
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
deleted file mode 100644
index 14c7051cf7d..00000000000
--- a/addons/event/static/src/xml/event_address.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	
-	<template>
-		<td id = "address_text" t-name="address">
-			<t t-esc="record.street"/> <br/>
-			<t t-esc="record.city"/> <br/>
-			<t t-esc="record.country_id[1]"/>
-		</td>
-	</template>
\ No newline at end of file
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index a7e9495af60..d06e964c483 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -35,14 +35,10 @@ It defines a new kind of service products that offers you the possibility to cho
     'author': 'OpenERP SA',
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
-        'security/ir.model.access.csv',
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
-    'css': ['static/src/css/event_page.css'],
-    'js': ['static/src/js/google_map.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0abbfc2cfb3..44b3aaf5409 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -93,108 +93,3 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-  
-class event_event(osv.osv):
-    _inherit = 'event.event'
-    _columns = {
-                    'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
-                }
-    
-    def order_now(self, cr, uid, ids, context=None):
-        res = {}
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get("res.partner")
-        data_obj = self.pool.get("ir.model.data")
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if not partner_ids:
-            # partner not found create new partner.....
-            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        else:
-            new_partner_id = partner_ids[0]
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        for event_id in self.browse(cr, uid, ids, context=context):
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_sale_id = sale_order.create(cr, uid, {
-                'date_order': event_id.date_begin,
-                'pricelist_id': price_list,
-                 'partner_id': new_partner_id, 
-                  'partner_invoice_id': partner_invoice_id,
-                 'partner_shipping_id': partner_shipping_id
-                })  
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id, 
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-            if view_id:
-                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-            res = {
-                    'name': _('Quotation'),
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'sale.order',
-                    'res_id': new_sale_id,
-                    'views':[(res_id,'form'), (False, 'tree')],
-                    'type': 'ir.actions.act_window',
-                    'nodestroy': True,
-                    'target': 'current',
-            }
-        return res
-    
-    def subscribe_to_event(self, cr, uid, ids, context=None):
-        res = {}
-        data_obj = self.pool.get("ir.model.data")
-        view_id = data_obj._get_id(cr, uid, 'event_sale', 'view_event_page')
-        if view_id:
-            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-        res = {
-                'name': _('Event Page'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'views':[(res_id,'form'), (False, 'tree')],
-                'res_model': 'event.event',
-                'res_id': ids[0],
-                'type': 'ir.actions.act_window',
-                'nodestroy': True,
-                'target': 'current',
-        }
-        return res
-    
-class event_items(osv.osv):
-    _name = "event.items"
-    _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True),
-        'price': fields.integer('Price'),
-        #Need to convert  this integer field in to dynamic selection.. TODO
-      #  'max_qty': fields.integer('Max.Quantity available'),
-        'qty': fields.integer('Quantity'),
-        'uom_id': fields.many2one('product.uom', 'UoM'),
-        'discount': fields.integer('Discount'),
-        'event_id': fields.many2one('event.event', 'Event'),
-        'sales_end_date': fields.date('Sales End')
-        }
-
-    def onchange_product_id(self, cr, uid, ids, product, context=None):
-        product_obj = self.pool.get('product.product')
-        data = {}
-        if not product:
-            return {'value': data}
-        price = product_obj.browse(cr, uid, product).list_price
-        uom = product_obj.browse(cr, uid, product).uom_id.id
-        data['price'] = price
-        data['uom_id'] = uom
-        return {'value': data}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index d0e00c9a8bf..5746f1de554 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -29,120 +29,6 @@
                 </xpath>
              </field>
         </record>
-        
-        
-    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
-
-        <record model="ir.ui.view" id="view_event_page">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar" readonly="1">
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                   <div class="oe_right">
-                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                   </div>
-                </div>
-                <sheet string="Event Form" layout="auto">
-                   <group col="2">
-                     <group col="2">
-                       <div class="oe_event_title">
-                          <field name="name" nolabel="1" readonly="1"/>
-                       </div>
-                      <newline/>
-                      <group colspan="4" name="venue">
-                            <div class="oe_sub1"> Venue   : </div> 
-                              <field name="address_id_id" nolabel="1"/> 
-                      </group>
-                       <field name="event_item_ids" nolabel="1">
-                         <tree editable="top" string="Event Items">
-                          <field name="product_id" readonly="1" />
-                          <field name="sales_end_date" readonly="1"/>
-                          <field name="price" readonly="1"/>
-                          <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-                          <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-                         </tree>
-                       </field>
-                       <newline/>
-                      <div class="oe_right">
-                         <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-                      </div>
-                   </group>	
-                    <group>
-                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-                     <table>
-                       <tr>
-                         <td width="70px" class="oe_td_border">
-                             Where
-                         </td>
-                         <td width="auto">
-                             <field name="address_id" widget ="geo_address" nolabel="1"/>
-                         </td>
-                         <td width="210px">
-                             <table align="right">
-                              <tr>
-                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-                              </tr>
-                              <tr>
-                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-                              </tr>
-                            </table>
-                         </td>
-                         
-                       </tr>
-                     </table>
-                  </group>
-                  </group>
-                    <separator string="" colspan="4"/>
-                      <label string="Event Details:" colspan="4"/>
-                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
-                    </sheet>
-            </form>
-            </field>
-        </record>
-
-        
-
-
-        <record model="ir.ui.view" id="view_event_form_inherit">
-           <field name="name">Events Inherit</field>
-           <field name="model">event.event</field>
-           <field name="type">form</field>
-          <field name="inherit_id" ref="event.view_event_form"/>
-          <field name="arch" type="xml">
-           <xpath expr="//page[@string='Extra Info']" position="after">
-             <page string="Event Item">
-             <field name="event_item_ids" nolabel="1">
-             <tree editable="top" string="Event Items">
-                <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-                <field name="sales_end_date" />
-                <field name="price"/>
-                <!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
-                <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
-             </tree>
-            </field>
-            <newline/>
-             </page>
-           </xpath>
-          </field>
-        </record>
-
-		<record id="view_event_kanban_inherit" model="ir.ui.view">
-            <field name="name">event.inherit.kanban</field>
-            <field name="model">event.event</field>
-            <field name="type">kanban</field>
-            <field name="inherit_id" ref="event.view_event_kanban"/>
-            <field name="arch" type="xml">
-            	<xpath expr="//div/t/t/input[@name='subscribe']" position="replace">
-            		<input type="hidden"/>
-                </xpath> 
-            </field>
-        </record>
 
     </data>
 </openerp>
diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
deleted file mode 100644
index 8078ec3ff78..00000000000
--- a/addons/event_sale/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_items,event.items,event_sale.model_event_items,event.group_event_user,1,1,0,0
diff --git a/addons/event_sale/static/src/css/event_page.css b/addons/event_sale/static/src/css/event_page.css
deleted file mode 100644
index 0f7b2a81e32..00000000000
--- a/addons/event_sale/static/src/css/event_page.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-}
-.oe_td_border
-{
-    width: 5em;
-    padding: 2px;
-    border-right: 1px solid black;
-    text-align: center;
-    border-color: #DCDCDC;
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
deleted file mode 100644
index 2cf67df78a4..00000000000
--- a/addons/event_sale/static/src/js/google_map.js
+++ /dev/null
@@ -1,64 +0,0 @@
-openerp.event = function(instance){
-    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-    instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-        init : function(){
-            this._super.apply(this,arguments);
-            this.googleMapsLoaded = $.Deferred();
-        },
-        start:function(){
-        },
-
-        set_input_id:function(id){
-        },
-        Map_Load: function() {
-            var self = this;
-            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                googleMapsCallback = function () {
-                self.googleMapsLoaded.resolve();
-            };
-            $.ajax({
-                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                dataType: "script"
-            }).fail(self.googleMapsLoaded.reject);
-            return this.googleMapsLoaded.promise();
-        },
-        set_value:function(value){
-            var self = this;
-            this.get_address(value).done(function(value){
-            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-            var defer = self.Map_Load();
-            defer.done(function(){
-                return self.render_map(address);	
-            });
-            });
-        },
-        get_address:function(value){
-            if (!value || value.length == 0){
-                return $.Deferred().reject();
-            }
-            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
-        },
-
-        render_map: function(address){
-            var geocoder = new google.maps.Geocoder();
-            geocoder.geocode( { 'address': address}, function(results, status){
-                if (status == google.maps.GeocoderStatus.OK){
-                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-                    var myOptions = {
-                    zoom: 17,
-                    center:  new google.maps.LatLng(lat,lng),
-                    mapTypeId: google.maps.MapTypeId.ROADMAP
-                }
-                return new google.maps.Marker({
-                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
-                    position: new google.maps.LatLng(lat,lng)
-                });
-                }
-            });
-        },
-        get_value:function(){
-        }
-
-    }));
-};
\ No newline at end of file
diff --git a/addons/event_sale/static/src/xml/event_address.xml b/addons/event_sale/static/src/xml/event_address.xml
deleted file mode 100644
index 14c7051cf7d..00000000000
--- a/addons/event_sale/static/src/xml/event_address.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	
-	<template>
-		<td id = "address_text" t-name="address">
-			<t t-esc="record.street"/> <br/>
-			<t t-esc="record.city"/> <br/>
-			<t t-esc="record.country_id[1]"/>
-		</td>
-	</template>
\ No newline at end of file
diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py
deleted file mode 100644
index 70c078b769d..00000000000
--- a/addons/portal_event/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import portal_event
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
deleted file mode 100644
index 88ca9815323..00000000000
--- a/addons/portal_event/__openerp__.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    'name' : "Portal Event",
-    'version' : "1.0",
-    'depends' : ["portal", "event_sale"],
-    'author' : "OpenERP SA",
-    'category': 'Portal',
-    'description': """
-This module defines 'portals' to customize the access to your OpenERP database
-for external users.
-    """,
-    'update_xml': [
-        'security/portal_event_security.xml',
-        'security/ir.model.access.csv',
-    ],    
-    'website': 'http://www.openerp.com',
-    'installable': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
deleted file mode 100644
index 570bd3131b6..00000000000
--- a/addons/portal_event/portal_event.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from osv import fields, osv
-from tools.translate import _
-
-class event_event(osv.osv):
-    _inherit = 'event.event'
-
-    def make_quotation(self, cr, uid, ids, context=None):
-        event_pool = self.pool.get('event.event')
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get('res.partner')
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        res_users_obj = self.pool.get('res.users')
-        user = res_users_obj.browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if partner_ids:
-            res_users_obj.write(cr, uid, user.id, {'partner_id': partner_ids[0]})        
-        if not partner_ids:
-              raise osv.except_osv(_('Error !'),
-                                    _('There is no Partner defined ' \
-                                            'for this event:'))
-        res = super(event_event,self).make_quotation(cr, uid, ids, context)              
-
-        return res
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
deleted file mode 100644
index 0b3dfe5f3b2..00000000000
--- a/addons/portal_event/security/ir.model.access.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
-access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
-access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
-access_product_product,product.product,product.model_product_product,portal_event.group_event_portal,1,0,0,0
-access_product_uom,product.uom,product.model_product_uom,portal_event.group_event_portal,1,0,0,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
deleted file mode 100644
index 1202fcce3f5..00000000000
--- a/addons/portal_event/security/portal_event_security.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-        <!-- Creating Portal Group -->
-        
-        <record id="group_event_portal" model="res.groups">
-            <field name="name">Event Portal Groups</field>
-            <field ref="event.module_category_event_management" name="category_id"/>
-        </record>
-        
-        <record id="portal_event" model="res.portal">
-            <field name="name">Portal User</field>
-            <field name="group_id" ref="group_event_portal"/>
-        </record>
-            
-        <!-- Sale Portal Access Rules -->
-        <record id="portal_event_rule" model="ir.rule">
-            <field name="name">Personal Events</field>
-            <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">[]</field>
-            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
-        </record>
-        
-        <record id="portal_registration_rule" model="ir.rule">
-            <field name="name">Personal Registrations</field>
-            <field ref="event.model_event_registration" name="model_id"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
-        </record>        
-        
-    </data>
-</openerp>
\ No newline at end of file

From f80dd759f0102df2ba649704f5d97f0ca66d6f2c Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 19:22:37 +0530
Subject: [PATCH 093/126] [REM]: Remove duplicate page view

bzr revid: atp@tinyerp.com-20120523135237-xylcrrkiod620sve
---
 addons/event/event_view.xml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e0d7badd1b4..0866dd876af 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -163,29 +163,6 @@
                             </form>
                             </field>
                     </page>
-
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
                     </notebook>
             </sheet>
             </form>

From d8cc56970817c192134e7e98d75248c8d04891cc Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 24 May 2012 12:02:38 +0530
Subject: [PATCH 094/126] [IMP] account : Added one fields.boolean('sent',
 readonly=1) and display the 'print' button and the 'send by email' button
 only if it is False.

bzr revid: mdi@tinyerp.com-20120524063238-ylx1djklh2zrydsq
---
 addons/account/account_invoice.py           | 3 +++
 addons/account/account_invoice_view.xml     | 7 ++++---
 addons/account/account_invoice_workflow.xml | 2 +-
 addons/account/account_report.xml           | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 0d392d85fa2..288f1119639 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -213,6 +213,7 @@ class account_invoice(osv.osv):
             \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
             \n* The \'Paid\' state is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
+        'sent': fields.boolean('Sent', readonly=True, help="It indicates that the invoice has been sent."),
         'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"),
         'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True,
             help="If you use payment terms, the due date will be computed automatically at the generation "\
@@ -287,6 +288,7 @@ class account_invoice(osv.osv):
         'check_total': 0.0,
         'internal_number': False,
         'user_id': lambda s, cr, u, c: u,
+        'sent': False,
     }
     _sql_constraints = [
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
@@ -641,6 +643,7 @@ class account_invoice(osv.osv):
             'move_name':False,
             'internal_number': False,
             'period_id': False,
+            'sent': False,
         })
         if 'date_invoice' not in default:
             default.update({
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index c6926ce742e..152dae5de8b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -262,15 +262,15 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                	<button name="action_invoice_sent" type="object" string="Send by Email" states="open"/>
-                	<button name="invoice_print" string="Print Invoice" type="object" states="open"/>
+                	<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
+                	<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='sent,paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open,sent" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/>
+                    <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,sent,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                     </div>
@@ -293,6 +293,7 @@
                     <newline/>
                     <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
                     <field name="name"/>
+                    <field name="sent"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 88028fc2ca1..9f676df393d 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -34,7 +34,7 @@ invoice_validate()</field>
         <record id="act_sent" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">sent</field>
-            <field name="action">write({'state':'sent'})</field>
+            <field name="action">write({'state':'sent', 'sent':True})</field>
             <field name="kind">function</field>
         </record>
 
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 78caf1c95b6..7b574c8960e 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -21,7 +21,7 @@
             string="Invoices"
             attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
             usage="default"
-            multi="True"/>
+            />
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 

From 0194d0255ef8eedf8fee99ff9e1965e204ea939f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 24 May 2012 14:59:35 +0200
Subject: [PATCH 095/126] first version of many2manykanban

bzr revid: nicolas.vanhoren@openerp.com-20120524125935-6w2z7aavaq18aih1
---
 addons/web/static/src/js/view_form.js         | 111 ++++++++++++++++++
 addons/web_kanban/static/src/js/kanban.js     |   2 +-
 .../web_kanban/static/src/xml/web_kanban.xml  |   4 +-
 3 files changed, 115 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3430f1dd703..a049a5f215f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3338,6 +3338,116 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
     }
 });
 
+instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend({
+    disable_utility_classes: true,
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
+        m2m_kanban_lazy_init();
+        this.is_loaded = $.Deferred();
+        this.initial_is_loaded = this.is_loaded;
+        this.is_setted = $.Deferred();
+    },
+    start: function() {
+        this._super.apply(this, arguments);
+
+        var self = this;
+
+        this.dataset = new instance.web.form.Many2ManyDataSet(this, this.field.relation);
+        this.dataset.m2m = this;
+        this.dataset.on_unlink.add_last(function(ids) {
+            self.dataset_changed();
+        });
+        
+        this.is_setted.then(function() {
+            self.load_view();
+        });
+        this.is_loaded.then(function() {
+            self.on("change:effective_readonly", self, function() {
+                self.is_loaded = self.is_loaded.pipe(function() {
+                    self.kanban_view.destroy();
+                    return $.when(self.load_view()).then(function() {
+                        self.reload_content();
+                    });
+                });
+            });
+        })
+    },
+    set_value: function(value_) {
+        value_ = value_ || [];
+        if (value_.length >= 1 && value_[0] instanceof Array) {
+            value_ = value_[0][2];
+        }
+        this._super(value_);
+        this.dataset.set_ids(value_);
+        var self = this;
+        self.reload_content();
+        this.is_setted.resolve();
+    },
+    load_view: function() {
+        var self = this;
+        this.kanban_view = new instance.web.form.Many2ManyKanbanView(this, this.dataset, false, {
+                    'create_text': _t("Add"),
+                    'creatable': self.get("effective_readonly") ? false : true,
+                    'quick_creatable': self.get("effective_readonly") ? false : true,
+            });
+        var embedded = (this.field.views || {}).kanban;
+        if (embedded) {
+            this.kanban_view.set_embedded_view(embedded);
+        }
+        this.kanban_view.m2m_field = this;
+        var loaded = $.Deferred();
+        this.kanban_view.on_loaded.add_last(function() {
+            self.initial_is_loaded.resolve();
+            loaded.resolve();
+        });
+        this.kanban_view.do_switch_view.add_last(_.bind(this.add_new_record, this));
+        $.async_when().then(function () {
+            self.kanban_view.appendTo(self.$element);
+        });
+        return loaded;
+    },
+    reload_content: function() {
+        var self = this;
+        this.is_loaded = this.is_loaded.pipe(function() {
+            return self.kanban_view.do_search(self.build_domain(), self.dataset.get_context(), []);
+        });
+    },
+    dataset_changed: function() {
+        this.set({'value': [commands.replace_with(this.dataset.ids)]});
+    },
+    add_new_record: function(type) {
+        if (type !== "form")
+            return;
+        var pop = new instance.web.form.SelectCreatePopup(this);
+        pop.select_element(
+            this.field.relation,
+            {
+                title: _t("Add: ") + this.name
+            },
+            new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
+            this.build_context()
+        );
+        var self = this;
+        pop.on_select_elements.add(function(element_ids) {
+            _.each(element_ids, function(one_id) {
+                if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
+                    self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
+                    self.dataset_changed();
+                    self.reload_content();
+                }
+            });
+        });
+    },
+});
+
+function m2m_kanban_lazy_init() {
+if (instance.web.form.Many2ManyKanbanView)
+    return;
+instance.web.form.Many2ManyKanbanView = instance.web_kanban.KanbanView.extend({
+    
+});
+}
+
 /**
  * Class with everything which is common between FormOpenPopup and SelectCreatePopup.
  */
@@ -3951,6 +4061,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'many2one' : 'instance.web.form.FieldMany2One',
     'many2many' : 'instance.web.form.FieldMany2Many',
     'many2manytags' : 'instance.web.form.FieldMany2ManyTags',
+    'many2manykanban' : 'instance.web.form.FieldMany2ManyKanban',
     'one2many' : 'instance.web.form.FieldOne2Many',
     'one2many_list' : 'instance.web.form.FieldOne2Many',
     'reference' : 'instance.web.form.FieldReference',
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index ab296674e76..20d10ca410b 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -13,7 +13,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     number_of_color_schemes: 10,
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
-        _.defaults(this.options, {"quick_creatable": true, "creatable": true});
+        _.defaults(this.options, {"quick_creatable": true, "creatable": true, "create_text": undefined});
         this.fields_view = {};
         this.fields_keys = [];
         this.group_by = null;
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 2fef4737acc..cabe9cb52fb 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -13,7 +13,9 @@
 <div t-name="KanbanView.buttons" class="oe_kanban_buttons">
     <t t-if="widget.options.action_buttons !== false">
         <t t-if="widget._is_create_enabled()">
-            <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">Create</button>
+            <button type="button" class="oe_button oe_kanban_button_new oe_form_button_hi">
+                <t t-esc="widget.options.create_text || _t('Create')"/>
+            </button>
         </t>
     </t>
 </div>

From 2889564e8d1fa8cb3dd1f4976dd07649424f8b1a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 24 May 2012 16:42:51 +0200
Subject: [PATCH 096/126] [imp] added open field

bzr revid: nicolas.vanhoren@openerp.com-20120524144251-af1b19hnyrj5p98y
---
 addons/web/static/src/js/view_form.js | 55 ++++++++++++++++++---------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a049a5f215f..69a418cb225 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3400,7 +3400,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             self.initial_is_loaded.resolve();
             loaded.resolve();
         });
-        this.kanban_view.do_switch_view.add_last(_.bind(this.add_new_record, this));
+        this.kanban_view.do_switch_view.add_last(_.bind(this.open_popup, this));
         $.async_when().then(function () {
             self.kanban_view.appendTo(self.$element);
         });
@@ -3415,28 +3415,45 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
     dataset_changed: function() {
         this.set({'value': [commands.replace_with(this.dataset.ids)]});
     },
-    add_new_record: function(type) {
+    open_popup: function(type, unused) {
         if (type !== "form")
             return;
-        var pop = new instance.web.form.SelectCreatePopup(this);
-        pop.select_element(
-            this.field.relation,
-            {
-                title: _t("Add: ") + this.name
-            },
-            new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
-            this.build_context()
-        );
         var self = this;
-        pop.on_select_elements.add(function(element_ids) {
-            _.each(element_ids, function(one_id) {
-                if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
-                    self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
-                    self.dataset_changed();
-                    self.reload_content();
-                }
+        if (this.dataset.index === null) {
+            var pop = new instance.web.form.SelectCreatePopup(this);
+            pop.select_element(
+                this.field.relation,
+                {
+                    title: _t("Add: ") + this.name
+                },
+                new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]),
+                this.build_context()
+            );
+            pop.on_select_elements.add(function(element_ids) {
+                _.each(element_ids, function(one_id) {
+                    if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
+                        self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
+                        self.dataset_changed();
+                        self.reload_content();
+                    }
+                });
             });
-        });
+        } else {
+            var id = self.dataset.ids[self.dataset.index];
+            var pop = new instance.web.form.FormOpenPopup(self.view);
+            pop.show_element(self.field.relation, id, self.build_context(), {
+                title: _t("Open: ") + self.name,
+                write_function: function(id, data, options) {
+                    return self.dataset.write(id, data, {}).then(function() {
+                        self.reload_content();
+                    });
+                },
+                alternative_form_view: self.field.views ? self.field.views["form"] : undefined,
+                parent_view: self.view,
+                child_name: self.name,
+                readonly: self.get("effective_readonly")
+            });
+        }
     },
 });
 

From c78ca8dd35271227b6c82fe79dc3be15baae8a7a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 24 May 2012 18:07:52 +0200
Subject: [PATCH 097/126] [IMP] Improved project and opportunities kanban view.
 Use KanbanRecord#on_card_clicked

bzr revid: fme@openerp.com-20120524160752-rl0by5v4g1n22syl
---
 addons/crm/crm_lead_view.xml            |  4 ++--
 addons/project/project_view.xml         |  2 +-
 addons/project/static/src/js/project.js | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3c773ed3ec9..3c2b8f48eb6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -264,13 +264,13 @@
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
-                                <a type="edit"><h3>
+                                <h3>
                                     <field name="partner_id"/>
                                     <t t-if="record.planned_revenue.raw_value">
                                         - <t t-esc="Math.round(record.planned_revenue.value)"/>
                                         <field name="company_currency"/>
                                     </t>
-                                </h3></a>
+                                </h3>
                                 <div>
                                     <b> <field name="partner_address_name"/> </b>
                                 </div>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8e10fe6df7e..70cdac1efa0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -196,7 +196,7 @@
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                                 <div class="oe_kanban_content">
-                                    <a type="edit"><h3 class="oe_kanban_ellipsis"><field name="name"/></h3></a>
+                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
 
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value"
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 297aa7184b9..510fcbb99e7 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -23,4 +23,14 @@ openerp.project = function(openerp) {
             }
         }
     });
+
+    openerp.web_kanban.KanbanRecord.include({
+        on_card_clicked: function() {
+            if (this.view.dataset.model === 'project.project') {
+                this.$('.oe_kanban_project_list a').first().click();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        }
+    });
 };

From 86638a545c74c5576cf53b0e37e778d343b2f0f3 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 25 May 2012 04:40:07 +0000
Subject: [PATCH 098/126] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120525044007-8yn0z71lbi14nuu6
---
 addons/account_check_writing/i18n/fr.po |  10 +-
 addons/account_coda/i18n/fr.po          |  10 +-
 addons/account_followup/i18n/fr.po      |  70 ++-
 addons/caldav/i18n/ja.po                |  45 +-
 addons/crm_partner_assign/i18n/ja.po    |  10 +-
 addons/import_base/i18n/ja.po           | 104 +++++
 addons/import_google/i18n/ja.po         | 223 ++++++++++
 addons/import_sugarcrm/i18n/fr.po       |  10 +-
 addons/l10n_be/i18n/ja.po               | 503 +++++++++++++++++++++
 addons/lunch/i18n/ja.po                 | 554 ++++++++++++++++++++++++
 addons/mail/i18n/ja.po                  | 508 ++++++++++++++++++++++
 addons/mrp/i18n/fr.po                   |  91 ++--
 addons/plugin/i18n/fr.po                |  11 +-
 addons/plugin_thunderbird/i18n/fr.po    |  11 +-
 addons/purchase/i18n/fr.po              |  75 ++--
 addons/stock/i18n/de.po                 |  10 +-
 16 files changed, 2126 insertions(+), 119 deletions(-)
 create mode 100644 addons/import_base/i18n/ja.po
 create mode 100644 addons/import_google/i18n/ja.po
 create mode 100644 addons/l10n_be/i18n/ja.po
 create mode 100644 addons/lunch/i18n/ja.po
 create mode 100644 addons/mail/i18n/ja.po

diff --git a/addons/account_check_writing/i18n/fr.po b/addons/account_check_writing/i18n/fr.po
index 1a5c3d54fa0..c179c281856 100644
--- a/addons/account_check_writing/i18n/fr.po
+++ b/addons/account_check_writing/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-13 21:29+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:30+0000\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -155,7 +155,7 @@ msgstr "Sociétés"
 #. module: account_check_writing
 #: view:res.company:0
 msgid "Default Check Layout"
-msgstr ""
+msgstr "Disposition par défaut des chèques"
 
 #. module: account_check_writing
 #: constraint:account.journal:0
diff --git a/addons/account_coda/i18n/fr.po b/addons/account_coda/i18n/fr.po
index 90cabdeb999..6c1d8caa2c7 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/account_coda/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2010-12-31 10:33+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2012-05-24 17:31+0000\n"
+"Last-Translator: gde (OpenERP) <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:08+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -70,7 +70,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_002
 msgid "Interest paid"
-msgstr ""
+msgstr "Intérêts payés"
 
 #. module: account_coda
 #: field:account.coda.trans.type,parent_id:0
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 74243144583..4e1604dcf9b 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-13 21:37+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:31+0000\n"
+"Last-Translator: YannUbuntu <yannubuntu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-14 05:43+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -69,6 +69,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Cher % (partner_name)s,\n"
+"\n"
+"Nous constatons que, malgré l'envoi d'un rappel, votre compte client "
+"présente toujours à ce jour un solde débiteur.\n"
+"\n"
+"Il est essentiel que le règlement soit réalisé immédiatement faute de quoi "
+"nous devrons envisager de stopper\n"
+"nos relations commerciales jusqu'à apurement de la situation.\n"
+"\n"
+"Merci de prendre les mesures appropriées pour que le règlement intervienne "
+"dans les 8 prochains jours.\n"
+"\n"
+"S'il subsiste un problème avec le paiement de la facture dont nous n'avons "
+"pas été informé, n'hésitez pas à contacter notre service comptabilité  au "
+"(+32) .12.34.56.78 afin que nous puissions le solutionner rapidement.\n"
+"\n"
+"Le détails de paiements dus est imprimé ci-dessous.\n"
+"\n"
+"Nous vous prions d’agréer, Madame, Monsieur, nos respectueuses salutations.\n"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -123,7 +143,7 @@ msgstr "Valeur erronée au crédit ou au débit de l'écriture comptable !"
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr "Jour ouvrable"
+msgstr "Jours ouvrables"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -340,6 +360,8 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
+"Votre description n'est pas correcte, utilisez une légende exacte  ou %% si "
+"vous souhaitez utiliser le caractère pour cent."
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -449,7 +471,7 @@ msgstr "Envoyer un Message de confirmation"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr "Total:"
+msgstr "Total :"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -529,7 +551,7 @@ msgstr "Rapport des Relances"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "Niveaux de relance"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -561,7 +583,7 @@ msgstr "Niveau de relance maximal"
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "Définir les relances"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -576,6 +598,11 @@ msgid ""
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"Définissez les niveaux de relance, leur message et leur déclenchement. Pour "
+"chaque étape, spécifiez le message et le nombre de jours avant la relance. "
+"Utilisez la légende pour connaître le code à utiliser pour adapter "
+"dynamiquement le contenu du courriel  (nom, date). Vous pouvez aussi gérer "
+"la langue des messages en fonction des destinataires."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -590,6 +617,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Aucun courriel n'a été envoyé aux partenaires suivants. Leur adresse de "
+"courriel n'est pas renseignée !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -605,7 +636,7 @@ msgstr "%(date)s: Date Courante"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Inclure les écritures marquées comme litigieuses"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -621,7 +652,7 @@ msgstr "Description"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "Une seule relance par société"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -715,11 +746,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Cher% (partner_name)s,\n"
+"\n"
+"Malgré plusieurs rappels, votre compte est toujours débiteur.\n"
+"\n"
+"A moins d'un paiement intégral effectué dans les 8 prochains jours, une "
+"action  pour le recouvrement de la dette sera entreprise sans autre avis.\n"
+"\n"
+"Je suis convaincu que cette action se révélera inutile. Le  détails des "
+"sommes dues est imprimé ci-dessous.\n"
+"\n"
+"En cas de question concernant cette situation, n'hésitez pas à contacter "
+"notre service comptabilité au (+32) .12.34.56.78.\n"
+"\n"
+"Cordialement,\n"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Vous ne pouvez pas passer d'écritures sur un compte clôturé."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -744,7 +790,7 @@ msgstr "Réf. Client"
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "Tester l'impression"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
diff --git a/addons/caldav/i18n/ja.po b/addons/caldav/i18n/ja.po
index 3562cb9af41..cb0c2dc92e5 100644
--- a/addons/caldav/i18n/ja.po
+++ b/addons/caldav/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 06:38+0000\n"
+"PO-Revision-Date: 2012-05-24 17:42+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: caldav
@@ -850,6 +850,47 @@ msgid ""
 "      now trusts it.\n"
 "    "
 msgstr ""
+"\n"
+"    SSL固有の設定は以下のドキュメントを参照して下さい。\n"
+"\n"
+"カレンダーの設定のために次のことをする必要があります：\n"
+"\n"
+"1. 設定をクリックし、メール、コンタクト、カレンダーページに行きます。\n"
+"2. アカウントを追加に進みます。\n"
+"3. その他をクリックします。\n"
+"4. カレンダーグループからCalDAVアカウントの追加を選択します。\n"
+"\n"
+"5. ホスト名を入力します。\n"
+"   （例：URLが http://openerp.com:8069/webdav/db_1/calendars/ "
+"であれば、openerp.comのホスト）\n"
+"\n"
+"6. OpenERPのユーザ名とパスワードを埋めます。\n"
+"\n"
+"7. 詳細として、サーバ名かOpenERPカレンダーの類の何れかを残すことができます。\n"
+"\n"
+"9. SSLサーバを使わない場合、エラーが発生します。気に留めず継続を押下します。\n"
+"\n"
+"10. 詳細設定をクリックし正しいポートとパスを設定します。\n"
+"\n"
+"11. OpenERPサーバのポートを指定：SSLは8071、他は8069\n"
+"\n"
+"12. アカウントURLにOpenERP WebDAVの正しいパスを設定します。\n"
+"    URLはウィザードにより与えられます（例：http://my.server.ip:8069/webdav/dbname/calendars/）\n"
+"\n"
+"13. 完了をクリック。上手くいけば電話はOpenERPサーバに接続詞アカウントの使用を検証します。\n"
+"\n"
+"14. iPhoneのメインメニューに行き、カレンダーアプリケーションに入ります。\n"
+"　　あなたのOpenERPカレンダーはカレンダーボタンの選択の内側に表示される。\n"
+"　　新しいカレンダーエントリーを作成する時、保存されるカレンダーの指定が必要であることに注意して下さい。\n"
+"\n"
+"SSLを必要とする場合は（証明書はいつものように検証済ではない）、最初に次の手順でiPhoneに信頼させることが必要です。\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"\n"
+"    s1. Safari（ブラウザ）を開いてOpenERPサーバのhttpsの場所を入力します：\n"
+"　      https://my.server.ip:8071/\n"
+"      （サーバが\"my.server.ip\"にありHTTPSポートがデフォルトの8071と想定)\n"
+"    s2. Safariは接続してその証明書が使われたことを警告します。証明書を検証し、同意するとiPhoneは信頼します。\n"
+"    "
 
 #. module: caldav
 #: selection:user.preference,device:0
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index c2ab27be520..430536f66cd 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-22 04:23+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-05-25 02:34+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-23 04:46+0000\n"
-"X-Generator: Launchpad (build 15135)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -30,7 +30,7 @@ msgstr "メッセージタイプ"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr "送信後、Eメールを削除する"
+msgstr "送信後、Eメールを削除"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
diff --git a/addons/import_base/i18n/ja.po b/addons/import_base/i18n/ja.po
new file mode 100644
index 00000000000..373a4668d1b
--- /dev/null
+++ b/addons/import_base/i18n/ja.po
@@ -0,0 +1,104 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-24 18:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "予期しないエラーでインポートが失敗しました。"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "%s で起動し %s で終了 \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "データのインポートは %s で終了しました。"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"失敗しました。結果としてデータベースの整合性維持のためデータはインポートされませんでした。 \n"
+"　エラー： \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+"データのインポート\n"
+"　インスタンス名：%s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr "%s は正常にインポートされました。元：%s %s、%s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr "データインポートは %s で予期しないエラーのため失敗しました。"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr "インポートが完了しました。通知メールが送信されました。"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr "%s は有効なモデル名ではありません。"
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "インポート"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "警告なしで"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "警告付きで：%s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " 項目がインポートされました： "
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
new file mode 100644
index 00000000000..ad1ab085495
--- /dev/null
+++ b/addons/import_google/i18n/ja.po
@@ -0,0 +1,223 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-24 18:56+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr "インポートするグループを選択して下さい。デフォルトでは全てを取得します。"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr "Googleカレンダーイベントのインポート"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "イベントのインポート"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+"ユーザのGoogleユーザ名またはパスワードが定義されていません。\n"
+"ユーザビューで定義して下さい。"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+"ログインの詳細が無効です。\n"
+"　ユーザ名 / パスワードを指定して下さい。"
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "仕入先"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "インポートオプション"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "グループ名"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr "ケースの分類"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "Googleコンタクトのインポート"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr "Googleデータのインポート"
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr "ミーティングタイプ"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"gdata-python-client をインストールして下さい。URL：http://code.google.com/p/gdata-python-"
+"client/downloads/list"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr "Googleコンタクト"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr "Googleアカウントからコンタクトのインポート"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr "正しいユーザとパスワードを指定して下さい。"
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr "コンタクトのインポート"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr "Googleカレンダーのインポート"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr "Googleのインポート"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "オプション"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Googleコンタクトのインポートエラーです。"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr "メッセージのインポート"
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "カレンダー名"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr "仕入先として新しく作成したパートナを設定するにはこのボックスをチェックして下さい。"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "住所のみをインポート"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr "このグループのパートナステータス："
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr "メッセージ"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr "各コンタクトのパートナの作成"
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr "顧客として新しく作成したパートナを設定するにはこのボックスをチェックして下さい。"
diff --git a/addons/import_sugarcrm/i18n/fr.po b/addons/import_sugarcrm/i18n/fr.po
index bc86547f52b..29b68b9f73a 100644
--- a/addons/import_sugarcrm/i18n/fr.po
+++ b/addons/import_sugarcrm/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-17 13:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-05-24 17:37+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -108,7 +108,7 @@ msgstr ""
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Schedule Recurrent Imports"
-msgstr ""
+msgstr "_Planifier les imports récurrents"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
diff --git a/addons/l10n_be/i18n/ja.po b/addons/l10n_be/i18n/ja.po
new file mode 100644
index 00000000000..d70ff834981
--- /dev/null
+++ b/addons/l10n_be/i18n/ja.po
@@ -0,0 +1,503 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-05-25 01:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: l10n_be
+#: field:partner.vat.intra,test_xml:0
+msgid "Test XML file"
+msgstr "テスト用XMLファイル"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "You can remove customers which you do not want in exported xml file"
+msgstr "XMLファイルにエクスポートしたくない顧客を削除できます。"
+
+#. module: l10n_be
+#: view:partner.vat_13:0
+msgid ""
+"This wizard will create an XML file for VAT details and total invoiced "
+"amounts per partner."
+msgstr "このウィザードはVATの詳細とパートナ毎の合計請求済金額のXMLファイルを作成します。"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tiers_receiv
+msgid "Tiers - Recevable"
+msgstr "層 - 受取勘定"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102
+#, python-format
+msgid "Wrong Period Code"
+msgstr "誤った期間コード"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:52
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:109
+#, python-format
+msgid "No partner has a VAT Number asociated with him."
+msgstr "パートナは彼に結びつけるVAT番号を持っていません。"
+
+#. module: l10n_be
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tiers
+msgid "Tiers"
+msgstr "層"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,period_id:0
+msgid "Period"
+msgstr "期間"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_ids:0
+msgid "Period (s)"
+msgstr "期間"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Save the File with '.xml' extension."
+msgstr "\".xml\"拡張子のファイルを保存"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_charge
+msgid "Charge"
+msgstr "料金"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:52
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:105
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:109
+#, python-format
+msgid "Data Insufficient!"
+msgstr "データ不足です。"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.list_13:0
+msgid "Create XML"
+msgstr "XMLの作成"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_capitaux
+msgid "Capital"
+msgstr "大文字"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Save XML"
+msgstr "XMLの保存"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:219
+#, python-format
+msgid "Save"
+msgstr "保存"
+
+#. module: l10n_be
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,msg:0
+#: field:partner.vat.intra,msg:0
+#: field:partner.vat.list_13,msg:0
+msgid "File created"
+msgstr "ファイルを作成しました。"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "_Close"
+msgstr "閉じる"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:131
+#, python-format
+msgid "Save XML For Vat declaration"
+msgstr "VAT申告用XMLの保存"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "Customers"
+msgstr "顧客"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tax_in
+msgid "Taxes à l'entrée"
+msgstr "入口税"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_restitution:0
+msgid "It indicates whether a resitution is to made or not?"
+msgstr "それは還付されたかどうかを示します。"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
+msgid "Vat Declaraion"
+msgstr "VAT申告"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,no_vat:0
+msgid "Partner With No VAT"
+msgstr "VAT対象外パートナ"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_immo
+msgid "Immobilisation"
+msgstr "固定化"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Company"
+msgstr "会社"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_13
+msgid "partner.vat_13"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
+msgid "Annual Listing Of VAT-Subjected Customers"
+msgstr "VAT対象顧客の年間リスト"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "XML File has been Created."
+msgstr "XMLファイルは作成されました。"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,client_nihil:0
+msgid ""
+"Tick this case only if it concerns only the last statement on the civil or "
+"cessation of activity"
+msgstr "これは民間の最新の取引明細書または活動の中止に関連する場合のみに、このケースをチェックして下さい。"
+
+#. module: l10n_be
+#: view:partner.vat.list_13:0
+msgid "Select Fiscal Year"
+msgstr "会計年度選択"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_restitution:0
+msgid "Ask Restitution"
+msgstr "還付請求"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_intra
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
+msgid "Partner VAT Intra"
+msgstr "パートナのVAT内部"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
+#: view:l1on_be.vat.declaration:0
+msgid "Periodical VAT Declaration"
+msgstr "周期的なVAT申請"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Note: "
+msgstr "注記： "
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "_Preview"
+msgstr "プレビュー"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tiers_payable
+msgid "Tiers - Payable"
+msgstr "層 - 支払債務"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,tax_code_id:0
+#: field:partner.vat.intra,tax_code_id:0
+msgid "Tax Code"
+msgstr "税金コード"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Periods"
+msgstr "期間"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_produit
+msgid "Produit"
+msgstr "製品"
+
+#. module: l10n_be
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr "テストファイルとしてXML出力を設定"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
+msgstr "ビュー"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_payment:0
+msgid "Ask Payment"
+msgstr "支払要請"
+
+#. module: l10n_be
+#: help:partner.vat.intra,no_vat:0
+msgid ""
+"The Partner whose VAT number is not defined they doesn't include in XML File."
+msgstr "パートナのVAT番号はXMLファイルに含まれておらず、定義されていません。"
+
+#. module: l10n_be
+#: field:partner.vat_13,limit_amount:0
+msgid "Limit Amount"
+msgstr "限度額"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Create _XML"
+msgstr "XMLの作成"
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
+msgstr "内部定義に含めたい期間をここで定義して下さい。"
+
+#. module: l10n_be
+#: view:partner.vat_13:0
+msgid "View Customers"
+msgstr "顧客ビュー"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102
+#, python-format
+msgid "The period code you entered is not valid."
+msgstr "入力の期間コードは有効ではありません。"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Is Last Declaration"
+msgstr "最終申請"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_stock
+msgid "Stock et Encours"
+msgstr "株式と未払"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,client_nihil:0
+msgid "Last Declaration of Enterprise"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,mand_id:0
+msgid ""
+"This identifies the representative of the sending company. This is a string "
+"of 14 characters"
+msgstr "これは送信会社の代表者を識別します。これは14文字の文字列です。"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:75
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:150
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:98
+#, python-format
+msgid "Data Insufficient"
+msgstr "データ不足です。"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
+msgid "Belgium Statements"
+msgstr "ベルギー取引明細書"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
+msgid "Partner Vat Intra"
+msgstr "パートナのVAT内部"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Declare Periodical VAT"
+msgstr "定期的VATの定義"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_list_13
+msgid "partner.vat.list_13"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Save xml"
+msgstr "XMLを保存"
+
+#. module: l10n_be
+#: field:partner.vat.intra,mand_id:0
+msgid "MandataireId"
+msgstr "代理人"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,file_save:0
+#: field:partner.vat.intra,file_save:0
+#: field:partner.vat.list_13,file_save:0
+msgid "Save File"
+msgstr "ファイルを保存"
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_code:0
+msgid ""
+"This is where you have to set the period code for the intracom declaration "
+"using the format: ppyyyy\n"
+"      PP can stand for a month: from '01' to '12'.\n"
+"      PP can stand for a trimester: '31','32','33','34'\n"
+"          The first figure means that it is a trimester,\n"
+"          The second figure identify the trimester.\n"
+"      PP can stand for a complete fiscal year: '00'.\n"
+"      YYYY stands for the year (4 positions).\n"
+"    "
+msgstr ""
+"ここで内部定義のための期間コードを設定しなければなりません。フォーマット：ppyyyy\n"
+"      PPで月を示す場合：01から12\n"
+"      PPで3ヶ月間を示す場合：31、32、33、34\n"
+"          最初の数字は3ヶ月間を示します。\n"
+"          ２番目の数字は3ヶ月間の識別です。\n"
+"      PPで会計年度を示す場合：00\n"
+"      YYYYは年（4桁）\n"
+"    "
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,name:0
+#: field:partner.vat.intra,name:0
+#: field:partner.vat.list_13,name:0
+msgid "File Name"
+msgstr "ファイル名"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tax_out
+msgid "Taxes à la sortie"
+msgstr "出口税"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tax
+msgid "Tax"
+msgstr "税金"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:75
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:150
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:98
+#, python-format
+msgid "No VAT Number Associated with Main Company!"
+msgstr "主会社と関係したVAT番号がありません。"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
+msgid "Vat Declaration"
+msgstr "VAT申請"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,country_ids:0
+msgid "European Countries"
+msgstr "ヨーロッパ諸国"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing_13
+#: view:partner.vat_13:0
+msgid "Partner VAT Listing"
+msgstr "パートナVATリスト"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "General Information"
+msgstr "一般情報"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Create an XML file for Vat Intra"
+msgstr "VAT内部のXMLファイルの作成"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr "期間コード"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_financiers
+msgid "Financier"
+msgstr "出資者"
+
+#. module: l10n_be
+#: field:partner.vat_13,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: l10n_be
+#: view:partner.vat_13:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list_13:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:105
+#, python-format
+msgid "Please select at least one Period."
+msgstr "少なくとも１つの期間を選択して下さい。"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_payment:0
+msgid "It indicates whether a payment is to made or not?"
+msgstr "支払をしたかどうかを示します。"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Partner VAT intra"
+msgstr "パートナVAT内部"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47
+#, python-format
+msgid "No data for the selected Year."
+msgstr "選択した年にデータがありません。"
diff --git a/addons/lunch/i18n/ja.po b/addons/lunch/i18n/ja.po
new file mode 100644
index 00000000000..445a960e7cc
--- /dev/null
+++ b/addons/lunch/i18n/ja.po
@@ -0,0 +1,554 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-25 02:30+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Reset cashbox"
+msgstr "金庫のリセット"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current year"
+msgstr "現在年のボックス数"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr "昼食オーダー"
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "本当にこのオーダーをキャンセルしますか？"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr "現金移動"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0 view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr "オーダーの確認"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7日    "
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:lunch.order:0
+msgid "Today"
+msgstr "今日"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "合計："
+
+#. module: lunch
+#: field:report.lunch.amount,day:0 view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel_values
+#: model:ir.model,name:lunch.model_lunch_order_cancel view:lunch.order:0
+#: view:lunch.order.cancel:0
+msgid "Cancel Order"
+msgstr "オーダーのキャンセル"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_create_cashbox
+msgid ""
+"You can create on cashbox by employee if you want to keep track of the "
+"amount due by employee according to what have been ordered."
+msgstr "従業員毎に何がオーダーされたかによる金額を追跡したい場合は、従業員毎の金庫を作成することができます。"
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "量"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form view:lunch.product:0
+msgid "Products"
+msgstr "製品"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr "ユーザとボックスで使用可能な量"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   月   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "昼食オーダー統計"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr "現金移動"
+
+#. module: lunch
+#: view:lunch.order:0 selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "確認済"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "昼食オーダーの検索"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "合計価格"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr "ユーザ毎のボックス量"
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "名前 / 日付"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "オーダーの詳細"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in last month"
+msgstr "先月のボックス量"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm_values
+#: view:lunch.order:0 view:lunch.order.confirm:0
+msgid "Confirm Order"
+msgstr "オーダーの確認"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.amount:0 view:report.lunch.order:0
+msgid "Box"
+msgstr "ボックス"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365日  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    月-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "作成日"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " 製品分類 "
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Set to Zero"
+msgstr "0に設定"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr "現金移動"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 365 days"
+msgstr "直近365日で実行されたタスク"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0 view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: lunch
+#: field:lunch.order.confirm,confirm_cashbox:0
+msgid "Name of box"
+msgstr "ボックスの名前"
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Yes"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category view:lunch.category:0
+#: view:lunch.order:0 field:lunch.order,category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  年  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "製品分類"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0 view:lunch.order.cancel:0
+msgid "No"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Orders Confirmation"
+msgstr "オーダー確認"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr "本当にこの金庫をリセットしますか？"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.view_lunch_product_form_installer
+msgid ""
+"Define all products that the employees can order for the lunch time. If you "
+"order lunch at several places, you can use the product categories to split "
+"by supplier. It will be easier for the lunch manager to filter lunch orders "
+"by categories."
+msgstr ""
+"従業員が昼食時間にオーダーできる全ての製品を定義して下さい。複数の場所で昼食をオーダーするなら、仕入先毎に分離した製品分類を使うことができます。これは昼食"
+"マネジャにとって分類別に昼食オーダーをフィルタすることを容易にします。"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "昼食オーダー分析"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0 field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0 field:report.lunch.order,user_id:0
+msgid "User Name"
+msgstr "ユーザ名"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "販売分析"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration
+msgid "Lunch"
+msgstr "昼食"
+
+#. module: lunch
+#: view:lunch.cashmove:0 view:report.lunch.order:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: lunch
+#: view:lunch.cashmove:0 field:lunch.order,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: lunch
+#: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr "ボックス名"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr "金庫のクリア"
+
+#. module: lunch
+#: field:lunch.cashmove,active:0 field:lunch.product,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "日付順"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr "昼食用金庫 "
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values
+msgid "Set CashBox to Zero"
+msgstr "金庫に0を設定"
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "General Information"
+msgstr "一般情報"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr " 金庫 "
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: lunch
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "製品"
+
+#. module: lunch
+#: field:lunch.cashmove,name:0 report:lunch.order:0 view:lunch.product:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: lunch
+#: field:lunch.order,price:0 field:lunch.product,price:0
+msgid "Price"
+msgstr "価格"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr "現金移動の検索"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr "ボックス合計"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "昼食製品"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "残り合計"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr "合計価格"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0 field:lunch.category,name:0
+#: field:lunch.product,name:0 field:report.lunch.order,box_name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "合計金額"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks performed in last 30 days"
+msgstr "直近30日で実行したタスク"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category Related to Products"
+msgstr "製品に関連する分類"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr "金庫"
+
+#. module: lunch
+#: view:lunch.category:0 report:lunch.order:0 view:lunch.order:0
+msgid "Order"
+msgstr "オーダー"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch report:lunch.order:0
+msgid "Lunch Order"
+msgstr "昼食オーダー"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box amount in current month"
+msgstr "現在月のボックス量"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer
+msgid "Define Your Lunch Products"
+msgstr "昼食製品を定義して下さい。"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Tasks during last 7 days"
+msgstr "直近7日間のタスク"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr "ユーザ毎の現金持高"
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30日   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr "確認"
+
+#. module: lunch
+#: field:report.lunch.amount,year:0 view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_create_cashbox
+msgid "Create Lunch Cash Boxes"
+msgstr "昼食用金庫の作成"
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
new file mode 100644
index 00000000000..200fbab9ab8
--- /dev/null
+++ b/addons/mail/i18n/ja.po
@@ -0,0 +1,508 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-05-25 04:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: mail
+#: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
+#: field:mail.message.common,subtype:0
+msgid "Message Type"
+msgstr "メッセージタイプ"
+
+#. module: mail
+#: help:mail.compose.message,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "送信後、Eメールを削除"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Related Document"
+msgstr "関連ドキュメントを開く"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open Attachments"
+msgstr "添付ファイルを開く"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Message Details"
+msgstr "メッセージ詳細"
+
+#. module: mail
+#: view:mail.thread:0
+msgid "Communication History"
+msgstr "会話履歴"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "Eメール作成"
+
+#. module: mail
+#: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
+#: help:mail.message.common,body_text:0
+msgid "Plain-text version of the message"
+msgstr "メッセージのテキスト版"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Body"
+msgstr "本文"
+
+#. module: mail
+#: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
+#: help:mail.message.common,email_to:0
+msgid "Message recipients"
+msgstr "メッセージの受取人"
+
+#. module: mail
+#: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
+#: field:mail.message.common,body_text:0
+msgid "Text Contents"
+msgstr "テキストの内容"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Received"
+msgstr "受信済"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Thread"
+msgstr "スレッド"
+
+#. module: mail
+#: field:mail.message,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr "送信メールサーバ"
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: mail
+#: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
+#: field:mail.message.common,reply_to:0
+msgid "Reply-To"
+msgstr "返信先"
+
+#. module: mail
+#: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
+#: help:mail.message.common,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "メッセージのリッチテキスト / HTML版"
+
+#. module: mail
+#: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動削除"
+
+#. module: mail
+#: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
+#: help:mail.message.common,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "BCCの受取人"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner view:mail.message:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: mail
+#: field:mail.compose.message,subject:0 field:mail.message,subject:0
+#: field:mail.message.common,subject:0
+msgid "Subject"
+msgstr "件名"
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:152
+#, python-format
+msgid "On %(date)s, "
+msgstr "%(date)s、 "
+
+#. module: mail
+#: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
+#: field:mail.message.common,email_from:0
+msgid "From"
+msgstr "送信者"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email message"
+msgstr "Eメールメッセージ"
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Failed"
+msgstr "失敗"
+
+#. module: mail
+#: view:mail.message:0 field:mail.message,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Reply"
+msgstr "返信"
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Sent"
+msgstr "送信済"
+
+#. module: mail
+#: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
+#: help:mail.message.common,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
+#: field:mail.message.common,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:157
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0 field:mail.message,model:0
+#: field:mail.message.common,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: help:mail.message,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0 selection:mail.message,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,partner_id:0
+msgid "Related partner"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0 field:mail.message,date:0
+#: field:mail.message.common,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "%(sender_name)s wrote:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
+#: field:mail.message.common,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,original:0
+msgid "Original"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:247 view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
+#: field:mail.message.common,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
+#: view:mail.message:0 field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
+#: field:mail.message.common,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:159
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail
+#: help:mail.message,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,references:0 field:mail.message,references:0
+#: field:mail.message.common,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0 view:mail.message:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Open"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:434
+#, python-format
+msgid "[OpenERP-Forward-Failed] %s"
+msgstr ""
+
+#. module: mail
+#: field:mail.message,user_id:0
+msgid "Related User"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,headers:0 help:mail.message,headers:0
+#: help:mail.message.common,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
+#: field:mail.message.common,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
+#: view:mail.thread:0
+msgid "Email Threads"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
+#: help:mail.message.common,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Plain)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:153
+#, python-format
+msgid "You"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
+#: help:mail.message.common,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Body (Rich)"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:155
+#, python-format
+msgid ""
+"%s wrote on %s: \n"
+" Subject: %s \n"
+"\t"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.act_res_partner_emails
+#: view:mail.message:0 field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_email_message
+#: field:mail.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,headers:0 field:mail.message,headers:0
+#: field:mail.message.common,headers:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
+#: field:mail.message.common,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_common
+msgid "mail.message.common"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,references:0 help:mail.message,references:0
+#: help:mail.message.common,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
+#: help:mail.message.common,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: selection:mail.message,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_thread.py:220
+#, python-format
+msgid "Mail attachment"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
+#: help:mail.message.common,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 7b1afd163bd..7c51b038205 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-02-16 15:09+0000\n"
-"Last-Translator: Nicolas Réau <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:38+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 04:58+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -66,7 +66,7 @@ msgstr "Occupation du poste de charge"
 #. module: mrp
 #: model:product.template,name:mrp.product_sugar_product_template
 msgid "Sugar"
-msgstr ""
+msgstr "Sucre"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -81,7 +81,7 @@ msgstr "Nombre de cycles"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "Fluide"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -165,7 +165,7 @@ msgstr "Produits finis"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Les ordres de fabrications actuellement en production."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -204,7 +204,7 @@ msgstr "Coût horaire"
 #. module: mrp
 #: model:product.template,name:mrp.product_orange_product_template
 msgid "Orange"
-msgstr ""
+msgstr "Orange"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -253,6 +253,8 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Créer un formulaire de produit pour tout ce que vous achetez ou vendez. "
+"Spécifiez un fournisseur si le produit peut être acheté."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -288,7 +290,7 @@ msgstr "Information sur la Capacité"
 #. module: mrp
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "Produits produis"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -344,7 +346,7 @@ msgstr "Vous essayez d'affecter un lot qui n'est pas pour ce produit."
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
 msgid "Cloth"
-msgstr ""
+msgstr "Tissu"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
@@ -354,7 +356,7 @@ msgstr "Production de produits"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de nomenclature récursive."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -375,7 +377,7 @@ msgstr "UdM par défaut"
 #: sql_constraint:mrp.production:0
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence doit être unique par société !"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -423,6 +425,12 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"Les propriétés dans OpenERP sont utilisées pour sélectionner la bonne "
+"nomenclature pour fabriquer un produit quand vous avez différentes façons de "
+"créer le même produit. Vous pouvez assigner plusieurs propriétés à chaque "
+"nomenclature. Quand un vendeur crée un bon de commande, il peut le lier à "
+"différentes propriétés qui sélectionneront la nomenclature en fonction des "
+"besoins."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -489,7 +497,7 @@ msgstr "le produit est de type Service"
 #. module: mrp
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -574,7 +582,7 @@ msgstr "Changer la quantité"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_configure_workcenter
 msgid "Configure your work centers"
-msgstr ""
+msgstr "Configurer les centres de travails"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -612,11 +620,15 @@ msgstr "Prix du fournisseur par UdM"
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
 msgstr ""
+"Donner la numéro de la séquence pour afficher la liste de routage du centre "
+"de travail."
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Vous ne pouvez pas déplacer des produits depuis ou vers un emplacement de "
+"type \"vue\"."
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
@@ -720,6 +732,8 @@ msgstr "Temps nécessaire à la réalisation d'un cycle"
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
 msgstr ""
+"la ligne de nomemclature de produit ne doit pas être la même que la "
+"nomemclature du produit."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -791,7 +805,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:762
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avertissement!"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -938,7 +952,7 @@ msgstr "Stock minimum"
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr ""
+msgstr "Impossible de supprimer un ordre de fabrication dans l'état \"%s\""
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -1055,7 +1069,7 @@ msgstr "Tableau de bord de production"
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_manager
 msgid "Manager"
-msgstr ""
+msgstr "Responsable"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1116,12 +1130,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.todo.category,name:mrp.category_mrp_config
 msgid "MRP Management"
-msgstr ""
+msgstr "Gestion de production"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work Center per hour."
-msgstr ""
+msgstr "Coût spécifique pour le centre de travail par heure."
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -1174,6 +1188,7 @@ msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Temps en heure pour ce centre de travail pour achever l'opération de routage."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1228,7 +1243,7 @@ msgstr "Notes"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are ready to start production."
-msgstr ""
+msgstr "Ordres de fabrication prêts à produire."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
@@ -1295,7 +1310,7 @@ msgstr "Révisions"
 #. module: mrp
 #: model:product.template,name:mrp.product_shirt_product_template
 msgid "Shirt"
-msgstr ""
+msgstr "Chemise"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1333,7 +1348,7 @@ msgstr "Produit géré en Plan Directeur"
 #: code:addons/mrp/report/price.py:204
 #, python-format
 msgid "Work Cost of %s %s"
-msgstr ""
+msgstr "Centre de cout de %s %s"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1343,7 +1358,7 @@ msgstr "Jours de sécurité pour chaque opération de production."
 #. module: mrp
 #: model:product.template,name:mrp.product_water_product_template
 msgid "Water"
-msgstr ""
+msgstr "Eau"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1360,7 +1375,7 @@ msgstr "Production sur stock"
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "La quantité commandée ne peut pas être nulle ou négative !"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -1453,7 +1468,7 @@ msgstr "En attente"
 #: code:addons/mrp/mrp.py:603
 #, python-format
 msgid "Couldn't find a bill of material for this product."
-msgstr ""
+msgstr "Impossible de trouver une nomenclature pour ce produit."
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1537,7 +1552,7 @@ msgstr "Non urgent"
 #. module: mrp
 #: field:mrp.production,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
@@ -1892,7 +1907,7 @@ msgstr "Arrondi de produit"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -1955,7 +1970,7 @@ msgstr "Configuration"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Date de début"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
@@ -2011,7 +2026,7 @@ msgstr "Temps en Heures pour la mise en place"
 #. module: mrp
 #: model:product.template,name:mrp.product_orangejuice_product_template
 msgid "Orange Juice"
-msgstr ""
+msgstr "Jus d'orange"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -2078,7 +2093,7 @@ msgstr "Structure de coût"
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_user
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -2109,7 +2124,7 @@ msgstr ""
 #. module: mrp
 #: model:product.uom,name:mrp.product_uom_litre
 msgid "Litre"
-msgstr ""
+msgstr "Litre"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:762
@@ -2294,7 +2309,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:954
 #, python-format
 msgid "PROD: %s"
-msgstr ""
+msgstr "PROD: %s"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -2820,9 +2835,6 @@ msgstr "Produits à consommer"
 #~ msgid "An entry is being made from billing material to routing."
 #~ msgstr "Une entrée sera faite depuis la liste du matériel a assembler."
 
-#~ msgid "Product to stock rules"
-#~ msgstr "Règles de stock produit"
-
 #~ msgid "Procurement convert into the draft purchase order."
 #~ msgstr "Approvisionnement converti en commande d'achat au brouillon."
 
@@ -2857,9 +2869,8 @@ msgstr "Produits à consommer"
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stock de produit stockable"
 
-#~ msgid "From minimum stock rules, it goes for procure product."
-#~ msgstr ""
-#~ "Des règles de stock minimal, il mène à l'approvisionnement du produit."
+#~ msgid "Product to stock rules"
+#~ msgstr "Règles de stock produit"
 
 #~ msgid "Minimum Stock Procure"
 #~ msgstr "Approvisionnement de stock minimum"
@@ -3001,6 +3012,10 @@ msgstr "Produits à consommer"
 #~ "Si le produit est de type \"service\" et que la méthode d'approvisionnement "
 #~ "est \"Sur stock\""
 
+#~ msgid "From minimum stock rules, it goes for procure product."
+#~ msgstr ""
+#~ "Des règles de stock minimal, il mène à l'approvisionnement du produit."
+
 #~ msgid "Service Make to Stock"
 #~ msgstr "Service sur stock"
 
diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po
index f7ce62549d4..10c5f30904f 100644
--- a/addons/plugin/i18n/fr.po
+++ b/addons/plugin/i18n/fr.po
@@ -8,16 +8,17 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 19:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-05-24 17:39+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
 msgid "plugin.handler"
-msgstr ""
+msgstr "Gestionnaire d'extensions"
diff --git a/addons/plugin_thunderbird/i18n/fr.po b/addons/plugin_thunderbird/i18n/fr.po
index 74bef6f2bdf..d79a72481f0 100644
--- a/addons/plugin_thunderbird/i18n/fr.po
+++ b/addons/plugin_thunderbird/i18n/fr.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-12-26 19:12+0000\n"
-"Last-Translator: tfr (Openerp) <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:39+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -103,4 +104,4 @@ msgstr ""
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Installer l'extension Thunderbird"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 2566fb68726..32eff6448a6 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-16 15:11+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:54+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:40+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -47,6 +48,7 @@ msgstr "Destination"
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
 msgstr ""
+"Afin de supprimer un bon de commande, celui-ci doit d'abord être annulé!"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -90,7 +92,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "Bon de commande approuvé"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
@@ -162,7 +164,7 @@ msgstr "Demandes de prix"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Receptions"
-msgstr ""
+msgstr "Basé sur les réceptions"
 
 #. module: purchase
 #: field:purchase.order,company_id:0 field:purchase.order.line,company_id:0
@@ -254,7 +256,7 @@ msgstr "Jour"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "Basé sur une facture brouillon générée"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -264,7 +266,7 @@ msgstr ""
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "Achats mensuels par catégorie"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -274,7 +276,7 @@ msgstr "Achats"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "Bon de commande qui sont en état ​​de brouillon"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -399,6 +401,7 @@ msgstr "Mouvement de stock"
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
 msgstr ""
+"Vous devez d'abord annuler toutes les factures liées à ce bon de commande."
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
@@ -442,13 +445,14 @@ msgstr "Validé par"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "Commandes du mois dernier"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
+"Vous devez d'abord annuler toutes les réceptions liées à ce bon de commande."
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -473,7 +477,7 @@ msgstr "Indique qu'une réception de marchandise a été effectuée."
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "Les bons de commande qui sont en état ​​d'exception"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
@@ -494,7 +498,7 @@ msgstr "Prix moyen"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Réceptions déjà traitées"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -512,7 +516,7 @@ msgstr "Confirmer"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "Basé sur les réceptions"
 
 #. module: purchase
 #: constraint:res.company:0
@@ -548,7 +552,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "Les bons de commande qui sont en état ​​d'exception"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -605,7 +609,7 @@ msgstr "Prix total"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "Créer ou importer des fournisseurs"
 
 #. module: purchase
 #: view:stock.picking:0
@@ -689,7 +693,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Divers"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:769
@@ -760,7 +764,7 @@ msgstr "Réceptions"
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "Vous ne pouvez pas confirmer un bon de commande sans ligne."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -786,7 +790,7 @@ msgstr "Demande de prix"
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "Liste de prix EDI (%s)"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -859,7 +863,7 @@ msgstr "Fusion de bons de commandes"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "Commande du mois en cours"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
@@ -900,7 +904,7 @@ msgstr "Total des lignes de commandes par utilisateur par mois"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "Bons de commande approuvés"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
@@ -1031,7 +1035,7 @@ msgstr "Vue calendrier"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "Basé sur les lignes du bon de commande"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1043,6 +1047,7 @@ msgstr "Montant hors-taxe"
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
 msgstr ""
+"UdM sélectionnée n'appartient pas à la même catégorie que l'UdM du produit."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1154,7 +1159,7 @@ msgstr "Filtres étendus..."
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "Contrôle de factures sur les achats"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
@@ -1171,6 +1176,9 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Créer ou importer des fournisseurs et leurs contacts à partir de ce "
+"formulaire ou vous pouvez importer vos partenaires existants grâce à un "
+"fichier CSV à partir de l'assistant \"Importer\""
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1200,7 +1208,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "Carnet d'adresses"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
@@ -1216,7 +1224,7 @@ msgstr "Annuler cde fourn."
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "Impossible d'annuler ce bon de commande!"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1301,7 +1309,7 @@ msgstr "Référence du document qui a généré cette demande d'achat"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Bons de commande qui ne sont pas encore approuvés."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1468,7 +1476,7 @@ msgstr "Tél. :"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "Commande du mois"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1483,7 +1491,7 @@ msgstr "Chercher un bon de commande"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "Sélectionner la méthode de contrôle de facturation par défaut"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
@@ -1509,7 +1517,7 @@ msgstr "En attente de confirmation du fournisseur"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "Basé sur des factures brouillon"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1551,7 +1559,7 @@ msgstr "Description"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "Commande de l'année"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1638,7 +1646,7 @@ msgstr "Montant hors-taxe"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "Livraisons à facturer"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1692,6 +1700,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Si vous définissez le contrôle de facturation sur une commande d'achat comme "
+"«Basé sur les réceptions\", vous pouvez suivre ici toutes les réceptions de "
+"produits et créer des factures pour les réceptions."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1907,7 +1918,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Bons de commande en état brouillon"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1927,7 +1938,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "Commande de l'année en cours"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 6badf447865..b483c6df987 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:56+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 22:20+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:37+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -3011,7 +3011,7 @@ msgstr "Produkt"
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Return"
-msgstr "Rendite"
+msgstr "Retoure Ausführen"
 
 #. module: stock
 #: field:stock.return.picking,invoice_state:0

From 7a70637b1000d5975067cc3eaa8685a407c03136 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 May 2012 09:28:29 +0200
Subject: [PATCH 099/126] [IMP] layout

bzr revid: fp@tinyerp.com-20120525072829-34lyox1jl60ffye8
---
 addons/event/event_view.xml           |  6 +-
 addons/event/static/src/css/event.css | 80 +--------------------------
 2 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b4932254d86..4cebf3dd309 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -206,14 +206,14 @@
                             </p>
                             <t t-if="record.register_avail.raw_value != 0">
                               <t t-if="!record.is_subscribed.raw_value">
-                                  <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1"   onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
-                                  <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
+                                  <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
+                                  <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
                                   <span >Subscribe</span>
                                   </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
-                              <button type="object" name="unsubscribe_to_event" class="unsubscribe_button oe_event_button_unsubscribe">
+                              <button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index e637bc56c65..8602ea24d53 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -29,63 +29,11 @@
   color: #FFFFFF;
   background-color: #8A89BA;
 }
-div.oe_fold_column{
-  padding:0px !important;
-}
-.oe_event_button_subscribe {
-  color: white;
-  background-color: #8a89ba;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
-  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
-}
 
-.oe_event_button_unsubscribe {
-  color: white;
-  background-color: #8a89ba;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
-  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);;
-}
-.oe_event_button_subscribe:hover {
-  cursor: pointer;
-  background-size: 100% 100%;
-  /*background: #DC5F59 none;*/
-
-}
-.oe_event_button_unsubscribe:hover {
-   cursor: pointer;
-   background-size: 100% 100%;
-   background: #DC5F59 none;
- }
- .unsubscribe, .unsubscribe_button:hover span {
-   display: none;
-   background-color: #DC5F59
- }
- .unsubscribe_button:hover .unsubscribe {
-   display: inline;
-   background-color: #DC5F59;
- }
- .no_of_seats{
+.no_of_seats{
     width:35px;
-    
- }
- .oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
 }
+
 .oe_mapbox
 { 
     position: relative;
@@ -95,27 +43,3 @@ div.oe_fold_column{
     border: 1px solid #eeeeee;
 }
 
-.oe_td_border
-{
-    width: 7em;
-    padding: 5px;
-    border-right: 1px solid black;
-    text-align: right;
-    border-color: #DCDCDC;
-    border-spacing:5em
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
-
-textarea.field_text
-{
-    width: 765px;
-    height: 318px;
-}
-td.oe_form_group_nested
-{
-    padding: 5px;
-}

From f4cfeae2c11bd8091c4fc9393a9cc501d0061807 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 25 May 2012 12:26:43 +0200
Subject: [PATCH 100/126] [IMP] sale, delivery: improvements in workflows,
 buttons and SO form view. (delivery) Replaced the wizard to add delivery cost
 by a function on the SO directly

bzr revid: qdp-launchpad@openerp.com-20120525102643-60o5761u2mzrooa9
---
 addons/delivery/__init__.py                   |  1 -
 addons/delivery/__openerp__.py                |  1 -
 addons/delivery/delivery_view.xml             | 27 ++----
 addons/delivery/sale.py                       | 35 ++++++-
 addons/delivery/wizard/__init__.py            | 25 -----
 addons/delivery/wizard/delivery_sale_order.py | 96 -------------------
 .../wizard/delivery_sale_order_view.xml       | 38 --------
 addons/sale/sale.py                           |  2 +-
 addons/sale/sale_view.xml                     | 26 ++---
 addons/stock/stock.py                         |  2 +-
 10 files changed, 60 insertions(+), 193 deletions(-)
 delete mode 100644 addons/delivery/wizard/__init__.py
 delete mode 100644 addons/delivery/wizard/delivery_sale_order.py
 delete mode 100644 addons/delivery/wizard/delivery_sale_order_view.xml

diff --git a/addons/delivery/__init__.py b/addons/delivery/__init__.py
index cfe7327dded..d277419434a 100644
--- a/addons/delivery/__init__.py
+++ b/addons/delivery/__init__.py
@@ -21,7 +21,6 @@
 
 import delivery
 import partner
-import wizard
 import report
 import sale
 import stock
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 52d4eacda5e..cd8d2520db6 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -37,7 +37,6 @@ When creating invoices from picking, OpenERP is able to add and compute the ship
     'init_xml': ['delivery_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
-        'wizard/delivery_sale_order_view.xml',
         'delivery_report.xml',
         'delivery_view.xml',
         'partner_view.xml'
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 11defc97dd9..10f12a63f4e 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -161,19 +161,6 @@
             </field>
         </record>
 
-        <record id="view_order_withcarrier_form" model="ir.ui.view">
-            <field name="name">delivery.sale.order_withcarrier.form.view</field>
-            <field name="type">form</field>
-            <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_form"/>
-            <field name="arch" type="xml">
-                <group name="logistics" position="inside">
-                    <field name="id" invisible="True"/>
-                    <field name="carrier_id" context="{'order_id':active_id or False}"/>
-                </group>
-            </field>
-        </record>
-
         <record id="view_picking_withcarrier_out_form" model="ir.ui.view">
             <field name="name">delivery.stock.picking_withcarrier.out.form.view</field>
             <field name="type">form</field>
@@ -258,14 +245,18 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="edit_project_multicompany">
-            <field name="name">sale.order.multicompany</field>
+        <record id="view_order_withcarrier_form" model="ir.ui.view">
+            <field name="name">delivery.sale.order_withcarrier.form.view</field>
+            <field name="type">form</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                    <xpath expr="//button[@name='order_confirm']" position="after">
-                         <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
-                    </xpath>
+                <xpath expr="//group[@name='bellow_the_lines_hook']" position="inside">
+                    <separator string="Delivery Costs" colspan="4"/>
+                    <field name="carrier_id" context="{'order_id':active_id or False}" colspan="2"/>
+                    <button name="delivery_set" states="draft" string="Add Now on the Sale Order" type="object" icon="gtk-add" colspan="2"/>
+                    <label string="if you don't click on 'Add Now', the delivery cost won't be added on the Sale Order, but will be added on the Delivery Order only" colspan="4"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 86fb261e413..9c2603e4bb2 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 from osv import fields,osv
-
+import time
 
 # Overloaded sale_order to manage carriers :
 class sale_order(osv.osv):
@@ -41,6 +41,39 @@ class sale_order(osv.osv):
         result.update(carrier_id=order.carrier_id.id)
         return result
 
+    def delivery_set(self, cr, uid, ids, context=None):
+        order_obj = self.pool.get('sale.order')
+        line_obj = self.pool.get('sale.order.line')
+        grid_obj = self.pool.get('delivery.grid')
+        carrier_obj = self.pool.get('delivery.carrier')
+        acc_fp_obj = self.pool.get('account.fiscal.position')
+        for order in self.browse(cr, uid, ids, context=context):
+            grid_id = carrier_obj.grid_get(cr, uid, [order.carrier_id.id], order.partner_shipping_id.id)
+            if not grid_id:
+                raise osv.except_osv(_('No grid available !'), _('No grid matching for this carrier !'))
+
+            if not order.state in ('draft'):
+                raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
+
+            grid = grid_obj.browse(cr, uid, grid_id, context=context)
+
+            taxes = grid.carrier_id.product_id.taxes_id
+            fpos = order.fiscal_position or False
+            taxes_ids = acc_fp_obj.map_tax(cr, uid, fpos, taxes)
+            #create the sale order line
+            line_obj.create(cr, uid, {
+                'order_id': order.id,
+                'name': grid.carrier_id.name,
+                'product_uom_qty': 1,
+                'product_uom': grid.carrier_id.product_id.uom_id.id,
+                'product_id': grid.carrier_id.product_id.id,
+                'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
+                'tax_id': [(6,0,taxes_ids)],
+                'type': 'make_to_stock'
+            })
+        #remove the value of the carrier_id field on the sale order
+        return self.write(cr, uid, ids, {'carrier_id': False}, context=context)
+        #return {'type': 'ir.actions.act_window_close'} action reload?
 
 sale_order()
 
diff --git a/addons/delivery/wizard/__init__.py b/addons/delivery/wizard/__init__.py
deleted file mode 100644
index 3b35a3cd51e..00000000000
--- a/addons/delivery/wizard/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import delivery_sale_order
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
deleted file mode 100644
index 80b3431f2a7..00000000000
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-from tools.translate import _
-
-from osv import osv, fields
-
-class make_delivery(osv.osv_memory):
-    _name = "delivery.sale.order"
-    _description = 'Make Delievery'
-
-    _columns = {
-        'carrier_id': fields.many2one('delivery.carrier','Delivery Method', required=True),
-    }
-
-
-    def default_get(self, cr, uid, fields, context=None):
-        res = super(make_delivery, self).default_get(cr, uid, fields, context=context)
-        order_obj = self.pool.get('sale.order')
-        for order in order_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-             carrier = order.carrier_id.id
-             if not carrier:
-                  carrier = order.partner_id.property_delivery_carrier.id
-             res.update({'carrier_id': carrier})
-             
-        return res
-    
-    def view_init(self, cr , uid , fields, context=None):
-         if context is None:
-            context = {}
-         order_obj = self.pool.get('sale.order')
-         for order in order_obj.browse(cr, uid, context.get('active_ids', []), context=context):     
-             if not order.state in ('draft'):
-                 raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
-         pass     
-        
-    def delivery_set(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        rec_ids = context and context.get('active_ids',[])
-        order_obj = self.pool.get('sale.order')
-        line_obj = self.pool.get('sale.order.line')
-        grid_obj = self.pool.get('delivery.grid')
-        carrier_obj = self.pool.get('delivery.carrier')
-        acc_fp_obj = self.pool.get('account.fiscal.position')
-        order_objs = order_obj.browse(cr, uid, rec_ids, context=context)
-        for datas in self.browse(cr, uid, ids, context=context):    
-            for order in order_objs:
-                grid_id = carrier_obj.grid_get(cr, uid, [datas.carrier_id.id],order.partner_shipping_id.id)
-                if not grid_id:
-                    raise osv.except_osv(_('No grid available !'), _('No grid matching for this carrier !'))
-
-                if not order.state in ('draft'):
-                    raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
-                
-                grid = grid_obj.browse(cr, uid, grid_id, context=context)
-        
-                taxes = grid.carrier_id.product_id.taxes_id
-                fpos = order.fiscal_position or False
-                taxes_ids = acc_fp_obj.map_tax(cr, uid, fpos, taxes)
-                line_obj.create(cr, uid, {
-                    'order_id': order.id,
-                    'name': grid.carrier_id.name,
-                    'product_uom_qty': 1,
-                    'product_uom': grid.carrier_id.product_id.uom_id.id,
-                    'product_id': grid.carrier_id.product_id.id,
-                    'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
-                    'tax_id': [(6,0,taxes_ids)],
-                    'type': 'make_to_stock'
-                })
-    
-        return {'type': 'ir.actions.act_window_close'}
-
-make_delivery()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
deleted file mode 100644
index fa56b0efcf7..00000000000
--- a/addons/delivery/wizard/delivery_sale_order_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-        <!--  Delivery Sale Order -->
-        
-        <record id="view_make_delivery_wizard" model="ir.ui.view">
-            <field name="name">Delivery Costs</field>
-            <field name="model">delivery.sale.order</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Create Deliveries">
-                    <separator colspan="4" string="Delivery Method" />
-                    <field name="carrier_id" widget="selection"/>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="_Cancel" />
-                        <button name="delivery_set" string="_Apply"
-                            colspan="1" type="object" icon="gtk-apply" />
-                    </group>
-                </form>
-            </field>
-        </record>
-        
-        <record id="action_delivery_cost" model="ir.actions.act_window">
-            <field name="name">Delivery Costs</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">delivery.sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_make_delivery_wizard"/>
-            <field name="target">new</field>            
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e5a7dfb88b9..8c2a4021c70 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -208,7 +208,7 @@ class sale_order(osv.osv):
             ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
             ('manual', 'Sale to Invoice'),
-            ('progress', 'Sale in Progress'),
+            ('progress', 'Sale Order'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3c54e1db27a..1eba286c744 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -102,19 +102,22 @@
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                        <button name="action_quotation_sent" string="Send" type="object" states="draft,sent"/>
+                        <button name="action_quotation_sent" string="Send by Mail" type="object" states="draft" class="oe_form_button_hi"/>
+                        <button name="action_quotation_sent" string="Send by Mail" type="object" states="sent"/>
                         <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
-                        <button name="print_quotation" string="Print Quotation" type="object" states="draft,sent"/>
-                        <button name="order_confirm" states="draft,sent" string="Confirm Order" />
+                        <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_form_button_hi"/>
+                        <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
+                        <button name="order_confirm" states="draft" string="Confirm"/>
+                        <button name="order_confirm" states="sent" string="Confirm" class="oe_form_button_hi"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
                         attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 
                         attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
-                        <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="draft,manual"/>
-                        <button name="cancel" states="draft,sent" string="Cancel Order"/>
-                        <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
-                        <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
-                        <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
+                        <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="manual"/>
+                        <button name="cancel" states="draft,sent" string="Cancel"/>
+                        <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
+                        <button name="ship_cancel" states="shipping_except" string="Cancel"/>
+                        <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
@@ -211,8 +214,9 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-
-                            <div class="oe_form_subtotal_footer" colspan="4">
+                            <group colspan="2" col="4" name="bellow_the_lines_hook">
+                            </group>
+                            <div class="oe_form_subtotal_footer" colspan="2">
                                 <div>
                                     <field name="amount_untaxed" sum="Untaxed amount"/>
                                 </div>
@@ -284,7 +288,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','=','draft')]" help="Sales Order that haven't yet been confirmed"/>
+                    <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8a70fce81a4..87cf9ade130 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -735,9 +735,9 @@ class stock_picking(osv.osv):
         """ Changes state of picking to available if all moves are confirmed.
         @return: True
         """
+        wf_service = netsvc.LocalService("workflow")
         for pick in self.browse(cr, uid, ids):
             if pick.state == 'draft':
-                wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_confirm', cr)
             move_ids = [x.id for x in pick.move_lines if x.state == 'confirmed']
             if not move_ids:

From d79b4a17207cfb0237a86976ff5b53c5f9dfdb7c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 14:08:59 +0200
Subject: [PATCH 101/126] fix problem with quick create

bzr revid: nicolas.vanhoren@openerp.com-20120525120859-ucs6ltabc9mpt78k
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 20d10ca410b..87eeafb6550 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -424,7 +424,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
                     this.quick.destroy();
                     delete this.quick;
                 });
-            self.quick.appendTo(self.$element.find('.oe_kanban_group_header'));
+            self.quick.appendTo(self.$element.find('.oe_kanban_header'));
             self.quick.focus();
         });
         this.$records.find('.oe_kanban_show_more').click(this.do_show_more);

From 120dfb5fff5dae39764f00877ba9edbd3c7b98e7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 14:09:47 +0200
Subject: [PATCH 102/126] wip

bzr revid: nicolas.vanhoren@openerp.com-20120525120947-fr9trn68o23hzkpd
---
 addons/web/static/src/js/view_form.js         | 29 +++++++++++++++++--
 addons/web/static/src/xml/base.xml            |  7 +++++
 addons/web_kanban/static/src/js/kanban.js     |  9 ++++--
 .../web_kanban/static/src/xml/web_kanban.xml  |  4 ---
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 69a418cb225..b032b12d43a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3338,7 +3338,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
     }
 });
 
-instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend({
+instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.CompletionFieldMixin, {
     disable_utility_classes: true,
     init: function(field_manager, node) {
         this._super(field_manager, node);
@@ -3455,13 +3455,38 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             });
         }
     },
-});
+}));
 
 function m2m_kanban_lazy_init() {
 if (instance.web.form.Many2ManyKanbanView)
     return;
 instance.web.form.Many2ManyKanbanView = instance.web_kanban.KanbanView.extend({
+    _is_quick_create_enabled: function() {
+        return this._super() && ! this.group_by;
+    },
+});
+instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
+    template: 'Many2ManyKanban.quick_create',
     
+    /**
+     * close_btn: If true, the widget will display a "Close" button able to trigger
+     * a "close" event.
+     */
+    init: function(parent, dataset, context, buttons) {
+        this._super(parent);
+        instance.web.form.CompletionFieldMixin.init.call(this);
+        this.m2m = this.getParent().view.m2m;
+        this._dataset = dataset;
+        this._buttons = buttons || false;
+        this._context = context || {};
+    },
+    start: function () {
+        var self = this;
+        self.$input = this.$element.find('input');
+    },
+    focus: function() {
+        this.$element.find('input').focus();
+    },
 });
 }
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a558b8e9d1a..38d007d5341 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1816,5 +1816,12 @@
         <pre><t t-esc="error.preview"/></pre>
     </t>
 </t>
+<div t-name="Many2ManyKanban.quick_create" class="oe_kanban_quick_create">
+    <input t-att-placeholder="_t('Type name to create')"/>
+    <t t-if="widget._buttons">
+        <button class="oe-kanban-quick_create_add">Add</button>
+        <button class="oe-kanban-quick_create_close">Close</button>
+    </t>
+</div>
 
 </templates>
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 87eeafb6550..d642b7b2f1e 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -10,6 +10,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     display_name: _lt('Kanban'),
     default_nr_columns: 3,
     view_type: "kanban",
+    quick_create_class: "instance.web_kanban.QuickCreate",
     number_of_color_schemes: 10,
     init: function (parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
@@ -350,6 +351,10 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     }
 });
 
+function get_class(name) {
+    return new instance.web.Registry({'tmp' : name}).get_object("tmp");
+}
+
 instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
     template: 'KanbanView.group_header',
     init: function (parent, records, group, dataset) {
@@ -403,7 +408,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
             def = this._super();
         if (! self.view.group_by) {
             self.$element.addClass("oe_kanban_no_group");
-            self.quick = new instance.web_kanban.QuickCreate(this, self.dataset, {}, false)
+            self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, {}, false)
                 .on('added', self, self.proxy('quick_created'));
             self.quick.replace($(".oe_kanban_no_group_qc_placeholder"));
         }
@@ -418,7 +423,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
             if (self.quick) { return; }
             var ctx = {};
             ctx['default_' + self.view.group_by] = self.value;
-            self.quick = new instance.web_kanban.QuickCreate(this, self.dataset, ctx, true)
+            self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, ctx, true)
                 .on('added', self, self.proxy('quick_created'))
                 .on('close', self, function() {
                     this.quick.destroy();
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index cabe9cb52fb..2b62dec15a9 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -65,9 +65,5 @@
 </t>
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
     <input t-att-placeholder="_t('Type name to create')"/>
-    <t t-if="widget._buttons">
-        <button class="oe-kanban-quick_create_add">Add</button>
-        <button class="oe-kanban-quick_create_close">Close</button>
-    </t>
 </div>
 </template>

From b8e4c4ad4413297b4ecb6079ed04409703ff13dc Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 25 May 2012 17:48:39 +0530
Subject: [PATCH 103/126] [FIX] delivery: yml fix

bzr revid: psi@tinyerp.com-20120525121839-s09pwl8ec9nmqnth
---
 addons/delivery/sale.py                |  4 +++-
 addons/delivery/test/delivery_cost.yml | 22 +++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 9c2603e4bb2..3ed3756a733 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -18,8 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields,osv
+
 import time
+from osv import fields,osv
+from tools.translate import _
 
 # Overloaded sale_order to manage carriers :
 class sale_order(osv.osv):
diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml
index 521f260e136..433acb1d18f 100644
--- a/addons/delivery/test/delivery_cost.yml
+++ b/addons/delivery/test/delivery_cost.yml
@@ -3,14 +3,8 @@
 -
   I add delivery cost in Sale order.
 -
-  !python {model: delivery.sale.order}: |
-    context.update({'active_ids': [ref("sale.order")]})
--
-  !record {model: delivery.sale.order, id: sale_delivery_carrier}:
-    {}
--
-  !python {model: delivery.sale.order}: |
-    self.delivery_set(cr, uid, [ref('sale_delivery_carrier')], context=context)
+  !python {model: sale.order}: |
+    self.delivery_set(cr, uid, [ref("sale.order")], context=context)
 -
   I check sale order after added delivery cost.
 -
@@ -35,7 +29,7 @@
     self.create_invoice(cr, uid, [wiz_id], {"active_ids": ship_ids, "active_id": ship_ids[0]})
 -
   I print a Delivery Order report.
-- 
+-
   !python {model: stock.picking}: |
     import netsvc, tools, os
     sale = self.pool.get('sale.order')
@@ -47,14 +41,8 @@
 -
   I add free delivery cost in Sale order.
 -
-  !python {model: delivery.sale.order}: |
-    context.update({'active_ids': [ref("sale.order2")]})
--
-  !record {model: delivery.sale.order, id: sale_delivery_carrier}:
-    {}
--
-  !python {model: delivery.sale.order}: |
-    self.delivery_set(cr, uid, [ref('sale_delivery_carrier')], context=context)
+  !python {model: sale.order}: |
+    self.delivery_set(cr, uid, [ref("sale.order2")], context=context)
 -
   I check sale order after added delivery cost.
 -

From ba1512e8503d7ef18603c0bdb57083f5d23516ce Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 14:52:39 +0200
Subject: [PATCH 104/126] many2manykanban quick create work in progress

bzr revid: nicolas.vanhoren@openerp.com-20120525125239-5s4il9xtb7p8i7kj
---
 addons/web/static/src/js/view_form.js         | 54 +++++++++++++++++--
 addons/web/static/src/xml/base.xml            |  6 +--
 addons/web_kanban/static/src/css/kanban.css   |  2 +-
 .../web_kanban/static/src/xml/web_kanban.xml  |  4 ++
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b032b12d43a..7860b2b504b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3149,7 +3149,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(_.
             });
         }).bind('hideDropdown', function() {
             self._drop_shown = false;
-        }).bind('hideDropdown', function() {
+        }).bind('showDropdown', function() {
             self._drop_shown = true;
         });
         self.tags = self.$text.textext()[0].tags();
@@ -3342,6 +3342,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
     disable_utility_classes: true,
     init: function(field_manager, node) {
         this._super(field_manager, node);
+        instance.web.form.CompletionFieldMixin.init.call(this);
         m2m_kanban_lazy_init();
         this.is_loaded = $.Deferred();
         this.initial_is_loaded = this.is_loaded;
@@ -3394,7 +3395,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
         if (embedded) {
             this.kanban_view.set_embedded_view(embedded);
         }
-        this.kanban_view.m2m_field = this;
+        this.kanban_view.m2m = this;
         var loaded = $.Deferred();
         this.kanban_view.on_loaded.add_last(function() {
             self.initial_is_loaded.resolve();
@@ -3461,6 +3462,7 @@ function m2m_kanban_lazy_init() {
 if (instance.web.form.Many2ManyKanbanView)
     return;
 instance.web.form.Many2ManyKanbanView = instance.web_kanban.KanbanView.extend({
+    quick_create_class: 'instance.web.form.Many2ManyQuickCreate',
     _is_quick_create_enabled: function() {
         return this._super() && ! this.group_by;
     },
@@ -3474,7 +3476,6 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
      */
     init: function(parent, dataset, context, buttons) {
         this._super(parent);
-        instance.web.form.CompletionFieldMixin.init.call(this);
         this.m2m = this.getParent().view.m2m;
         this._dataset = dataset;
         this._buttons = buttons || false;
@@ -3482,11 +3483,56 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
     },
     start: function () {
         var self = this;
-        self.$input = this.$element.find('input');
+        self.$text = this.$element.find('input').css("width", "200px");
+        self.$text.textext({
+            plugins : 'arrow autocomplete',
+            autocomplete: {
+                render: function(suggestion) {
+                    return $('<span class="text-label"/>').
+                             data('index', suggestion['index']).html(suggestion['label']);
+                }
+            },
+            ext: {
+                autocomplete: {
+                    selectFromDropdown: function() {
+                        $(this).trigger('hideDropdown');
+                        var index = Number(this.selectedSuggestionElement().children().children().data('index'));
+                        var data = self.search_result[index];
+                        if (data.id) {
+                            self.add_id(data.id);
+                        } else {
+                            data.action();
+                        }
+                    },
+                },
+                itemManager: {
+                    itemToString: function(item) {
+                        return item.name;
+                    },
+                },
+            },
+        }).bind('getSuggestions', function(e, data) {
+            var _this = this;
+            var str = !!data ? data.query || '' : '';
+            self.m2m.get_search_result(str).then(function(result) {
+                self.search_result = result;
+                $(_this).trigger('setSuggestions', {result : _.map(result, function(el, i) {
+                    return _.extend(el, {index:i});
+                })});
+            });
+        });
+        self.$text.focusout(function() {
+            self.$text.val("");
+        });
     },
     focus: function() {
         this.$element.find('input').focus();
     },
+    add_id: function(id) {
+        self.$input.val("");
+        debugger;
+        self.trigger('added', id);
+    },
 });
 }
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 38d007d5341..b1101fb09d2 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1817,11 +1817,7 @@
     </t>
 </t>
 <div t-name="Many2ManyKanban.quick_create" class="oe_kanban_quick_create">
-    <input t-att-placeholder="_t('Type name to create')"/>
-    <t t-if="widget._buttons">
-        <button class="oe-kanban-quick_create_add">Add</button>
-        <button class="oe-kanban-quick_create_close">Close</button>
-    </t>
+    <input t-att-placeholder="_t('Type name to search')"/>
 </div>
 
 </templates>
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 83c3de06f37..d8ce30fc24f 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -93,7 +93,7 @@
   background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create {
-  overflow: hidden;
+  overflow: visible;
 }
 .openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create {
   width: 200px;
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 2b62dec15a9..cabe9cb52fb 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -65,5 +65,9 @@
 </t>
 <div t-name="KanbanView.quick_create" class="oe_kanban_quick_create">
     <input t-att-placeholder="_t('Type name to create')"/>
+    <t t-if="widget._buttons">
+        <button class="oe-kanban-quick_create_add">Add</button>
+        <button class="oe-kanban-quick_create_close">Close</button>
+    </t>
 </div>
 </template>

From c8a27ff458ce60353f31c9e4c6f476d7379857d4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 15:09:14 +0200
Subject: [PATCH 105/126] perfected quick create

bzr revid: nicolas.vanhoren@openerp.com-20120525130914-h097d6rk90p85wse
---
 addons/web/static/src/js/view_form.js     | 10 +++++++---
 addons/web_kanban/static/src/js/kanban.js |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 7860b2b504b..847905a7b37 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3456,6 +3456,9 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             });
         }
     },
+    add_id: function(id) {
+        this.quick_create.add_id(id);
+    },
 }));
 
 function m2m_kanban_lazy_init() {
@@ -3477,6 +3480,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
     init: function(parent, dataset, context, buttons) {
         this._super(parent);
         this.m2m = this.getParent().view.m2m;
+        this.m2m.quick_create = this;
         this._dataset = dataset;
         this._buttons = buttons || false;
         this._context = context || {};
@@ -3526,11 +3530,11 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
         });
     },
     focus: function() {
-        this.$element.find('input').focus();
+        this.$text.focus();
     },
     add_id: function(id) {
-        self.$input.val("");
-        debugger;
+        var self = this;
+        self.$text.val("");
         self.trigger('added', id);
     },
 });
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index d642b7b2f1e..17ee57db768 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -510,7 +510,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
      * @param {(Id, String)} record name_get format for the newly created record
      */
     quick_created: function (record) {
-        var id = record[0], self = this;
+        var id = record, self = this;
         this.dataset.read_ids([id], this.view.fields_keys)
             .then(function (records) {
                 self.view.dataset.ids.push(id);
@@ -774,7 +774,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
                     this._dataset.get_context(), this._context)])
             .pipe(function(record) {
                 self.$input.val("");
-                self.trigger('added', record);
+                self.trigger('added', record[0]);
             }, function(error, event) {
                 event.preventDefault();
                 return self.slow_create();
@@ -795,7 +795,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({
         );
         pop.on_select_elements.add(function(element_ids) {
             self.$input.val("");
-            self.trigger('added', element_ids);
+            self.trigger('added', element_ids[0]);
         });
     }
 });

From 9433fedf2a77ee861a57319502b0353b5aaf255f Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 25 May 2012 18:47:15 +0530
Subject: [PATCH 106/126] [IMP] purchase: Add one more button 'Send RFQ' on po
 for sending quatation on mail, add new template for that

bzr revid: psi@tinyerp.com-20120525131715-zuzdn3tcefhztctv
---
 .../edi/purchase_order_action_data.xml        | 119 ++++++++++++++++++
 addons/purchase/purchase.py                   |   5 +-
 addons/purchase/purchase_view.xml             |   5 +-
 3 files changed, 126 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index 5fafa1f4b1a..edfded48915 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -131,6 +131,125 @@ If you have any question, do not hesitate to contact us.
 Thank you!
 
 
+--
+${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
+${object.company_id.name}
+% if object.company_id.street:
+${object.company_id.street or ''}
+% endif
+% if object.company_id.street2:
+${object.company_id.street2}
+% endif
+% if object.company_id.city or object.company_id.zip:
+${object.company_id.zip or ''} ${object.company_id.city or ''}
+% endif
+% if object.company_id.country_id:
+${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
+% endif
+% if object.company_id.phone:
+Phone: ${object.company_id.phone}
+% endif
+% if object.company_id.website:
+${object.company_id.website or ''}
+% endif
+            ]]></field>
+        </record>
+
+        <record id="email_template_edi_purchase_quatation" model="email.template">
+            <field name="name">Automated Quataion Request Notification Mail</field>
+            <field name="email_from">${object.validator.user_email or ''}</field>
+            <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
+            <field name="email_to">${object.partner_id.email}</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="body_html"><![CDATA[
+<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
+
+    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
+    
+    <p>Here is a request for quotation from ${object.company_id.name}: </p>
+    
+    <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
+       &nbsp;&nbsp;<strong>REFERENCES</strong><br />
+       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
+       &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />
+       &nbsp;&nbsp;Order date: ${object.date_order}<br />
+       % if object.origin:
+       &nbsp;&nbsp;Order reference: ${object.origin}<br />
+       % endif
+       % if object.partner_ref:
+       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />
+       % endif
+       &nbsp;&nbsp;Your contact: <a href="mailto:${object.validator.user_email or ''}?subject=Order%20${object.name}">${object.validator.name}</a>
+    </p>
+
+    <p>
+    You can view the request for quotation and download it using the following link:
+    </p>
+            <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;" 
+               href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
+
+    <br/>
+    <p>If you have any question, do not hesitate to contact us.</p>
+    <p>Thank you!</p>
+    <br/>
+    <br/>
+    <div style="width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;">
+        <h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;">
+            <strong style="text-transform:uppercase;">${object.company_id.name}</strong></h3>
+    </div>
+    <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">
+        <span style="color: #222; margin-bottom: 5px; display: block; ">
+        % if object.company_id.street:
+            ${object.company_id.street}<br/>
+        % endif
+        % if object.company_id.street2:
+            ${object.company_id.street2}<br/>
+        % endif
+        % if object.company_id.city or object.company_id.zip:
+            ${object.company_id.zip} ${object.company_id.city}<br/>
+        % endif
+        % if object.company_id.country_id:
+            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
+        % endif
+        </span>
+        % if object.company_id.phone:
+            <div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; ">
+                Phone:&nbsp; ${object.company_id.phone}
+            </div>
+        % endif
+        % if object.company_id.website:
+            <div>
+                Web :&nbsp;<a href="${object.company_id.website}">${object.company_id.website}</a>
+            </div>
+        %endif
+        <p></p>
+    </div>
+</div>
+            ]]></field>
+            <field name="body_text"><![CDATA[
+Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
+
+Here is a request for quotation from ${object.company_id.name}:
+       | Order number: *${object.name}*
+       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
+       | Order date: ${object.date_order}
+       % if object.origin:
+       | Order reference: ${object.origin}
+       % endif
+       % if object.partner_ref:
+       | Your reference: ${object.partner_ref}<br />
+       % endif
+       | Your contact: ${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
+
+You can view the quotation and download it using the following link:
+    ${ctx.get('edi_web_url_view') or 'n/a'}
+
+If you have any question, do not hesitate to contact us.
+
+Thank you!
+
+
 --
 ${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
 ${object.company_id.name}
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 03d02473df8..6e92d1f9e4e 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -334,7 +334,10 @@ class purchase_order(osv.osv):
 
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
-        template = mod_obj.get_object_reference(cr, uid, 'purchase', 'email_template_edi_purchase')
+        if context.get('send_rfq', False):
+            template = mod_obj.get_object_reference(cr, uid, 'purchase', 'email_template_edi_purchase_quatation')
+        else:
+            template = mod_obj.get_object_reference(cr, uid, 'purchase', 'email_template_edi_purchase')
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ff0003947bb..a9d55923ef4 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -132,11 +132,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                	<button name="wkf_send_rfq" states="draft" string="Send" type="object"/>
+                    <button name="purchase_confirm" states="draft,send" string="Confirm Order"/>
+                    <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
+                    <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-                    <button name="purchase_confirm" states="draft,send" string="Confirm Order"/>
                     <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
                     <button name="purchase_approve" states="confirmed" string="Approve Order"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>

From 776b961ebc73fdaf7b6880d6ed86a3ac9eef050b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 15:26:52 +0200
Subject: [PATCH 107/126] [fix] problem in customers

bzr revid: nicolas.vanhoren@openerp.com-20120525132652-tin667omlwdnnuar
---
 addons/web_kanban/static/src/js/kanban.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 60ff0891525..afa98f6a99f 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -37,7 +37,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     },
     start: function() {
         var self = this;
-        this._super.apply(this, arguments);
+        var def = this._super.apply(this, arguments);
         // Bind kanban cards dropdown menus
         $('html').on('click.kanban', function() {
             self.trigger('hide_menus');
@@ -45,6 +45,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.on('hide_menus', this, function() {
             self.$element.find('.oe_kanban_menu').hide();
         });
+        return def;
     },
     destroy: function() {
         this._super.apply(this, arguments);

From c4d31012d1c6cf2c1b1deddf1eaca970db001a98 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 25 May 2012 15:35:36 +0200
Subject: [PATCH 108/126] [IMP] sale: changes related to the cleaning of the SO
 workflow

bzr revid: qdp-launchpad@openerp.com-20120525133536-2rrkqkffpdmt35nt
---
 .../edi/static/src/xml/edi_sale_purchase.xml  |  9 +-
 addons/email_template/email_template.py       |  4 +-
 addons/mail/mail_message.py                   |  3 +-
 addons/mail/wizard/mail_compose_message.py    |  1 +
 addons/sale/edi/sale_order.py                 |  5 +-
 addons/sale/edi/sale_order_action_data.xml    | 16 ++--
 addons/sale/sale.py                           | 87 ++++++++++---------
 addons/sale/sale_view.xml                     |  4 +-
 addons/sale/sale_workflow.xml                 |  2 +-
 9 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index 698b322606f..8191660c5c9 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -33,7 +33,12 @@
        </div>
    </div>
 
-   <h1 class="oe_edi_doc_title">Order <t t-esc="doc.name"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
+   <t t-if="(doc.state == 'draft' or doc.state == 'sent')">
+       <h1 class="oe_edi_doc_title">Quotation <t t-esc="doc.name"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
+   </t>
+   <t t-if="(doc.state != 'draft' and doc.state != 'sent')">
+       <h1 class="oe_edi_doc_title">Order <t t-esc="doc.name"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
+   </t>
 
     <table width="100%" class="oe_edi_data oe_edi_shade">
         <tr class="oe_edi_floor">
@@ -116,7 +121,7 @@
 </div>
 </t>
 <t t-name="Edi.sale.order.sidebar">
-    <t t-if="doc.order_policy &amp;&amp; (doc.order_policy == 'prepaid' || doc.order_policy == 'manual')">
+    <t t-if="doc.order_policy and (doc.order_policy == 'prepaid' || doc.order_policy == 'manual') and (doc.state != 'draft' and doc.state != 'sent')">
         <t t-if="doc.company_address.paypal_account || doc.company_address.bank_ids">
             <p class="oe_edi_sidebar_title">Pay Online</p>
             <t t-if="doc.company_address.paypal_account">
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 5c33ea89987..fff9bdc0f1a 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -56,8 +56,6 @@ class email_template(osv.osv):
            :param str model: model name of the document record this mail is related to.
            :param int res_id: id of the document record this mail is related to.
         """
-        if context is None:
-            context = {}
         if not template: return u""
         if context is None:
             context = {}
@@ -149,7 +147,7 @@ class email_template(osv.osv):
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
         'body_text': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
-        'body_html': fields.text('Rich-Text Contents', translate=True, help="Rich-Text/HTML version of the message (placeholders may be used here)"),
+        'body_html': fields.text('Rich-text Contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
         'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
                                                                "Please note that this overrides the 'Resource Tracking' option, "
                                                                "so if you simply need to track replies to outgoing emails, enable "
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 091922b5cb9..f86ae29c80f 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -121,7 +121,8 @@ class mail_message_common(osv.osv_memory):
         'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
         'body': fields.function(get_body, fnct_search = search_body, string='Message Content', type='text',
                         help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."),
-        'parent_id': fields.many2one('mail.message', 'Parent Message', help="Parent message, used for displaying as threads with hierarchy", select=True, ondelete='set null',),
+        'parent_id': fields.many2one('mail.message', 'Parent Message', help="Parent message, used for displaying as threads with hierarchy",
+                        select=True, ondelete='set null',),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
     }
 
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 59554acd57b..dd07cbce9b2 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -260,6 +260,7 @@ class mail_compose_message(osv.osv_memory):
                         subtype=mail.subtype, headers=headers, context=context)]
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
                 mail_message.send(cr, uid, msg_ids, context=context)
+
         return {'type': 'ir.actions.act_window_close'}
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index badd4c20cd9..d1cbe3a98fa 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -60,19 +60,20 @@ SALE_ORDER_EDI_STRUCT = {
     'payment_term': True,
     'order_policy': True,
     'user_id': True,
+    'state': True,
 }
 
 class sale_order(osv.osv, EDIMixin):
     _inherit = 'sale.order'
 
-    def action_quotation_sent(self, cr, uid, ids, context=None):
+    def action_quotation_send(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         sale_objs = self.browse(cr, uid, ids, context=context) 
         edi_token = self.pool.get('edi.document').export_edi(cr, uid, sale_objs, context = context)[0]
         web_root_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         ctx = dict(context, edi_web_url_view=edi.EDI_VIEW_WEB_URL % (web_root_url, cr.dbname, edi_token))
-        return super(sale_order, self).action_quotation_sent(cr, uid, ids, context=ctx)
+        return super(sale_order, self).action_quotation_send(cr, uid, ids, context=ctx)
 
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
         """Exports a Sale order"""
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index a92c87de46f..7ff130bd58a 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -2,7 +2,6 @@
 <openerp>
     <data>
         <!-- EDI Export + Send email Action  -->
-        <!--
         <record id="ir_actions_server_edi_sale" model="ir.actions.server">
             <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
             <field name="state">code</field>
@@ -11,7 +10,6 @@
             <field name="condition">True</field>
             <field name="name">Auto-email confirmed sale orders</field>
         </record>
-        -->
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -31,11 +29,9 @@
          so users can freely customize/delete them -->
     <data noupdate="1">
          <!-- bind the mailing server action to sale.order confirmed activity -->
-        <!--
         <record id="sale.act_wait_ship" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_sale"/>
         </record>
-        -->
 
 
         <!--Email template -->
@@ -51,7 +47,7 @@
 
     <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
     
-    <p>Here is your order confirmation for ${object.partner_id.name}: </p>
+    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}: </p>
 
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />
@@ -68,12 +64,12 @@
     </p>
 
     <p>
-    You can view the order confirmation document, download it and pay online using the following link:
+    You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} document, download it and pay online using the following link:
     </p>
             <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;"
                href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
 
-    % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account:
+    % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state not in ('draft', 'sent'):
     <%
     comp_name = quote(object.company_id.name)
     order_name = quote(object.name)
@@ -133,7 +129,7 @@
             <field name="body_text"><![CDATA[
 Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
-Here is your order confirmation for ${object.partner_id.name}:
+Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}:
        | Order number: *${object.name}*
        | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
        | Order date: ${object.date_order}
@@ -145,10 +141,10 @@ Here is your order confirmation for ${object.partner_id.name}:
        % endif
        | Your contact: ${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}
 
-You can view the order confirmation, download it and even pay online using the following link:
+You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}, download it and even pay online using the following link:
     ${ctx.get('edi_web_url_view') or 'n/a'}
 
-% if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account:
+% if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state not in ('draft', 'sent'):
 <%
 comp_name = quote(object.company_id.name)
 order_name = quote(object.name)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8c2a4021c70..4f69d5391c9 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -207,8 +207,8 @@ class sale_order(osv.osv):
             ('sent', 'Quotation Sent'),
             ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
-            ('manual', 'Sale to Invoice'),
             ('progress', 'Sale Order'),
+            ('manual', 'Sale to Invoice'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
@@ -469,13 +469,13 @@ class sale_order(osv.osv):
         return inv_id
 
     def print_quotation(self, cr, uid, ids, context=None):
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
         wf_service = netsvc.LocalService("workflow")
-        for id in ids:
-            wf_service.trg_validate(uid, 'sale.order', id, 'quotation_sent', cr)
+        wf_service.trg_validate(uid, 'sale.order', ids[0], 'quotation_sent', cr)
         datas = {
                  'model': 'sale.order',
                  'ids': ids,
-                 'form': self.read(cr, uid, ids, context=context)[0],
+                 'form': self.read(cr, uid, ids[0], context=context),
         }
         return {'type': 'ir.actions.report.xml', 'report_name': 'sale.order', 'datas': datas, 'nodestroy': True}
     
@@ -511,66 +511,72 @@ class sale_order(osv.osv):
         }
 
     def action_view_invoice(self, cr, uid, ids, context=None):
+        '''
+        This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
+        '''
         mod_obj = self.pool.get('ir.model.data')
+        result = {
+            'name': _('Cutomer Invoice'),
+            'view_type': 'form',
+            'res_model': 'account.invoice',
+            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+        }
+        #compute the number of invoices to display
         inv_ids = []
-        result = {}
         for so in self.browse(cr, uid, ids, context=context):
-            inv_ids+= [invoice.id for invoice in so.invoice_ids]
+            inv_ids += [invoice.id for invoice in so.invoice_ids]
+        #choose the view_mode accordingly
         if len(inv_ids)>1:
             res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
             result.update({
-                           'view_mode': 'tree,form',
-                           'res_id': inv_ids or False
+                'view_mode': 'tree,form',
+                'res_id': inv_ids or False
             })
         else:
             res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
             result.update({
-                           'view_mode': 'form',
-                           'res_id': inv_ids and inv_ids[0] or False,
+                'view_mode': 'form',
+                'res_id': inv_ids and inv_ids[0] or False,
             })
-        res_id = res and res[1] or False,
-        result.update({
-                    'name': _('Cutomer Invoice'),
-                    'view_type': 'form',
-                    'view_id': [res_id],
-                    'res_model': 'account.invoice',
-                    'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
-                    'type': 'ir.actions.act_window',
-                    'nodestroy': True,
-                    'target': 'current',
-        })
+        result.update(view_id = res and res[1] or False)
         return result
 
     
     def action_view_delivery(self, cr, uid, ids, context=None):
+        '''
+        This function returns an action that display existing delivery orders of given sale order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.
+        '''
         mod_obj = self.pool.get('ir.model.data')
+        result = {
+            'name': _('Delivery Order'),
+            'view_type': 'form',
+            'res_model': 'stock.picking',
+            'context': "{'type':'out'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+        }
+        #compute the number of delivery orders to display
         pick_ids = []
-        result = {}
         for so in self.browse(cr, uid, ids, context=context):
             pick_ids += [picking.id for picking in so.picking_ids]
+        #choose the view_mode accordingly
         if len(pick_ids) > 1:
             res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_tree')
             result.update({
-                           'view_mode': 'tree,form',
-                           'res_id': pick_ids or False
+                'view_mode': 'tree,form',
+                'res_id': pick_ids or False
             })
         else:
             res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
             result.update({
-                           'view_mode': 'form',
-                           'res_id': pick_ids and pick_ids[0] or False,
+                'view_mode': 'form',
+                'res_id': pick_ids and pick_ids[0] or False,
             })
-        res_id = res and res[1] or False,
-        result.update({
-                    'name': _('Delivery Order'),
-                    'view_type': 'form',
-                    'view_id': res_id,
-                    'res_model': 'stock.picking',
-                    'context': "{'type':'out'}",
-                    'type': 'ir.actions.act_window',
-                    'nodestroy': True,
-                    'target': 'current',
-        })
+        result.update(view_id = res and res[1] or False)
         return result
 
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
@@ -730,7 +736,11 @@ class sale_order(osv.osv):
             self.confirm_send_note(cr, uid, ids, context)
         return True
 
-    def action_quotation_sent(self, cr, uid, ids, context=None):
+    def action_quotation_send(self, cr, uid, ids, context=None):
+        '''
+        This function opens a window to compose an email, with the edi sale template message loaded by default
+        '''
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
         mod_obj = self.pool.get('ir.model.data')
         template = mod_obj.get_object_reference(cr, uid, 'sale', 'email_template_edi_sale')
         template_id = template and template[1] or False
@@ -1476,7 +1486,6 @@ class sale_order_line(osv.osv):
 sale_order_line()
 
 class mail_message(osv.osv):
-    _name = 'mail.message'
     _inherit = 'mail.message'
     
     def _postprocess_sent_message(self, cr, uid, message, context=None):
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1eba286c744..3259276540d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -102,8 +102,8 @@
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                        <button name="action_quotation_sent" string="Send by Mail" type="object" states="draft" class="oe_form_button_hi"/>
-                        <button name="action_quotation_sent" string="Send by Mail" type="object" states="sent"/>
+                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_form_button_hi"/>
+                        <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
                         <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_form_button_hi"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index fb3a9424b6b..c18e271d480 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -204,7 +204,7 @@
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">manual_invoice</field>
         </record>
-        
+
         <record id="trans_invoice_invoice_end" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>

From b0b677955566c9aa54d373ca1014223ba1b913b9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 15:40:31 +0200
Subject: [PATCH 109/126] [fix] small problem with o2m kanban

bzr revid: nicolas.vanhoren@openerp.com-20120525134031-txtpoy8nlh2167qj
---
 addons/web/static/src/js/view_form.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3430f1dd703..4c4dfaac741 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2952,6 +2952,12 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
         var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.name,
+            create_function: function(data) {
+                return self.o2m.dataset.create(data).then(function(r) {
+                    self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r.result]));
+                    self.o2m.dataset.on_change();
+                });
+            },
             write_function: function(id, data, options) {
                 return self.o2m.dataset.write(id, data, {}).then(function() {
                     self.o2m.reload_current_view();
@@ -2966,6 +2972,9 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
             form_view_options: {'not_interactible_on_create':true},
             readonly: self.o2m.get("effective_readonly")
         });
+        pop.on_select_elements.add_last(function() {
+            self.o2m.reload_current_view();
+        });
     },
 });
 

From cdd8b9d47ad3fcd9aeb2279c05a0725ba68dad62 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 May 2012 15:43:06 +0200
Subject: [PATCH 110/126] [IMP] merge events

bzr revid: fp@tinyerp.com-20120525134306-3lz3127527hyly77
---
 addons/event/event.py                    |  6 ------
 addons/event/event_view.xml              | 13 +++++++------
 addons/event/static/src/js/google_map.js | 14 ++++++++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index bebddb34d17..f01caac175f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -210,12 +210,6 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'city': fields.related('address_id', 'city', type='char', string='City'),
-        'street': fields.related('address_id', 'street', type='char', string='Street'),
-        'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
-        'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
-        'zip': fields.related('address_id','zip', type="char", string="Zip"),      
-      
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4cebf3dd309..190445d6c20 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -64,16 +64,17 @@
                 <sheet layout="auto">
 
                 <field name="name" required="1" nolabel="1" class="oe_form_title" colspan="4"/>
-                <group colspan="4" col="3">
-                    <group colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
+                <group colspan="4" col="5">
+                    <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="date_begin"/>
                         <field name="user_id"/>
-                        <field name="date_end"/>
                         <field name="address_id" widget ="many2one_Geo_address"/>
+                        <field name="address"/>
+                    </group>
+                    <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
+                        <field name="date_begin"/>
+                        <field name="date_end"/>
                         <field name="register_min"/>
-                        <label string=""/>
-                        <field name="street" nolabel="1"/>
                         <field name="register_max"/>
                     </group>
                     <div id="oe_mapbox" class="oe_mapbox"></div>
diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
index 7d2681a7369..4a02086b85a 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/event/static/src/js/google_map.js
@@ -1,4 +1,4 @@
-openerp.event = function(instance){
+openerp.event = function(instance) {
     instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
     
     instance.web.GoogleMapConnector = instance.web.Class.extend({
@@ -48,8 +48,14 @@ openerp.event = function(instance){
             }
             (value instanceof Array)?value = parseInt(value[0]):false;
             var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
-            data.read_ids(value,["street","city","country_id"]).done(function(value){
-                var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            data.read_ids(value,["street","city","zip","country_id"]).done(function(value){
+                var address;
+                if value['country_id'] {
+                    address = _.str.sprintf('%(street)s, %(zip)s %(city)s, %(country_id[1])s', value);
+                } else {
+                    address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
+                }
+
                 self.map.googleMapsLoaded.done(function(){
                     self.map.render_map(address,document.getElementById("oe_mapbox"));
                 })
@@ -65,4 +71,4 @@ openerp.event = function(instance){
             this._super(no_recurse);
         }
     });
-};
\ No newline at end of file
+};

From ab07d440cebf99a3e819258f6c5e3a1fbcdcf113 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 25 May 2012 16:35:49 +0200
Subject: [PATCH 111/126] [IMP] purchase: changes related to the cleaning of
 the PO workflow

bzr revid: qdp-launchpad@openerp.com-20120525143549-w8ste0euwmqg9ji9
---
 .../edi/static/src/xml/edi_sale_purchase.xml  |   5 +-
 addons/purchase/edi/purchase_order.py         |   1 +
 .../edi/purchase_order_action_data.xml        | 127 +-----------------
 addons/purchase/purchase.py                   |   7 +-
 addons/purchase/purchase_view.xml             |  10 +-
 addons/purchase/purchase_workflow.xml         |  18 +--
 addons/sale/edi/sale_order_action_data.xml    |   4 +-
 7 files changed, 27 insertions(+), 145 deletions(-)

diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index 8191660c5c9..8d6bab67761 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -33,9 +33,12 @@
        </div>
    </div>
 
-   <t t-if="(doc.state == 'draft' or doc.state == 'sent')">
+   <t t-if="(doc.state == 'draft' or doc.state == 'sent') and doc.__model == 'sale.order'">
        <h1 class="oe_edi_doc_title">Quotation <t t-esc="doc.name"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
    </t>
+   <t t-if="(doc.state == 'draft' or doc.state == 'sent') and doc.__model == 'purchase.order'">
+       <h1 class="oe_edi_doc_title">Request for Quotation <t t-esc="doc.name"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
+   </t>
    <t t-if="(doc.state != 'draft' and doc.state != 'sent')">
        <h1 class="oe_edi_doc_title">Order <t t-esc="doc.name"/>: <t t-esc="_.str.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></h1>
    </t>
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index 3a82e990a14..42cbb04842c 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -57,6 +57,7 @@ PURCHASE_ORDER_EDI_STRUCT = {
     'amount_total': True,
     'amount_untaxed': True,
     'amount_tax': True,
+    'state':True,
 }
 
 class purchase_order(osv.osv, EDIMixin):
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index edfded48915..70d402de598 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -48,7 +48,7 @@
 
     <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
     
-    <p>Here is a purchase order confirmation from ${object.company_id.name}: </p>
+    <p>Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}: </p>
     
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />
@@ -65,7 +65,7 @@
     </p>
 
     <p>
-    You can view the order confirmation document and download it using the following link:
+    You can view the ${object.state in ('draft', 'sent') and 'request for quotation' or 'order confirmation'} document and download it using the following link:
     </p>
             <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;" 
                href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
@@ -111,7 +111,7 @@
             <field name="body_text"><![CDATA[
 Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
-Here is a purchase order confirmation from ${object.company_id.name}:
+Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}:
        | Order number: *${object.name}*
        | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
        | Order date: ${object.date_order}
@@ -123,126 +123,7 @@ Here is a purchase order confirmation from ${object.company_id.name}:
        % endif
        | Your contact: ${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
 
-You can view the order confirmation and download it using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-If you have any question, do not hesitate to contact us.
-
-Thank you!
-
-
---
-${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
-        </record>
-
-        <record id="email_template_edi_purchase_quatation" model="email.template">
-            <field name="name">Automated Quataion Request Notification Mail</field>
-            <field name="email_from">${object.validator.user_email or ''}</field>
-            <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
-            <field name="email_to">${object.partner_id.email}</field>
-            <field name="model_id" ref="purchase.model_purchase_order"/>
-            <field name="auto_delete" eval="True"/>
-            <field name="body_html"><![CDATA[
-<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
-
-    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
-    
-    <p>Here is a request for quotation from ${object.company_id.name}: </p>
-    
-    <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
-       &nbsp;&nbsp;<strong>REFERENCES</strong><br />
-       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
-       &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />
-       &nbsp;&nbsp;Order date: ${object.date_order}<br />
-       % if object.origin:
-       &nbsp;&nbsp;Order reference: ${object.origin}<br />
-       % endif
-       % if object.partner_ref:
-       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />
-       % endif
-       &nbsp;&nbsp;Your contact: <a href="mailto:${object.validator.user_email or ''}?subject=Order%20${object.name}">${object.validator.name}</a>
-    </p>
-
-    <p>
-    You can view the request for quotation and download it using the following link:
-    </p>
-            <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;" 
-               href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
-
-    <br/>
-    <p>If you have any question, do not hesitate to contact us.</p>
-    <p>Thank you!</p>
-    <br/>
-    <br/>
-    <div style="width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;">
-        <h3 style="margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;">
-            <strong style="text-transform:uppercase;">${object.company_id.name}</strong></h3>
-    </div>
-    <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">
-        <span style="color: #222; margin-bottom: 5px; display: block; ">
-        % if object.company_id.street:
-            ${object.company_id.street}<br/>
-        % endif
-        % if object.company_id.street2:
-            ${object.company_id.street2}<br/>
-        % endif
-        % if object.company_id.city or object.company_id.zip:
-            ${object.company_id.zip} ${object.company_id.city}<br/>
-        % endif
-        % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
-        % endif
-        </span>
-        % if object.company_id.phone:
-            <div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; ">
-                Phone:&nbsp; ${object.company_id.phone}
-            </div>
-        % endif
-        % if object.company_id.website:
-            <div>
-                Web :&nbsp;<a href="${object.company_id.website}">${object.company_id.website}</a>
-            </div>
-        %endif
-        <p></p>
-    </div>
-</div>
-            ]]></field>
-            <field name="body_text"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is a request for quotation from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.partner_ref:
-       | Your reference: ${object.partner_ref}<br />
-       % endif
-       | Your contact: ${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
-
-You can view the quotation and download it using the following link:
+You can view the ${object.state in ('draft', 'sent') and 'request for quotation' or 'order confirmation'} and download it using the following link:
     ${ctx.get('edi_web_url_view') or 'n/a'}
 
 If you have any question, do not hesitate to contact us.
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6e92d1f9e4e..03dee93c164 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -144,7 +144,7 @@ class purchase_order(osv.osv):
     STATE_SELECTION = [
         ('draft', 'Draft PO'),
         ('wait', 'Waiting'),
-        ('send', 'RFQ Sent'),
+        ('sent', 'RFQ Sent'),
         ('confirmed', 'Waiting Approval'),
         ('approved', 'Purchase Order'),
         ('except_picking', 'Shipping Exception'),
@@ -334,10 +334,7 @@ class purchase_order(osv.osv):
 
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
-        if context.get('send_rfq', False):
-            template = mod_obj.get_object_reference(cr, uid, 'purchase', 'email_template_edi_purchase_quatation')
-        else:
-            template = mod_obj.get_object_reference(cr, uid, 'purchase', 'email_template_edi_purchase')
+        template = mod_obj.get_object_reference(cr, uid, 'purchase', 'email_template_edi_purchase')
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a9d55923ef4..c43b53ceb68 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -132,18 +132,18 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="purchase_confirm" states="draft,send" string="Confirm Order"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_hi"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
-                    <button name="purchase_approve" states="confirmed" string="Approve Order"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_form_button_hi"/>
+                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_form_button_hi"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
-                    <button name="action_cancel_draft" states="cancel,send,confirmed" string="Set to Draft" type="object"/>
-                    <button name="purchase_cancel" states="draft,confirmed,wait_auth,send" string="Cancel"/>
+                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
+                    <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                     </div>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index d47152ceee0..0342afec893 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -13,11 +13,11 @@
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
-        <record id="act_send" model="workflow.activity">
+        <record id="act_sent" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
-            <field name="name">send</field>
+            <field name="name">sent</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'send'})</field>
+            <field name="action">write({'state':'sent'})</field>
         </record>
         <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
@@ -96,18 +96,18 @@
             <field name="act_to" ref="act_confirmed"/>
             <field name="signal">purchase_confirm</field>
         </record>
-         <record id="trans_draft_send" model="workflow.transition">
+         <record id="trans_draft_sent" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_send"/>
+            <field name="act_to" ref="act_sent"/>
             <field name="signal">send_rfq</field>
         </record>
-        <record id="trans_send_confirmed" model="workflow.transition">
-            <field name="act_from" ref="act_send"/>
+        <record id="trans_sent_confirmed" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
             <field name="act_to" ref="act_confirmed"/>
             <field name="signal">purchase_confirm</field>
         </record>
-        <record id="trans_send_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_send"/>
+        <record id="trans_sent_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">purchase_cancel</field>
         </record>
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 7ff130bd58a..2fe0a8cbfd3 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -47,7 +47,7 @@
 
     <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
     
-    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}: </p>
+    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from {$object.company_id.name}: </p>
 
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />
@@ -129,7 +129,7 @@
             <field name="body_text"><![CDATA[
 Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
-Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}:
+Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}:
        | Order number: *${object.name}*
        | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
        | Order date: ${object.date_order}

From bdea8fde06f6966f8c97fb4a1813d57838a6b9af Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 17:05:44 +0200
Subject: [PATCH 112/126] changed something

bzr revid: nicolas.vanhoren@openerp.com-20120525150544-1b4dm827zpg3ehay
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8707d34beef..5a04b636622 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4161,8 +4161,8 @@ instance.web.form.widgets = new instance.web.Registry({
     'selection' : 'instance.web.form.FieldSelection',
     'many2one' : 'instance.web.form.FieldMany2One',
     'many2many' : 'instance.web.form.FieldMany2Many',
-    'many2manytags' : 'instance.web.form.FieldMany2ManyTags',
-    'many2manykanban' : 'instance.web.form.FieldMany2ManyKanban',
+    'many2many_tags' : 'instance.web.form.FieldMany2ManyTags',
+    'many2many_kanban' : 'instance.web.form.FieldMany2ManyKanban',
     'one2many' : 'instance.web.form.FieldOne2Many',
     'one2many_list' : 'instance.web.form.FieldOne2Many',
     'reference' : 'instance.web.form.FieldReference',

From 65031e90ef81d5c0795a6690073c9299bf953393 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 25 May 2012 17:17:40 +0200
Subject: [PATCH 113/126] [IMP] account: changes related to the cleaning of the
 invoice workflow

bzr revid: qdp-launchpad@openerp.com-20120525151740-vjho9b0fopbrils7
---
 addons/account/account_invoice.py             | 17 ++++++----
 addons/account/account_invoice_view.xml       |  6 ++--
 addons/account/account_invoice_workflow.xml   | 32 +------------------
 addons/account/edi/invoice_action_data.xml    |  4 ---
 .../account_voucher_pay_invoice.xml           |  2 +-
 addons/purchase/purchase.py                   | 10 ++++++
 addons/sale/sale.py                           |  3 ++
 7 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 288f1119639..5ed027fad66 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -204,7 +204,6 @@ class account_invoice(osv.osv):
             ('proforma','Pro-forma'),
             ('proforma2','Pro-forma'),
             ('open','Open'),
-            ('sent','Sent'),
             ('paid','Paid'),
             ('cancel','Cancelled'),
             ],'State', select=True, readonly=True,
@@ -370,13 +369,15 @@ class account_invoice(osv.osv):
                 raise orm.except_orm(_('Unknown Error'), str(e))
 
     def invoice_print(self, cr, uid, ids, context=None):
-        wf_service = netsvc.LocalService('workflow')
-        for id in ids:
-            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_sent', cr)
+        '''
+        This function prints the invoice and mark it as sent, so that we can see more easily the next step of the workflow
+        '''
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
+        self.write(cr, uid, ids, {'sent': True}, context=context)
         datas = {
              'ids': ids,
              'model': 'account.invoice',
-             'form': self.read(cr, uid, ids, context=context)[0]
+             'form': self.read(cr, uid, ids[0], context=context)
         }
         return {
             'type': 'ir.actions.report.xml',
@@ -386,6 +387,9 @@ class account_invoice(osv.osv):
         }
 
     def action_invoice_sent(self, cr, uid, ids, context=None):
+        '''
+        This function opens a window to compose an email, with the edi invoice template message loaded by default
+        '''
         mod_obj = self.pool.get('ir.model.data')
         template = mod_obj.get_object_reference(cr, uid, 'account', 'email_template_edi_invoice')
         template_id = template and template[1] or False
@@ -1715,8 +1719,7 @@ class mail_message(osv.osv):
 
     def _postprocess_sent_message(self, cr, uid, message, context=None):
         if message.model == 'account.invoice':
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'account.invoice', message.res_id, 'invoice_sent', cr)
+            self.pool.get('account.invoice').write(cr, uid, message.ids, {'sent':True}, context=context)
         return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
 
 mail_message()
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 152dae5de8b..6f982b17480 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -266,13 +266,13 @@
                 	<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='sent,paid'/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open,sent" string="Cancel" groups="base.group_no_one"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
                     <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,sent,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                     </div>
                     <div class="oe_clear"/>
                 </div>
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 9f676df393d..13db193af8d 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -30,14 +30,6 @@ action_number()
 invoice_validate()</field>
             <field name="kind">function</field>
         </record>
-
-        <record id="act_sent" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">sent</field>
-            <field name="action">write({'state':'sent', 'sent':True})</field>
-            <field name="kind">function</field>
-        </record>
-
         <record model="workflow.activity" id="act_open_test">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">re-open</field>
@@ -66,30 +58,13 @@ write({'state':'cancel'})</field>
             <field name="act_to" ref="act_open"/>
             <field name="signal">invoice_open</field>
         </record>
-        <record id="open_to_sent" model="workflow.transition">
-            <field name="act_from" ref="act_open"/>
-            <field name="act_to" ref="act_sent"/>
-            <field name="signal">invoice_sent</field>
-        </record>
-        <record id="open_to_paid" model="workflow.transition">
-            <field name="act_from" ref="act_open"/>
-            <field name="act_to" ref="act_paid"/>
-            <field name="trigger_model">account.move.line</field>
-            <field name="trigger_expr_id">move_line_id_payment_get()</field>
-            <field name="condition">test_paid()</field>
-        </record>
         <record id="t8" model="workflow.transition">
-            <field name="act_from" ref="act_sent"/>
+            <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_paid"/>
             <field name="trigger_model">account.move.line</field>
             <field name="trigger_expr_id">move_line_id_payment_get()</field>
             <field name="condition">test_paid()</field>
         </record>
-        <record id="sent_to_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_sent"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">invoice_cancel</field>
-        </record>
         <record id="t9" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
@@ -111,11 +86,6 @@ write({'state':'cancel'})</field>
             <field name="signal">invoice_cancel</field>
         </record>
 
-        <record id="open_test_to_sent" model="workflow.transition">
-            <field name="act_from" ref="act_open_test"/>
-            <field name="act_to" ref="act_sent"/>
-            <field name="signal">invoice_sent</field>
-        </record>
         <record id="open_test_to_paid" model="workflow.transition">
             <field name="act_from" ref="act_open_test"/>
             <field name="act_to" ref="act_paid"/>
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 4dd225a493d..ce837c6662b 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -2,7 +2,6 @@
 <openerp>
     <data>
         <!-- EDI Export + Send email Action  -->
-        <!--
         <record id="ir_actions_server_edi_invoice" model="ir.actions.server">
             <field name="code">if (object.type in ('out_invoice', 'out_refund')) and not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='account.email_template_edi_invoice', context=context)</field>
             <field eval="6" name="sequence"/>
@@ -12,7 +11,6 @@
             <field name="condition">True</field>
             <field name="name">Auto-email confirmed invoices</field>
         </record>
-        -->
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -33,11 +31,9 @@
          so users can freely customize/delete them -->
     <data noupdate="1">
         <!-- bind the mailing server action to invoice open activity -->
-        <!--
         <record id="account.act_open" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_invoice"/>
         </record>
-        -->
 
         <!--Email template -->
         <record id="email_template_edi_invoice" model="email.template">
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 72382dfbde2..da669ad04ee 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,7 +8,7 @@
            <field name="inherit_id" ref="account.invoice_form"/>
            <field name="arch" type="xml">
            <button name="invoice_open" position="after">
-               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open,sent" icon="gtk-go-forward"/>
+               <button name="invoice_pay_customer" type="object" string="Register Payment" states="open" icon="gtk-go-forward"/>
            </button>
            </field>
         </record>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 03dee93c164..125bb8ae77d 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -279,8 +279,12 @@ class purchase_order(osv.osv):
         return {'value':{'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
 
     def view_invoice(self, cr, uid, ids, context=None):
+        '''
+        This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
+        '''
         mod_obj = self.pool.get('ir.model.data')
         wizard_obj = self.pool.get('purchase.order.line_invoice')
+        #compute the number of invoices to display
         inv_ids = []
         for po in self.browse(cr, uid, ids, context=context):
             if po.invoice_method == 'manual':
@@ -307,6 +311,9 @@ class purchase_order(osv.osv):
         }
 
     def view_picking(self, cr, uid, ids, context=None):
+        '''
+        This function returns an action that display existing pîcking orders of given purchase order ids.
+        '''
         mod_obj = self.pool.get('ir.model.data')
         pick_ids = []
         for po in self.browse(cr, uid, ids, context=context):
@@ -333,6 +340,9 @@ class purchase_order(osv.osv):
         return True
 
     def wkf_send_rfq(self, cr, uid, ids, context=None):
+        '''
+        This function opens a window to compose an email, with the edi purchase template message loaded by default
+        '''
         mod_obj = self.pool.get('ir.model.data')
         template = mod_obj.get_object_reference(cr, uid, 'purchase', 'email_template_edi_purchase')
         template_id = template and template[1] or False
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 4f69d5391c9..2432e6ee580 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -469,6 +469,9 @@ class sale_order(osv.osv):
         return inv_id
 
     def print_quotation(self, cr, uid, ids, context=None):
+        '''
+        This function prints the sale order and mark it as sent, so that we can see more easily the next step of the workflow
+        '''
         assert len(ids) == 1, 'This option should only be used for a single id at a time'
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'sale.order', ids[0], 'quotation_sent', cr)

From 04157c06f7128cbbd8e5740d7e53347c1c23a67f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 25 May 2012 17:22:47 +0200
Subject: [PATCH 114/126] [FIX] account: fixed error when pushing on the send
 by mail button

bzr revid: qdp-launchpad@openerp.com-20120525152247-pyg0lmmx9derz9kb
---
 addons/account/account_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 5ed027fad66..decf9c2aaa6 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1719,7 +1719,7 @@ class mail_message(osv.osv):
 
     def _postprocess_sent_message(self, cr, uid, message, context=None):
         if message.model == 'account.invoice':
-            self.pool.get('account.invoice').write(cr, uid, message.ids, {'sent':True}, context=context)
+            self.pool.get('account.invoice').write(cr, uid, [message.res_id], {'sent':True}, context=context)
         return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
 
 mail_message()

From 5c5abe4f395859225ef440e5479b8e0e05765a05 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 25 May 2012 17:48:10 +0200
Subject: [PATCH 115/126] Used m2mtags in partners

bzr revid: nicolas.vanhoren@openerp.com-20120525154810-bv111a5z4ne0yjzh
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index e3924cb4e5d..35589aa8037 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -426,7 +426,7 @@
                         <page string="History" invisible="True">
                         </page>
                         <page string="Categories">
-                            <field name="category_id" colspan="4" nolabel="1"/>
+                            <field name="category_id" colspan="4" nolabel="1" widget="many2many_tags"/>
                         </page>
                         <page string="Notes">
                             <field name="comment" colspan="4" nolabel="1"/>

From df59b0b7d2146d5d8b2a88e19e79f1a24f07bfce Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 25 May 2012 21:11:27 +0200
Subject: [PATCH 116/126] [FIX] google map on event part1

bzr revid: al@openerp.com-20120525191127-v5o88etlbdq0jbzn
---
 addons/event/__openerp__.py                      |  3 +--
 addons/event/event_view.xml                      |  4 ++--
 addons/google_map/__openerp__.py                 |  1 +
 addons/google_map/google_map_view.xml            |  3 +--
 .../static/src/js/google_map.js                  | 16 +++++++---------
 5 files changed, 12 insertions(+), 15 deletions(-)
 rename addons/{event => google_map}/static/src/js/google_map.js (85%)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index c491dd06138..f1a9769f803 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,7 +39,7 @@ Note that:
         Association / Configuration / Types of Events
 """,
     'author': 'OpenERP SA',
-    'depends': ['email_template'],
+    'depends': ['email_template','google_map'],
     'init_xml': [],
     'update_xml': [
         'security/event_security.xml',
@@ -53,7 +53,6 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'js': ['static/src/js/google_map.js'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 190445d6c20..69d0135d091 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -68,7 +68,7 @@
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
-                        <field name="address_id" widget ="many2one_Geo_address"/>
+                        <field name="address_id" widget ="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
                         <field name="address"/>
                     </group>
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
@@ -77,7 +77,7 @@
                         <field name="register_min"/>
                         <field name="register_max"/>
                     </group>
-                    <div id="oe_mapbox" class="oe_mapbox"></div>
+                    <div class="oe_form_google_map"></div>
                 </group>
 
                 <notebook colspan="4">
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 8aa1b60ca88..a6e85c3cd66 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -38,6 +38,7 @@ Using this you can directly open Google Map from the URL widget.""",
                    'google_map_view.xml',
                   ],
     'demo_xml': [],
+    'js': ['static/src/js/google_map.js'],
     'installable': True,
     'auto_install': False,
     'certificate': '0029498930765',
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 4cd7e4ad7c4..eda86a0662f 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -12,8 +12,7 @@
                         <label string="Street2 : " align="1.0"/>
                         <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="open_map"
-                           string="Map" type="object" icon="gtk-zoom-in"/>
+                        <button name="open_map" string="Map" type="object" icon="gtk-zoom-in"/>
                         </group>
                     </field>
                 </field>
diff --git a/addons/event/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
similarity index 85%
rename from addons/event/static/src/js/google_map.js
rename to addons/google_map/static/src/js/google_map.js
index 4a02086b85a..cec51510fe2 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -1,7 +1,7 @@
-openerp.event = function(instance) {
-    instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
-    
-    instance.web.GoogleMapConnector = instance.web.Class.extend({
+openerp.event = function(instance, mod) {
+    instance.web.form.widgets.add('many2one_address_google_map', 'instance.event.Many2OneAddress');
+
+    instance.google_map.GoogleMapConnector = instance.web.Class.extend({
         init: function(){
             this.googleMapsLoaded = $.Deferred();
             this.map_load();
@@ -36,10 +36,10 @@ openerp.event = function(instance) {
             });
         },
     });
-    instance.event.Many2OneAddress = instance.web.form.FieldMany2One.extend({
+    instance.google_map.Many2OneAddress = instance.web.form.FieldMany2One.extend({
         init: function(field_manager, node){
           this._super(field_manager, node);
-          this.map = new instance.web.GoogleMapConnector(); 
+          this.map = new instance.google_map.GoogleMapConnector(); 
         },
         get_address:function(value){
             var self = this;
@@ -55,9 +55,8 @@ openerp.event = function(instance) {
                 } else {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
-
                 self.map.googleMapsLoaded.done(function(){
-                    self.map.render_map(address,document.getElementById("oe_mapbox"));
+                    self.map.render_map(address,self.$(self.options.selector)[0]);
                 })
             });
         },
@@ -65,7 +64,6 @@ openerp.event = function(instance) {
             this._super(value);
             this.get_address(value);
         },
-
         render_value:function(no_recurse){
             this.get_address(this.get("value"));
             this._super(no_recurse);

From 0b3329874eac2b7d59e25ef68821226a456aa43b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 25 May 2012 21:22:08 +0200
Subject: [PATCH 117/126] [FIX] view_form widget registry exception

bzr revid: al@openerp.com-20120525192208-fpcvdogu167ghk7v
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5a04b636622..22f2a1c23a4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -937,7 +937,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             }
             var obj = self.fields_registry.get_any([$elem.attr('widget'), self.fvg.fields[name].type]);
             if (!obj) {
-                throw new Error("Widget type '"+ key + "' is not implemented");
+                throw new Error("Widget type '"+ $elem.attr('widget') + "' is not implemented");
             }
             var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
             var $label = self.labels[$elem.attr("name")];

From 879b4a37c65975c5c615a1d52f2f39dc8923c66a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 25 May 2012 22:03:26 +0200
Subject: [PATCH 118/126] [FIX] event and google map ok

bzr revid: al@openerp.com-20120525200326-0cfysbpcnlk2agyn
---
 addons/event/event_view.xml                   |  9 +--
 addons/google_map/static/src/js/google_map.js | 69 ++++++++++---------
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 69d0135d091..6c4fada6621 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -61,15 +61,15 @@
                     </div>
                     <div class="oe_clear"/>
                 </div>
-                <sheet layout="auto">
+                <sheet layout="manual">
+
 
                 <field name="name" required="1" nolabel="1" class="oe_form_title" colspan="4"/>
                 <group colspan="4" col="5">
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
-                        <field name="address_id" widget ="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
-                        <field name="address"/>
+                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
                     </group>
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="date_begin"/>
@@ -77,9 +77,10 @@
                         <field name="register_min"/>
                         <field name="register_max"/>
                     </group>
-                    <div class="oe_form_google_map"></div>
                 </group>
 
+                <div class="oe_form_google_map" style="height: 200px"></div>
+
                 <notebook colspan="4">
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
diff --git a/addons/google_map/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
index cec51510fe2..9aa693e53c6 100644
--- a/addons/google_map/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -1,45 +1,48 @@
 openerp.event = function(instance, mod) {
-    instance.web.form.widgets.add('many2one_address_google_map', 'instance.event.Many2OneAddress');
+    instance.web.form.widgets.add('many2one_address_google_map', 'instance.google_map.Many2OneAddress');
+
+    var googleMapsLoaded = null;
 
     instance.google_map.GoogleMapConnector = instance.web.Class.extend({
-        init: function(){
-            this.googleMapsLoaded = $.Deferred();
-            this.map_load();
-        },
         map_load: function() {
             var self = this;
-            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                googleMapsCallback = function () {
-                self.googleMapsLoaded.resolve();
-            };
-            $.ajax({
-                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                dataType: "script"
-            }).fail(self.googleMapsLoaded.reject);
-            return this.googleMapsLoaded.promise();
+            if(googleMapsLoaded === null) {
+                googleMapsLoaded = $.Deferred();
+                // global
+                openerp_googleMapsCallback = googleMapsLoaded.resolve;
+                $.ajax({
+                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=openerp_googleMapsCallback&sensor=false",
+                    dataType: "script"
+                }).fail(googleMapsLoaded.reject);
+            }
+            return googleMapsLoaded;
         },
-        render_map: function(address,$element){
-            var geocoder = new google.maps.Geocoder();
-            geocoder.geocode( { 'address': address}, function(results, status){
-                if (status == google.maps.GeocoderStatus.OK){
-                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-                    var myOptions = {
-                    zoom: 17,
-                    center:  new google.maps.LatLng(lat,lng),
-                    mapTypeId: google.maps.MapTypeId.ROADMAP
-                }
-                return new google.maps.Marker({
-                    map : new google.maps.Map($element,myOptions),
-                    position: new google.maps.LatLng(lat,lng)
+        render_map: function(address,element) {
+            this.map_load().then(function() {
+                var geocoder = new google.maps.Geocoder();
+                geocoder.geocode({'address': address}, function(results, status) {
+                    if (status == google.maps.GeocoderStatus.OK) {
+                        var lat = results[0].geometry.location.lat();
+                        var lng = results[0].geometry.location.lng();
+                        var myOptions = {
+                            zoom: 17,
+                            center: new google.maps.LatLng(lat,lng),
+                            mapTypeId: google.maps.MapTypeId.ROADMAP
+                        };
+                        var map = new google.maps.Map(element,myOptions);
+                        var position = new google.maps.LatLng(lat,lng);
+                        var marker = new google.maps.Marker({ map: map, position: position });
+                        return marker;
+                    }
                 });
-                }
             });
         },
     });
+
     instance.google_map.Many2OneAddress = instance.web.form.FieldMany2One.extend({
         init: function(field_manager, node){
           this._super(field_manager, node);
-          this.map = new instance.google_map.GoogleMapConnector(); 
+          this.map = new instance.google_map.GoogleMapConnector();
         },
         get_address:function(value){
             var self = this;
@@ -50,14 +53,14 @@ openerp.event = function(instance, mod) {
             var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
             data.read_ids(value,["street","city","zip","country_id"]).done(function(value){
                 var address;
-                if value['country_id'] {
+                if (value['country_id']) {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s, %(country_id[1])s', value);
                 } else {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
-                self.map.googleMapsLoaded.done(function(){
-                    self.map.render_map(address,self.$(self.options.selector)[0]);
-                })
+                // TODO repalce by widget_option selector self.options.selector
+                var el = self.view.$element.find(".oe_form_google_map")[0];
+                self.map.render_map(address,el);
             });
         },
         set_value:function(value){

From 1227741b5a782d6dc6a1d0b3eb9f31e557a83f63 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 27 May 2012 04:40:06 +0000
Subject: [PATCH 119/126] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120526050749-nakl3x59zsy0e3ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120527044006-4kmo9posveuumgsz
---
 addons/crm_partner_assign/i18n/ja.po          |    6 +-
 addons/email_template/i18n/ja.po              |   10 +-
 addons/hr_holidays/i18n/gu.po                 |  842 +++++++++++++
 addons/import_base/i18n/ro.po                 |  104 ++
 addons/import_google/i18n/ro.po               |  229 ++++
 addons/import_sugarcrm/i18n/ro.po             |  421 +++++++
 addons/l10n_be/i18n/ja.po                     |    2 +-
 addons/lunch/i18n/ja.po                       |    4 +-
 addons/mail/i18n/ja.po                        |  117 +-
 addons/marketing_campaign/i18n/ja.po          | 1106 +++++++++++++++++
 addons/marketing_campaign_crm_demo/i18n/ja.po |  187 +++
 addons/membership/i18n/ja.po                  |  874 +++++++++++++
 12 files changed, 3834 insertions(+), 68 deletions(-)
 create mode 100644 addons/hr_holidays/i18n/gu.po
 create mode 100644 addons/import_base/i18n/ro.po
 create mode 100644 addons/import_google/i18n/ro.po
 create mode 100644 addons/import_sugarcrm/i18n/ro.po
 create mode 100644 addons/marketing_campaign/i18n/ja.po
 create mode 100644 addons/marketing_campaign_crm_demo/i18n/ja.po
 create mode 100644 addons/membership/i18n/ja.po

diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index 430536f66cd..e400396e074 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-25 02:34+0000\n"
+"PO-Revision-Date: 2012-05-25 04:47+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: crm_partner_assign
@@ -847,7 +847,7 @@ msgstr "CRMパートナ報告書"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "E-mail composition wizard"
-msgstr "Eメール作成ツール"
+msgstr "Eメール作成ウィザード"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po
index ca2abdc61d3..60b491ad0c2 100644
--- a/addons/email_template/i18n/ja.po
+++ b/addons/email_template/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-25 04:53+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -408,7 +408,7 @@ msgstr "Eメールを送信する (%s)"
 #: field:email.template,body_html:0
 #: field:email_template.preview,body_html:0
 msgid "Rich-text Contents"
-msgstr "リッチテキストの内容"
+msgstr "リッチテキストのコンテンツ"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
diff --git a/addons/hr_holidays/i18n/gu.po b/addons/hr_holidays/i18n/gu.po
new file mode 100644
index 00000000000..bf9e1b5626f
--- /dev/null
+++ b/addons/hr_holidays/i18n/gu.po
@@ -0,0 +1,842 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-25 06:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "વાદળી"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "ફાળવણી પ્રકાર"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Allocation Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "વિભાગ"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
+msgid "Requests Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid " Month-1"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "તપખીરિયા રંગનું"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "બાકીના દિવસો"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "કર્મચારી દ્વારા"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "આછો લીલો"
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_id:0
+msgid "Current Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leave requests can be recorded by employees and validated by their managers. "
+"Once a leave request is validated, it appears automatically in the agenda of "
+"the employee. You can define several allowance types (paid holidays, "
+"sickness, etc.) and manage allowances per type."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "મંજૂર થઇ ચૂકી છે"
+
+#. module: hr_holidays
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"The state is set to 'Draft', when a holiday request is created.            \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user.  "
+"          \n"
+"The state is 'Refused', when holiday request is refused by manager.          "
+"  \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
+msgid "Leave Requests to Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "રદ થયેલ"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.employee,remaining_leaves:0
+msgid ""
+"Total number of legal leaves allocated to this employee, change this value "
+"to create allocation/leave requests."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr "માન્યતા"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid "Warning !"
+msgstr "ચેતવણી !"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automatically filled by the user who validate the leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid "Warning!"
+msgstr "ચેતવણી!"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr "જાંબલી"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Confirmed"
+msgstr "સમર્થિત"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr "તરફથી"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr "ખાતરી"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:384
+#, python-format
+msgid "Leave Request for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,state:0
+msgid "State"
+msgstr "સ્થિતિ"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+#: model:ir.model,name:hr_holidays.model_hr_employee
+msgid "Employee"
+msgstr "કર્મચારી"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "New"
+msgstr "નવું"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "લાલ"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:382
+#, python-format
+msgid "Allocation for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid ""
+"The feature behind the field 'Remaining Legal Leaves' can only be used when "
+"there is only one leave type with the option 'Allow to Override Limit' "
+"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
+"decide on which leave type the update has to be done. \n"
+"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
+"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
+"the employees if the configuration does not allow to use this field."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"If its True then its Allocation/Request have to be validated by second "
+"validator"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you set a meeting type, OpenERP will create a meeting in the calendar "
+"once a leave is validated."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr "પિતૃ"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Month"
+msgstr "મહિનો"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,category_id:0
+msgid "Category"
+msgstr "શ્રેણી"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr "કાળો"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
+msgid "Allocate Leaves for Employees"
+msgstr ""
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr "રજાનો દિવસ"
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr "સભા"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr "સક્રિય"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "Leaves To Validate"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+msgid "Remaining Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
+msgid "Unpaid"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Holidays during last month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr "ભૂલ"
+
+#. module: hr_holidays
+#: view:hr.employee:0
+msgid "Assign Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr "આછો વાદળી"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "My Department Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_state:0
+msgid "Current Leave Status"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr "સામાન્ય"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
+msgid "Compensatory Days"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,double_validation:0
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr "છાપો"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr "વિગતો"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr "વર્ણન"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you tick this checkbox, the system will allow, for this section, the "
+"employees to take more leaves than the available ones."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
+msgid ""
+"You can assign remaining Legal Leaves for each employee, OpenERP will "
+"automatically create and validate allocation requests."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""
diff --git a/addons/import_base/i18n/ro.po b/addons/import_base/i18n/ro.po
new file mode 100644
index 00000000000..aa7dba14d3d
--- /dev/null
+++ b/addons/import_base/i18n/ro.po
@@ -0,0 +1,104 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-26 19:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "Importul a esuat datorita unei greseli neasteptate"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "inceput la %s si finalizat la %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "Importul datelor d-voastra s-a finalizat la %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"dar a esuat, in consecinta nu au fost importate datele pentru a mentine "
+"consistenta bazei de date \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+"Importul datelor \n"
+" nume instanta : %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr "%s a fost importat cu succes de la %s %s, %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr "Importul de date a esuat la %s datorita unei erori neasteptate"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr "Importul s-a finalizat, a fost trimis e-mail-ul de instiintare"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr "%s nu este nu nume valid de model"
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "Importati"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "fara avertizare"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "cu avertizare : %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " campuri importate : "
diff --git a/addons/import_google/i18n/ro.po b/addons/import_google/i18n/ro.po
new file mode 100644
index 00000000000..c0aea581d77
--- /dev/null
+++ b/addons/import_google/i18n/ro.po
@@ -0,0 +1,229 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-26 19:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr "Alegeti grupul pe care sa il importati, implicit sunt alese toate."
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr "Importati Evenimente Google Calendar"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "_Importati Evenimente"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+"Nu a fost definit(a) nici un nume de utilizator sau o parola pentru "
+"utilizator.\n"
+"Va rugam sa definiti in vizualizarea utilizatorului"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+"Detalii de autentificare nevalide !\n"
+" Specificati Numele de utilizator/Parola."
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "Furnizor"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "Importati Optiuni"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "Numele grupului"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Categoria Cazului"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "Importati Contacte Google"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr "Importati Date Google"
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr "Tipul intalnirii"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Va rugam sa instalati gdata-python-client de la adresa "
+"http://code.google.com/p/gdata-python-client/downloads/list"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr "Contact Google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr "Importati contacte dintr-un cont google"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr "Va rugam sa specificati utilizatorul si parola corecte !"
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr "_Anulati"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr "sincronizati.import.google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr "_Importati Contacte"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr "Importati Google Calendar"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr "Import google"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "Eroare"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "Avertizare !"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Optiuni"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Eroare Import Contacte Google!"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr "Importati Mesajul"
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "Nume Calendar"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+"Bifati aceasta casuta pentru a seta partenerul nou creat drept Furnizor."
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "Importati doar adresa"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr "Utilizator"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr "Mesaj"
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr "Creati partenerul pentru fiecare contact"
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
+"Bifati aceasta casuta pentru a seta partenerul nou creat drept Client."
+
+#~ msgid "Partner status for this group:"
+#~ msgstr "Statusul partenerului acestui grup:"
diff --git a/addons/import_sugarcrm/i18n/ro.po b/addons/import_sugarcrm/i18n/ro.po
new file mode 100644
index 00000000000..9f956a27142
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/ro.po
@@ -0,0 +1,421 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-26 19:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:40+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "Error !!"
+msgstr "Eroare !!"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
+msgstr ""
+"Utilizati URL API SugarSoap (unealta de citire) si acces complet la "
+"autentificarea SugarCRM."
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "(Coming Soon)"
+msgstr "(In curand)"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr "Documente"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr "Importati-va datele din SugarCRM :"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Choose data you want to import. Click 'Import' to get data manually or "
+"'Schedule Reccurent Imports' to get recurrently and automatically data."
+msgstr ""
+"Alegeti datele pe care doriti sa le importati. Faceti click pe 'Importa' "
+"pentru a obtine datele manual sau 'Programeaza Importuri Recurente' pentru a "
+"obtine date in mod recurent si automat."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,contact:0
+msgid "Contacts"
+msgstr "Contacte"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr "RU"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,bug:0
+msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
+msgstr ""
+"Bifati aceasta casuta pentru a importa sugarCRM Bugs in problemele "
+"proiectului OpenERP"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,instance_name:0
+msgid "Instance's Name"
+msgstr "Numele Instantei"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr "Sarcini Proiect"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr "Anuntati Finalizarea Importului la:"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,user:0
+msgid ""
+"Check this box to import sugarCRM Users into OpenERP users, warning if a "
+"user with the same login exist in OpenERP, user information will be erase by "
+"sugarCRM user information"
+msgstr ""
+"Bifati aceasta casuta pentru a importa Utilizatori sugarCRM in utilizatorii "
+"OpenERP, avertizare daca exista un utilizator cu acelasi nume de "
+"autentificare in OpenERP, informatiile despre utilizatori vor fi sterse de "
+"informatiile despre utilizatorii sugarCRM"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#, python-format
+msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr ""
+"Va rugam sa instalati SOAP pentru pyhton - ZSI-2.0-rc3.tar.gz - python-zci"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Schedule Recurrent Imports"
+msgstr "_Programati Importuri Recurente"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Do not forget the email address to be notified of the success of the import."
+msgstr ""
+"Nu uitati adresa de e-mail la care sa fiti instiintat ca importul a avut "
+"succes."
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,call:0
+msgid "Check this box to import sugarCRM Calls into OpenERP calls"
+msgstr ""
+"Bifati aceasta casuta pentru a importa Apeluri sugarCRM in apeluri OpenERP"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"If you make recurrent or ponctual import, data already  in OpenERP will be "
+"updated by SugarCRM data."
+msgstr ""
+"Daca efectuati importuri recurente sau punctuale, datele deja existente in "
+"OpenERP vor fi actualizate cu datele SugarCRM."
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,employee:0
+msgid "Employee"
+msgstr "Angajat"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr "Document"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,document:0
+msgid "Check this box to import sugarCRM Documents into OpenERP documents"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid ""
+"Data are importing, the process is running in the background, an email will "
+"be sent to the given email address if it was defined."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,call:0
+msgid "Calls"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,opportunity:0
+msgid ""
+"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
+"and Opportunities"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_history:0
+msgid "Email and Note"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,url:0
+msgid ""
+"Webservice's url where to get the data.                      example : "
+"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
+"application "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
+#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
+msgid "Import SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "%s data required %s Module to be installed, Please install %s module"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,claim:0
+msgid "Cases"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,meeting:0
+msgid ""
+"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,email_history:0
+msgid ""
+"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
+"Messages and Attachments"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project:0
+msgid "Projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid ""
+"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
+"http://pypi.python.org/pypi/ZSI/"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project:0
+msgid "Check this box to import sugarCRM Projects into OpenERP projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Select Module to Import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,employee:0
+msgid "Check this box to import sugarCRM Employees into OpenERP employees"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,url:0
+msgid "SugarSoap Api url:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project_task:0
+msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,opportunity:0
+msgid "Leads & Opp"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password or bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,instance_name:0
+msgid ""
+"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
+"from different server."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,contact:0
+msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,password:0
+msgid "Password"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,claim:0
+msgid "Check this box to import sugarCRM Cases into OpenERP claims"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Notification When Import is Finished"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,account:0
+msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Online documentation:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid "ZSI Import Error!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""
diff --git a/addons/l10n_be/i18n/ja.po b/addons/l10n_be/i18n/ja.po
index d70ff834981..baac9765b1f 100644
--- a/addons/l10n_be/i18n/ja.po
+++ b/addons/l10n_be/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: l10n_be
diff --git a/addons/lunch/i18n/ja.po b/addons/lunch/i18n/ja.po
index 445a960e7cc..186018e7cbc 100644
--- a/addons/lunch/i18n/ja.po
+++ b/addons/lunch/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: lunch
@@ -64,7 +64,7 @@ msgstr "    7日    "
 #. module: lunch
 #: view:lunch.cashmove:0 view:lunch.order:0
 msgid "Today"
-msgstr "今日"
+msgstr "本日"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 200fbab9ab8..479c783ca64 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2012-05-25 04:29+0000\n"
+"PO-Revision-Date: 2012-05-25 05:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
 "X-Generator: Launchpad (build 15288)\n"
 
 #. module: mail
@@ -156,7 +156,7 @@ msgstr "Eメールメッセージ"
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "送信"
 
 #. module: mail
 #: view:mail.message:0
@@ -184,137 +184,137 @@ msgstr "送信済"
 msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
-msgstr ""
+msgstr "メッセージのタイプ。通常はテキストあるいはリッチテキストを指定するための 「テキスト」あるいは「HTML」"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "宛先"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Eメール作成ウィザード"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "関連する文書ID"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "高度"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re："
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "関連する文書モデル"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Email Search"
-msgstr ""
+msgstr "Eメール検索"
 
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "ネットワークで送信された場合のメッセージの原型"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Partner Name"
-msgstr ""
+msgstr "パートナ名"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "再試行"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "送信"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "今すぐ送信"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "関係する取引先"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
 #: field:mail.message.common,date:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s さんの記述："
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "リッチテキストのコンテンツ"
 
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "原文"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
 #, python-format
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
 #: field:mail.message.common,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "メッセージID"
 
 #. module: mail
 #: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
 #: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "添付"
 
 #. module: mail
 #: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
 #: field:mail.message.common,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "写し(CC)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:159
@@ -325,28 +325,28 @@ msgstr ""
 #. module: mail
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "送信後、このEメールを削除（スペース節約のため）"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
 #: field:mail.message.common,references:0
 msgid "References"
-msgstr ""
+msgstr "参照"
 
 #. module: mail
 #: field:mail.message,display_text:0
 msgid "Display Text"
-msgstr ""
+msgstr "テキストの表示"
 
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
@@ -357,7 +357,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "関連ユーザ"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -365,29 +365,29 @@ msgstr ""
 msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
-msgstr ""
+msgstr "全メッセージヘッダー。例えばSMTPセッションのヘッダー（通常、受信メッセージのみ）。"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "作成月"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
 #: field:mail.message.common,email_to:0
 msgid "To"
-msgstr ""
+msgstr "宛先"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Details"
-msgstr ""
+msgstr "詳細"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Eメールスレッド"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -395,29 +395,29 @@ msgstr ""
 msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
-msgstr ""
+msgstr "メッセージの差出人。ユーザの優先設定から持って来られます。空白にすると、Eメールではなく、メッセージになります。"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "本文（テキスト）"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "あなた"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "メッセージ識別番号"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "本文（リッチテキスト）"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,31 +427,34 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s が %s について記述：\n"
+" 件名：%s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
 #: view:mail.message:0 field:res.partner,emails:0
 msgid "Emails"
-msgstr ""
+msgstr "Eメール"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
 #: model:ir.ui.menu,name:mail.menu_email_message
 #: field:mail.thread,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "メッセージ"
 
 #. module: mail
 #: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message Headers"
-msgstr ""
+msgstr "メッセージヘッダー"
 
 #. module: mail
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
 #: field:mail.message.common,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "BCC"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
@@ -462,47 +465,47 @@ msgstr ""
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "メッセージの参照。前のメッセージの識別番号など"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "CCメッセージの宛先"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "配信に失敗しました。"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Eメールメッセージ"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Eメールスレッド"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "フィルタ"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "メール添付"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "メッセージの優先返信アドレス"
diff --git a/addons/marketing_campaign/i18n/ja.po b/addons/marketing_campaign/i18n/ja.po
new file mode 100644
index 00000000000..be2f9543108
--- /dev/null
+++ b/addons/marketing_campaign/i18n/ja.po
@@ -0,0 +1,1106 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-26 21:33+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "手動モード"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "前のアクティビティ"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:818
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr "この項目の現在の手順は、プレビューすべきEメールやレポートを持ちません。"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr "トランザクションのTo / Fromアクティビティは同じキャンペーンである必要があります。 "
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "時刻"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr "カスタムアクション"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr "全てのキャンペーン項目が生成するであろう、期待される売上を設定して下さい。売上統計はレポートセクションで取得できます。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr "トリガー"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr "アクションの数"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr "キャンペーンエディタ"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+msgid "Today"
+msgstr "本日"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr "実行中"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr "オブジェクト"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records created after last sync"
+msgstr "同期モード：最終同期後に生成されたレコードのみ"
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_2
+msgid ""
+"Hello, We are happy to announce that you now become our Silver Partner."
+msgstr "拝啓、このたび御社は、弊社のシルバーパートナとなられたことをご報告申し上げます。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr "次のアクティビティ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "同期"
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr "間隔は正または0である必要があります。"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:818
+#, python-format
+msgid "No preview"
+msgstr "プレビューなし"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr "起動日"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr "外向き遷移"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "リセット"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr "このキャンペーンを実行するリソースを選択して下さい。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr "最終同期"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "You can not duplicate a campaign, it's not supported yet."
+msgstr "キャンペーンの重複はできません。これはまだサポートされていません。"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "年"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr "このセグメントが最後に同期された（自動または手動）日付"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr "自動"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+"テスト - 全てのアクティビティを直接作成し実行します（遷移の遅延を待たずに）が、Eメール送信やレポート生成はしません。\n"
+"リアルタイムテスト - 全てのアクティビティを直接作成し実行しますが、Eメール送信やレポート生成はしません。\n"
+"手動確認 - キャンペーンは正常に実行されますが、ユーザは全ての作業項目を手動で検証する必要があります。\n"
+"通常 - キャンペーンは正常に実行され、自動的に全てのEメールが送信されレポートされます（まさに本物。このモードはとても慎重に）。"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr "このセグメントの最初の開始日"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr "キャンペーン"
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_3
+msgid "Congratulation! You become our Gold Partner."
+msgstr "おめでとうございます。あなたはゴールドパートナとなりました。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr "セグメント"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Cost / Revenue"
+msgstr "経費 / 売上"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+"   - Email: send an email using a predefined email template\n"
+"   - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+"   - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+"  "
+msgstr ""
+"項目がこのアクティブティに入った時に実行するアクションのタイプです。例：\n"
+"　・ Eメール：Eメールテンプレートで事前定義されたEメールを送信します。\n"
+"　・ レポート：リソース項目に定義された既存のレポートを印刷し、特定のディレクトリに保存します。\n"
+"　・ カスタムアクション：事前定義されたアクションを実行します。例えば、リソースレコードの項目を変更します。\n"
+"  "
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_next_sync:0
+msgid "Next time the synchronization job is scheduled to run automatically"
+msgstr "次回は同期ジョブが自動的に実行されるようにスケジュールされます。"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr "月"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr "遷移"
+
+#. module: marketing_campaign
+#: model:ir.filters,name:marketing_campaign.filter0
+msgid "Partners"
+msgstr "パートナ"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't delete workitems"
+msgstr "作業項目を削除しないで下さい。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr "マーケティングレポート"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr "リソース名"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr "同期モード"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr "実行"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr "前のアクティビティ"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr "このセグメントが最後に閉じたあるいはキャンセルされた日付"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr "マーケティングキャンペーンアクティビティ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr "エラーメッセージ"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr "キャンペーン"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr "間隔の単位"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:792
+#, python-format
+msgid "Email Preview"
+msgstr "Eメールプレビュー"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr "レポート"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr "設定"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr "全てのキャンペーン項目が必要とするであろう、変動経費を設定して下さい。経費統計はレポートセクションで取得できます。"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr "時"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "    Month-1    "
+msgstr "    月-1    "
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr "キャンペーンセグメント"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr "このオプションを有効にすることで、作業項目は実行されません。なぜなら、削除の代りにキャンセルされたとしてマークされた条件となるためです。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr "例外"
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr "作業項目"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr "固定経費"
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_2
+msgid "Congratulation! You become now our Silver Partner."
+msgstr "おめでとうございます。あなたはシルバーパートナとなりました。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr "新規に修正"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr "間隔の値"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr "売上"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty. This is useful "
+"for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
+"views."
+msgstr ""
+"生成された作業項目はパートナに関連したレコードとリンクされます。レコードがパートナ自身である場合、この項目を空のままとして下さい。これは、キャンペーンの分"
+"析やキャンペーンのフォローアップビューを介して、レポート目的のために役立ちます。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr "次のアクティビティ"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+msgid "Campaign Follow-up"
+msgstr "キャンペーンフォローアップ"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr "このアクティビティが有効化されたときにEメールを送信します。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr "テストモード"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr "最終同期後に変更されたレコードのみ（重複なし）"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+msgid "Campaign Statistics"
+msgstr "キャンペーン統計値"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr "このアクティビティが有効化された時にアクションを実行します。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr "パートナ項目"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+msgid "Campaign Analysis"
+msgstr "キャンペーンの分析"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign. \"No duplicates\" prevents selecting "
+"records which have already entered the campaign previously.If the campaign "
+"has a \"unique field\" set, \"no duplicates\" will also prevent selecting "
+"records which have the same value for the unique field as other records that "
+"already entered the campaign."
+msgstr ""
+"キャンペーンに入れる新しいレコードの選択時に、フィルタに追加する追加基準を決定して下さい。重複なしは既に以前のキャンペーンに入れたレコードを選択するのを避"
+"けます。キャンペーンが固有項目セットと重複なしである場合、固有項目であるために同じ値を持つれレコードや既にキャンペーンで入力されたレコードを選択するのを避"
+"けます。"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr "リアルタイムテスト"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr "直接テスト"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr "ディレクトリ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr "プレビュー"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr "関連するリソース"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr "通常"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr "キャンペーンが開始された時に、このアクティビティは起動します。"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr "シグナルのアクティビティはプログラム化と呼ばれます。シグナルが送信された時に、作業項目はいつも作成されることに注意して下さい。"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates"
+msgstr "Eメールテンプレート"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: all records"
+msgstr "同期モード：全レコード"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr "全レコード（重複なし）"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr "新規に作成"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr "日付"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr "条件"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr "このアクティビティが有効化された時に、レポートは生成されます。"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#, python-format
+msgid ""
+"The campaign cannot be started: it doesn't have any starting activity. "
+"Modify campaign's activities to mark one as the starting point."
+msgstr ""
+"このキャンペーンは開始できません：これは開始アクティビティを何も持っていません。キャンペーンのアクティビティのひとつを開始点としてマークする修正を加えて下"
+"さい。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,unique_field_id:0
+msgid "Unique Field"
+msgstr "固有項目"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr "例外"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr "Eメールテンプレート"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr "実行日"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr "キャンペーン作業項目"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr "キャンペーンアクティビティ"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr "このフォルダは生成されたレポートを保存するのに使用されます。"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr "アクション"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:528
+#, python-format
+msgid "Automatic transition"
+msgstr "自動翻訳"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr "開始"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:res.partner:0
+msgid "History"
+msgstr "履歴"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr "処理"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:530
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr "化粧"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr "引き金となる宛先の作業項目の状態"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered from a specific situation. One action "
+"could be sending an email template that has previously been created in the "
+"system."
+msgstr ""
+"マーケットキャンペーンは管理を助け、特定のメッセージをパートナに届けるイベントやアクティビティです。キャンペーンは特定の事態をきっかけとする多くのアクティ"
+"ビティを持ちます。あるアクションは以前にシステムに作られたEメールテンプレートを送信できます。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "Operation not supported"
+msgstr "操作はサポートされていません。"
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_3
+msgid "Hello, We are happy to announce that you become our Gold Partner."
+msgstr "拝啓、このたび御社は、弊社のゴールドパートナとなられたことをご報告申し上げます。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr "フィルタのモデルはキャンペーンのリソースモデルと同じである必要があります。 "
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - resource: the resource object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+"アクティビティが実行できるかどうかを決定するPython式です。それ以外はそれは削除されるかキャンセルされます。式は次のような変数（参照可能）を許します："
+"\n"
+"   ・ activity：キャンペーンのアクティビティ\n"
+"   ・ workitem：キャンペーンの作業項目\n"
+"   ・ resource：このキャンペーン項目を代表するリソースオブジェクト\n"
+"   ・ transitions：このアクティビティから外向きのキャンペーン遷移のリスト\n"
+"   ・ re：Pythonの一般的な式のモジュール"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr "手動同期"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr "リソースID"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it."
+msgstr "キャンペーンは開始できません：アクティビティがありません。"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr "キャンペーン遷移"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr "ToDo"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr "キャンペーン手順"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr "セグメント"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr "全セグメント"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr "内向き遷移"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr "Eメール"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr "日"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr "アクティビティ"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,unique_field_id:0
+msgid ""
+"If set, this field will help segments that work in \"no duplicates\" mode to "
+"avoid selecting similar records twice. Similar records are records that have "
+"the same value for this unique field. For example by choosing the "
+"\"email_from\" field for CRM Leads you would prevent sending the same "
+"campaign to the same email address again. If not set, the \"no duplicates\" "
+"segments will only avoid selecting the same record again if it entered the "
+"campaign previously. Only easily comparable fields like textfields, "
+"integers, selections or single relationships may be used."
+msgstr ""
+"設定した場合、この項目は類似レコードが２回選択されることを避ける重複なしモードをセグメントに適用するのに役立ちます。類似レコードはこの固有項目に同じ値を持"
+"つレコードのことです。例えば、CRMのリードのEメール送信者項目を選択すると、同じキャンペーンを同じEメールアドレスに再度送信することを防止します。設定し"
+"ない場合、重複なしセグメントは以前のキャンペーンで入れられた同じレコードが再び選択されるのを防ぐのみとなります。テキスト、整数といった項目のみと簡単に比較"
+"可能で、選択または単一の関連を持つもので使用できます。"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:529
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr "%(interval_nbr)d %(interval_type)s 後"
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_1
+msgid "Welcome in OpenERP Partner Channel!"
+msgstr "OpenERPパートナチャネルへ、ようこそおいで下さいました。"
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr "マーケティングキャンペーン"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr "リソース"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+"実行中のこのキャンペーンのための固定経費。各キャンペーンアクティビティに変動経費と売上を定義することができます。経費と売上統計はキャンペーンレポートに含ま"
+"れます。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records updated after last sync"
+msgstr "同期モード：最終同期後の更新レコードのみ"
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr "国"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr "シグナル"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr "日付が設定されない場合、この作業項目は手動で実行する必要があります。"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are closed."
+msgstr "全セグメントが閉じない限り、このキャンペーンは完了とはマークされません。"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr "モード"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.activity:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr "アクティビティ"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"view of the Resource. If no filter is set, all records are selected without "
+"filtering. The synchronization mode may also add a criterion to the filter."
+msgstr ""
+"このセグメントに沿った一致したりソースレコードを選択するためのフィルタです。新しいフィルタを作成、保存することでリソースのリストビューで高度な検索に使うこ"
+"とができます。フィルタが設定されない場合、フィルタされることなく全レコードが選択されます。同期モードはまた、フィルタに対して基準を追加します。"
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr "キャンペーンフォローアップ"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr "次の同期"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr "フィルタ"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr "全て"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr "最終同期後に作成されたレコードのみ"
+
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr "変動経費"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr "手動確認"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+#: view:marketing.campaign:0
+msgid "Cost"
+msgstr "経費"
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_1
+msgid "Hello, We are very happy to send Welcome message."
+msgstr "こんにちは。これは歓迎メッセージです。"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr "年"
diff --git a/addons/marketing_campaign_crm_demo/i18n/ja.po b/addons/marketing_campaign_crm_demo/i18n/ja.po
new file mode 100644
index 00000000000..dcf5982da3b
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/ja.po
@@ -0,0 +1,187 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-25 22:02+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
+msgid "Marketing campaign demo report"
+msgstr "マーケティングキャンペーンデモレポート"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_1
+msgid ""
+"Hello,Thanks for generous interest you have shown in the "
+"openERP.Regards,OpenERP Team,"
+msgstr "拝啓、OpenERPにご興味を持っていただき、ありがとうございます。OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "会社："
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "OpenERPブックのお買い上げのお礼"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、私どもは御社に適合した最適な提案を各種用意いたしております。\n"
+"            シルバーパートナの皆様に、2010年6月に有料の技術トレーニングを開催いたします。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr "ゴールドパートナの皆様へのに無料の技術トレーニングのご提案"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "OpenERPディスカバリーディにご参加のお礼"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "ダミーアクション"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "パートナ："
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "OpenERPにご興味を持っていただき、ありがとうございます。"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "2010年5月開催のOpenERPディスカバリーディへの登録のご提案"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、私どもは御社に適合した最適な提案を各種用意いたしております。\n"
+"            シルバーパートナの皆様に、ゴールドパートナシップをご提案させていただきます。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "シルバーパートナの皆様にゴールドパートナシップのご提案"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、このたびはOpenERPブックのご購入、ありがとうございました。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_5
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our gold partners,We are arranging free technical training "
+"on june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、私どもは御社に適合した最適な提案を各種用意いたしております。\n"
+"            ゴールドパートナの皆様に、2010年6月に、無料の技術トレーニングを企画いたしました。\n"
+"            より詳しい情報は、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_3
+msgid ""
+"Hello,Thanks for showing intrest and for subscribing to the OpenERP "
+"Discovery Day.\n"
+"             If any further information required kindly revert back.\n"
+"             I really appreciate your co-operation on this.\n"
+"             Regards,OpenERP Team,"
+msgstr ""
+"拝啓、このたびはOpenERPディスカバリーディへのご登録をいただき、ありがとうございます。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "技術トレーニング参加のお礼"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、私どもは御社に適合した最適な提案を各種用意いたしております。\n"
+"            私どもは、2010年5月に開催される、OpenERPディスカバリーディへのご参加をご案内申し上げます。\n"
+"            より詳しい情報につきましては、どうぞお問い合わせ下さい。\n"
+"            それではよろしくお願いいたします。\n"
+"            OpenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"拝啓、このたびは技術トレーニングにご登録いただき、ありがとうございました。より詳しい情報につきましては、どうぞお問い合わせ下さい。それではよろしくお願いい"
+"たします。\n"
+"            OenERPチーム一同、"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "シルバーパートナの皆様に有料トレーニングのご提案"
diff --git a/addons/membership/i18n/ja.po b/addons/membership/i18n/ja.po
new file mode 100644
index 00000000000..c5ad528226b
--- /dev/null
+++ b/addons/membership/i18n/ja.po
@@ -0,0 +1,874 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-27 02:57+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-27 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetoassociate0
+msgid "invoice to associate"
+msgstr "準会員への請求書"
+
+#. module: membership
+#: model:process.process,name:membership.process_process_membershipprocess0
+msgid "Membership Process"
+msgstr "会員処理"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Paid Member"
+msgstr "支払済会員"
+
+#. module: membership
+#: view:report.membership:0
+#: view:res.partner:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: membership
+#: field:report.membership,num_paid:0
+msgid "# Paid"
+msgstr "支払番号"
+
+#. module: membership
+#: field:report.membership,tot_earned:0
+msgid "Earned Amount"
+msgstr "稼いだ金額"
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_membership
+msgid "Membership Analysis"
+msgstr "会員分析"
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_setassociation0
+msgid "Set an associate member of partner."
+msgstr "パートナの準会員として設定"
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetopaid0
+msgid "Invoice is be paid."
+msgstr "請求書は支払済です。"
+
+#. module: membership
+#: field:membership.membership_line,company_id:0
+#: view:report.membership:0
+#: field:report.membership,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Ending Date Of Membership"
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_to:0
+msgid "Date to"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_waitingtoinvoice0
+msgid "Waiting to invoice"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "This will display paid, old and total earned columns"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Non Member"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_2_product_template
+msgid "Basic Membership"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "All Members"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Stop membership date"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_producttomember0
+msgid "Product to member"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Join Membership"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,associate_member:0
+msgid "Associate member"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_associatedmember0
+msgid "Member is associated."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "   Month   "
+msgstr ""
+
+#. module: membership
+#: field:report.membership,tot_pending:0
+msgid "Pending Amount"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_associationpartner0
+msgid "Associated partner."
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Supplier Partners"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
+msgstr ""
+
+#. module: membership
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_report_membership_tree
+#: model:ir.ui.menu,name:membership.menu_report_membership
+msgid "Members Analysis"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "End Membership Date"
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_from:0
+msgid "Date from"
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:414
+#, python-format
+msgid "Partner doesn't have an address to make the invoice."
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_res_partner
+#: field:membership.membership_line,partner:0
+msgid "Partner"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetopaid0
+msgid "Invoice to paid"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Customer Partners"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Partners"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: membership
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_state:0
+msgid ""
+"It indicates the membership state.\n"
+"                    -Non Member: A member who has not applied for any "
+"membership.\n"
+"                    -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                    -Old Member: A member whose membership date has "
+"expired.\n"
+"                    -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                    -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                    -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+
+#. module: membership
+#: model:process.transition.action,name:membership.process_transition_action_create0
+msgid "Create"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership products"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_membership_line
+msgid "Member line"
+msgstr ""
+
+#. module: membership
+#: help:report.membership,date_from:0
+#: field:res.partner,membership_start:0
+msgid "Start membership date"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Events created in current month"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "This will display waiting, invoiced and total pending columns"
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_paidmember0
+msgid "Paid member"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Events created in last month"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,num_waiting:0
+msgid "# Waiting"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Events created in current year"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members
+#: model:ir.ui.menu,name:membership.menu_members
+#: view:res.partner:0
+msgid "Members"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Invoiced/Paid/Free"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_invoicedmember0
+msgid "Open invoice."
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "July"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_0_product_template
+msgid "Golden Membership"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,associate_member:0
+msgid ""
+"A member with whom you want to associate your membership.It will consider "
+"the membership state of the associated member."
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,membership_id:0
+#: view:report.membership:0
+#: field:report.membership,membership_id:0
+msgid "Membership Product"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_producttomember0
+msgid "Define product for membership."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr ""
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Join"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership_date_to:0
+#: help:res.partner,membership_stop:0
+msgid "Date until which membership remains active."
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_cancel:0
+msgid "Cancel membership date"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,free_member:0
+msgid "Select if you want to give membership free of cost."
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_setassociation0
+msgid "Set association"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid " Membership State"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Memberships"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_paidmember0
+msgid "Membership invoice paid."
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "September"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,state:0
+msgid ""
+"It indicates the membership state.\n"
+"                        -Non Member: A member who has not applied for any "
+"membership.\n"
+"                        -Cancelled Member: A member who has cancelled his "
+"membership.\n"
+"                        -Old Member: A member whose membership date has "
+"expired.\n"
+"                        -Waiting Member: A member who has applied for the "
+"membership and whose invoice is going to be created.\n"
+"                        -Invoiced Member: A member whose invoice has been "
+"created.\n"
+"                        -Paid Member: A member who has paid the membership "
+"amount."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,month:0
+msgid "Month"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Group by..."
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:411
+#, python-format
+msgid "Partner is a free Member."
+msgstr ""
+
+#. module: membership
+#: model:product.pricelist,name:membership.list1m
+msgid "Member Sale Pricelist"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,associate_member_id:0
+#: view:res.partner:0
+msgid "Associate Member"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership_date_from:0
+#: help:res.partner,membership_start:0
+msgid "Date from which membership becomes active."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_invoice
+#: view:membership.invoice:0
+msgid "Membership Invoice"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,user_id:0
+#: view:res.partner:0
+msgid "Salesman"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_membershipproduct0
+msgid "Define membership product."
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Category"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr ""
+
+#. module: membership
+#: model:product.pricelist.version,name:membership.ver1m
+msgid "Member Sale Pricelist Version"
+msgstr ""
+
+#. module: membership
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Forecast"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,partner_id:0
+msgid "Member"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Date From"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_associatedmember0
+msgid "Associated member"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Accounting Info"
+msgstr ""
+
+#. module: membership
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Customers"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "August"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_products
+#: model:ir.ui.menu,name:membership.menu_membership_products
+#: view:product.product:0
+msgid "Membership Products"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "June"
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_membership
+#: field:membership.invoice,product_id:0
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:report.membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Invoiced Member"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,date:0
+msgid "Date on which member has joined the membership"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Waiting Member"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_associationpartner0
+msgid "Association Partner"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,date_from:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "November"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership:0
+msgid "Select if a product is a membership product."
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,state:0
+msgid "Membership State"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "October"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Description"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "January"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Membership Partners"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership Fee"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership amount"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_amount:0
+msgid "The price negotiated by the partner"
+msgstr ""
+
+#. module: membership
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "None/Canceled/Old/Waiting"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Old Member"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_to:0
+msgid "To"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,membership_state:0
+#: field:res.partner,membership_state:0
+msgid "Current Membership State"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "General"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_waitingtoinvoice0
+msgid "Draft invoice is now open."
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Inactive"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice
+#: field:membership.membership_line,account_invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "All non Members"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Information"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,account_invoice_line:0
+msgid "Account Invoice line"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Categorization"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_waitingmember0
+msgid "Draft invoice for membership."
+msgstr ""
+
+#. module: membership
+#: field:membership.invoice,member_price:0
+#: field:membership.membership_line,member_price:0
+#: model:product.price.type,name:membership.product_price_type_memberprice
+#: field:product.template,member_price:0
+msgid "Member Price"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Purchase Description"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Description"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,free_member:0
+msgid "Free member"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "May"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_1_product_template
+msgid "Silver Membership"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,date_to:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "February"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_invoicedmember0
+msgid "Invoiced member"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "April"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Starting Date Of Membership"
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_cancel:0
+msgid "Date on which membership has been cancelled"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_cancel:0
+msgid "Cancel date"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_waitingmember0
+msgid "Waiting member"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_invoice_view
+msgid "Invoice Membership"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_membershipproduct0
+msgid "Membership product"
+msgstr ""
+
+#. module: membership
+#: help:membership.membership_line,member_price:0
+msgid "Amount for the membership"
+msgstr ""
+
+#. module: membership
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Cancelled Member"
+msgstr ""
+
+#. module: membership
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,year:0
+msgid "Year"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Revenue Done"
+msgstr ""

From 40ac635b127dcaecfe8270f03b1758500e47f515 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 27 May 2012 11:49:23 +0200
Subject: [PATCH 120/126] [FIX] event seats chek is now done in
 check_registration_limits_before

bzr revid: al@openerp.com-20120527094923-j04wz9vp1r7chdwy
---
 addons/event/test/process/event_draft2done.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml
index dfe2b01cb33..eb40340befd 100644
--- a/addons/event/test/process/event_draft2done.yml
+++ b/addons/event/test/process/event_draft2done.yml
@@ -34,14 +34,6 @@
 -
    !python {model: event.registration}: |
      event_pool = self.pool.get("event.event")
-     for register in self.browse(cr, uid, [ref("event_registration1")], context):
-         nb_register = register.nb_register
-         event_id = register.event_id.id
-         available_seats = event_pool.check_available_seats(cr, uid, [event_id], context=context)
-         if available_seats and nb_register > available_seats:
-             assert available_seats, "seats available."
-         elif available_seats == 0:
-             assert available_seats, "No Tickets Available."
      self.registration_open(cr, uid, [ref("event_registration1")],context=context)
 -
    I check that registration is "confirmed"

From d81a1efbc54b813e726d77126c53bf97039b08a1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 27 May 2012 12:26:10 +0200
Subject: [PATCH 121/126] [IMP] improved CSS: separator, editable lists with
 many2one

bzr revid: fp@openerp.com-20120527102610-o8i26mxhskv5xkjq
---
 addons/web/static/src/css/base.css  | 7 +++----
 addons/web/static/src/css/base.sass | 9 ++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 01f5d21511f..a17c1cfb8b1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1672,8 +1672,6 @@
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
-.openerp .oe_form .oe_form_field_translatable,
-.openerp .oe_form .oe_form_field_many2one,
 .openerp .oe_form .oe_form_field_date,
 .openerp .oe_form .oe_form_field_datetime {
   white-space: nowrap;
@@ -1790,8 +1788,9 @@
 }
 .openerp .oe_horizontal_separator {
   font-weight: bold;
-  font-size: 16px;
-  margin: 4px 0;
+  font-size: 20px;
+  margin: 20px 0px 10px 0px;
+  color: #aaaabb;
 }
 .openerp .oe_horizontal_separator:empty {
   height: 5px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 95571ee7caf..b4fd85034a7 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1335,7 +1335,7 @@ $colour4: #8a89ba
         select[readonly],
         textarea[readonly],
         input[disabled],
-        select[disabled],
+        select[disabled]
             background: #E5E5E5 !important
             color: #666
         textarea[disabled]
@@ -1359,8 +1359,6 @@ $colour4: #8a89ba
         .oe_form_field_email button img,
         .oe_form_field_url button img
             vertical-align: top
-        .oe_form_field_translatable,
-        .oe_form_field_many2one,
         .oe_form_field_date,
         .oe_form_field_datetime
             white-space: nowrap
@@ -1471,8 +1469,9 @@ $colour4: #8a89ba
         border-bottom: 1px solid black
     .oe_horizontal_separator
         font-weight: bold
-        font-size: 16px
-        margin: 4px 0
+        font-size: 20px
+        margin: 20px 0px 10px 0px
+        color: #aab
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator

From 5f7fa2c9096c47f5d00cc79e04ef96ef11354552 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 27 May 2012 12:45:04 +0200
Subject: [PATCH 122/126] [IMP] improved CSS, padding on editable lists

bzr revid: fp@openerp.com-20120527104504-cmpa5t256es2486a
---
 addons/web/static/src/css/base.css  | 4 +++-
 addons/web/static/src/css/base.sass | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a17c1cfb8b1..fc49a064778 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1981,8 +1981,10 @@
 .openerp .oe-listview-content > tbody > tr {
   border-top: 1px solid #dddddd;
 }
-.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th {
+.openerp .oe-listview-content > tbody > tr > td.oe-field-cell {
   padding: 3px 6px;
+}
+.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th {
   line-height: 18px;
 }
 .openerp .oe-listview-content > tbody > tr > td > button, .openerp .oe-listview-content > tbody > tr > th > button {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b4fd85034a7..696defe6864 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1641,8 +1641,9 @@ $colour4: #8a89ba
             background: white
             > tr
                 border-top: 1px solid #ddd
-                > td, > th
+                > td.oe-field-cell
                     padding: 3px 6px
+                > td, > th
                     line-height: 18px
                     > button
                         border: none

From 23b63eaf8ac61d04b46decec905c64e324bc089a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 27 May 2012 12:50:49 +0200
Subject: [PATCH 123/126] [IMP] improved css: min width of fields (mainly for
 editable lists)

bzr revid: fp@openerp.com-20120527105049-g2r56gztqnwvq430
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fc49a064778..89b8cc1a38f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1633,7 +1633,7 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
   background: white;
-  min-width: 90px;
+  min-width: 70px;
   color: #1f1f1f;
 }
 .openerp .oe_form input[readonly],
@@ -1867,7 +1867,7 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
   background: white;
-  min-width: 90px;
+  min-width: 50px;
 }
 .openerp .oe_form .oe_form_field_progressbar.ui-progressbar span {
   position: absolute;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 696defe6864..e013009f9b1 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1329,7 +1329,7 @@ $colour4: #8a89ba
             -webkit-border-radius: 3px
             border-radius: 3px
             background: white
-            min-width: 90px
+            min-width: 70px
             color: #1f1f1f
         input[readonly],
         select[readonly],
@@ -1537,7 +1537,7 @@ $colour4: #8a89ba
             -webkit-border-radius: 3px
             border-radius: 3px
             background: white
-            min-width: 90px
+            min-width: 50px
 
             span
                 position: absolute

From 099c4e574a5f11720c162216efb88cec48380be1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 29 May 2012 04:46:17 +0000
Subject: [PATCH 124/126] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120528051815-kds7qsood2fiq2l6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120529044617-zjqmk7vucdrf7q03
---
 .../analytic_journal_billing_rate/i18n/lv.po  |   79 +
 addons/crm_helpdesk/i18n/ja.po                |    9 +-
 addons/delivery/i18n/lv.po                    |  642 +++++
 addons/hr_expense/i18n/ja.po                  |   10 +-
 addons/knowledge/i18n/lv.po                   |   33 +
 addons/membership/i18n/ja.po                  |  310 +--
 addons/mrp/i18n/ja.po                         | 2233 +++++++++++++++++
 addons/mrp/i18n/lv.po                         | 2231 ++++++++++++++++
 addons/sale_journal/i18n/lv.po                |  130 +
 addons/sale_layout/i18n/lv.po                 |  254 ++
 10 files changed, 5775 insertions(+), 156 deletions(-)
 create mode 100644 addons/analytic_journal_billing_rate/i18n/lv.po
 create mode 100644 addons/delivery/i18n/lv.po
 create mode 100644 addons/knowledge/i18n/lv.po
 create mode 100644 addons/mrp/i18n/ja.po
 create mode 100644 addons/mrp/i18n/lv.po
 create mode 100644 addons/sale_journal/i18n/lv.po
 create mode 100644 addons/sale_layout/i18n/lv.po

diff --git a/addons/analytic_journal_billing_rate/i18n/lv.po b/addons/analytic_journal_billing_rate/i18n/lv.po
new file mode 100644
index 00000000000..01b645557dd
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/lv.po
@@ -0,0 +1,79 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-28 13:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: analytic_journal_billing_rate
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
index 836b26ca92c..3228f329919 100644
--- a/addons/crm_helpdesk/i18n/ja.po
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-23 20:45+0000\n"
+"PO-Revision-Date: 2012-05-28 19:12+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-24 04:53+0000\n"
-"X-Generator: Launchpad (build 15135)\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -725,6 +725,9 @@ msgid ""
 "gateway: new emails may create issues, each of them automatically gets the "
 "history of the conversation with the customer."
 msgstr ""
+"ヘルプデスクとサポート機能を使って、あなたの介在を記録することができます。カスタマごとに注釈を加えたり、必要であればパートナとのやり取りを記録することがで"
+"きます。また，優先レベルを割り当てることもできます。OpenERPの問題システムを使ってサポート活動を管理することができます。問題をEメールゲートウェイと"
+"連動させて、新しいEメールが問題を作成して、カスタマとの対話の履歴を自動的に生成することができます。"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
diff --git a/addons/delivery/i18n/lv.po b/addons/delivery/i18n/lv.po
new file mode 100644
index 00000000000..e42f7e9adf9
--- /dev/null
+++ b/addons/delivery/i18n/lv.po
@@ -0,0 +1,642 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-28 08:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:45+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Ref."
+msgstr ""
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr ""
+
+#. module: delivery
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr ""
+
+#. module: delivery
+#: view:stock.picking:0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.report.xml,name:delivery.report_shipping
+msgid "Delivery order"
+msgstr ""
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+msgid "Picking to be invoiced"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Delivery Order :"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,name:0
+#: view:delivery.sale.order:0
+#: field:delivery.sale.order,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:213
+#, python-format
+msgid "No price available!"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form1
+msgid ""
+"Define your delivery methods and their pricing. The delivery costs can be "
+"added on the sale order form or in the invoice, based on the delivery orders."
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Lot"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:213
+#, python-format
+msgid "No line matched this product or order in the choosed delivery grid."
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Invoiced to"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_sale_order
+msgid "Make Delievery"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:89
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "Default price"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_define_delivery_steps_wizard
+msgid "delivery.define.delivery.steps.wizard"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Date"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr ""
+
+#. module: delivery
+#: view:stock.move:0
+msgid "Weights"
+msgstr ""
+
+#. module: delivery
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: report:sale.shipping:0
+#: field:stock.move,weight:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:70
+#, python-format
+msgid "No grid available !"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:53
+#: code:addons/delivery/wizard/delivery_sale_order.py:73
+#, python-format
+msgid "Order not in draft state !"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Choose Your Default Picking Policy"
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Shipping Date"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr ""
+
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Quantity"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+#: model:ir.actions.act_window,name:delivery.action_define_delivery_steps
+msgid "Setup Your Picking Policy"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1
+msgid "Define Delivery Methods"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr ""
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr ""
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:130
+#, python-format
+msgid "Free if more than %.2f"
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Define the delivery methods you are using and their pricing in order to "
+"reinvoice the delivery costs when you are doing invoicing based on delivery "
+"orders"
+msgstr ""
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If More Than"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "Create Deliveries"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr ""
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Description"
+msgstr ""
+
+#. module: delivery
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:70
+#, python-format
+msgid "No grid matching for this carrier !"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "="
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+msgid "Pricing Information"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: report:sale.shipping:0
+#: field:stock.picking,carrier_id:0
+msgid "Carrier"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Apply"
+msgstr ""
+
+#. module: delivery
+#: field:sale.order,id:0
+msgid "ID"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:53
+#: code:addons/delivery/wizard/delivery_sale_order.py:73
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr ""
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_cost
+#: view:sale.order:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Apply"
+msgstr ""
+
+#. module: delivery
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr ""
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index 0c9668d4890..d05a7215a7d 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-29 01:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -851,7 +851,7 @@ msgstr "経費"
 #. module: hr_expense
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "エラー：無効な欧州統一商品番号です。"
+msgstr "エラー：無効な商品識別番号です。"
 
 #. module: hr_expense
 #: view:hr.expense.report:0 field:hr.expense.report,year:0
diff --git a/addons/knowledge/i18n/lv.po b/addons/knowledge/i18n/lv.po
new file mode 100644
index 00000000000..4a89de943d7
--- /dev/null
+++ b/addons/knowledge/i18n/lv.po
@@ -0,0 +1,33 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-05-28 12:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr ""
diff --git a/addons/membership/i18n/ja.po b/addons/membership/i18n/ja.po
index c5ad528226b..78e4abe3a5c 100644
--- a/addons/membership/i18n/ja.po
+++ b/addons/membership/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-27 02:57+0000\n"
+"PO-Revision-Date: 2012-05-29 01:29+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-27 04:39+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:45+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -43,12 +43,12 @@ msgstr "グループ化…"
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr "支払番号"
+msgstr "支払済数"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr "稼いだ金額"
+msgstr "獲得金額"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
@@ -75,157 +75,157 @@ msgstr "請求書は支払済です。"
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "会社"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "会員の終了日"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "終了日"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr ""
+msgstr "請求書待機中"
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display paid, old and total earned columns"
-msgstr ""
+msgstr "これは支払済、古い合計収入列を表示します。"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "仕入先"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Non Member"
-msgstr ""
+msgstr "非会員"
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "基本会員"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "全会員"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
 msgid "Stop membership date"
-msgstr ""
+msgstr "脱退日"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "会員への製品"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "会員への参加"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "準会員"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "会員は関連付けられました。"
 
 #. module: membership
 #: view:report.membership:0
 msgid "   Month   "
-msgstr ""
+msgstr "   月   "
 
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "保留中金額"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "関連パートナ"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "仕入先パートナ"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "請求済数"
 
 #. module: membership
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "無効なBBA（ブロードバンドアクセス）構造の通信"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "会員分析"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "会員の終了日"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "開始日"
 
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "パートナは請求書を作成するための住所を持っていません。"
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
 #: field:membership.membership_line,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "支払請求書"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "顧客パートナ"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Partners"
-msgstr ""
+msgstr "パートナ"
 
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr ""
+msgstr "送信者"
 
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr ""
+msgstr "エラー。この会員製品は期間外です。"
 
 #. module: membership
 #: help:res.partner,membership_state:0
@@ -244,186 +244,193 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"会員の状態を次のように表します。\n"
+"                    ・ 非会員：どの会員にも申し込んでいない\n"
+"                    ・ キャンセル会員：会員をキャンセルした\n"
+"                    ・ 旧会員：会員の有効期限切れ\n"
+"                    ・ 待機会員：会員に申込を行い、請求書が作成される予定\n"
+"                    ・ 請求済会員：請求書を作成済\n"
+"                    ・ 支払済会員：会員金額を支払済"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
 msgid "Create"
-msgstr ""
+msgstr "作成"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
-msgstr ""
+msgstr "会員製品"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
-msgstr ""
+msgstr "会員行"
 
 #. module: membership
 #: help:report.membership,date_from:0
 #: field:res.partner,membership_start:0
 msgid "Start membership date"
-msgstr ""
+msgstr "会員開始日"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "今月、作成したイベント"
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display waiting, invoiced and total pending columns"
-msgstr ""
+msgstr "これは待機中、請求済の合計保留中列を表示します。"
 
 #. module: membership
 #: code:addons/membership/membership.py:410
 #: code:addons/membership/membership.py:413
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
 msgid "Paid member"
-msgstr ""
+msgstr "支払番号"
 
 #. module: membership
 #: view:report.membership:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    月-1    "
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "先月、作成したイベント"
 
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "待機数"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "今年度に作成したイベント"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
 #: model:ir.ui.menu,name:membership.menu_members
 #: view:res.partner:0
 msgid "Members"
-msgstr ""
+msgstr "会員"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free"
-msgstr ""
+msgstr "請求済 / 支払済 / 無料"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
 msgid "Open invoice."
-msgstr ""
+msgstr "請求書を開く"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "ゴールド会員"
 
 #. module: membership
 #: help:res.partner,associate_member:0
 msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
-msgstr ""
+msgstr "あなたが関連付けたい会員。それは会員の関係性の会員状態を考慮します。"
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr ""
+msgstr "会員の製品"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "会員のための製品を定義して下さい。"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr ""
+msgstr "請求済会員は会員と関係付けることができます。"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "参加"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "会員の有効期限となる日付です。"
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr ""
+msgstr "会員キャンセル日"
 
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "参加日"
 
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "無料で与えたい会員を選択して下さい。"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
-msgstr ""
+msgstr "関連を設定"
 
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " 会員状態"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "会員"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "会員請求書は支払済です。"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "製品テンプレート"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "請求書行"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -442,138 +449,145 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"会員の状態を次のように表します。\n"
+"                    ・ 非会員：どの会員にも申し込んでいない\n"
+"                    ・ キャンセル会員：会員をキャンセルした\n"
+"                    ・ 旧会員：会員の有効期限切れ\n"
+"                    ・ 待機会員：会員に申込を行い、請求書が作成される予定\n"
+"                    ・ 請求済会員：請求書を作成済\n"
+"                    ・ 支払済会員：会員金額を支払済"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "グル―化…"
 
 #. module: membership
 #: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "パートナは無料会員です。"
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr ""
+msgstr "会員販売価格表"
 
 #. module: membership
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "関連会員"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "会員として有効になる日付です。"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "関連パートナ"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "会員請求書"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "販売員"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr ""
+msgstr "会員製品を定義して下さい。"
 
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Free Member"
-msgstr ""
+msgstr "無料会員"
 
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr ""
+msgstr "会員販売価格表バージョン"
 
 #. module: membership
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "エラー：デフォルトの単位と仕入単位は同じ分類でなければいけません。"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
-msgstr ""
+msgstr "予測"
 
 #. module: membership
 #: field:report.membership,partner_id:0
 msgid "Member"
-msgstr ""
+msgstr "会員"
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "開始日"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
-msgstr ""
+msgstr "関連会員"
 
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "会計情報"
 
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "会員終了日"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "顧客"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
 #: model:ir.ui.menu,name:membership.menu_membership_products
 #: view:product.product:0
 msgid "Membership Products"
-msgstr ""
+msgstr "会員製品"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_membership
@@ -584,167 +598,167 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,member_lines:0
 msgid "Membership"
-msgstr ""
+msgstr "会員"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Invoiced Member"
-msgstr ""
+msgstr "請求済会員"
 
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "会員となった日付"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Waiting Member"
-msgstr ""
+msgstr "待機会員"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr ""
+msgstr "関連パートナ"
 
 #. module: membership
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "製品が会員製品の時に選択して下さい。"
 
 #. module: membership
 #: field:membership.membership_line,state:0
 msgid "Membership State"
-msgstr ""
+msgstr "会員状態"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "販売説明"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Membership Partners"
-msgstr ""
+msgstr "会員パートナ"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "会員料金"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
 msgid "Membership amount"
-msgstr ""
+msgstr "会員金額"
 
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "パートナ別交渉価格"
 
 #. module: membership
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "請求書番号は会社ごとに固有である必要があります。"
 
 #. module: membership
 #: view:res.partner:0
 msgid "None/Canceled/Old/Waiting"
-msgstr ""
+msgstr "非 / キャンセル / 旧 / 待機"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Old Member"
-msgstr ""
+msgstr "旧会員"
 
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr ""
+msgstr "終了"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "現在の会員状態"
 
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
 msgid "Draft invoice is now open."
-msgstr ""
+msgstr "ドラフト請求書が今、開かれました。"
 
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "非アクティブ"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice
 #: field:membership.membership_line,account_invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "請求書"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "全非会員"
 
 #. module: membership
 #: view:product.product:0
 msgid "Information"
-msgstr ""
+msgstr "情報"
 
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
-msgstr ""
+msgstr "アカウント請求書行"
 
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "分類化"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
-msgstr ""
+msgstr "会員のためのドラフト請求書"
 
 #. module: membership
 #: field:membership.invoice,member_price:0
@@ -752,123 +766,123 @@ msgstr ""
 #: model:product.price.type,name:membership.product_price_type_memberprice
 #: field:product.template,member_price:0
 msgid "Member Price"
-msgstr ""
+msgstr "会員価格"
 
 #. module: membership
 #: view:product.product:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "仕入説明"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "製品"
 
 #. module: membership
 #: view:product.product:0
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
 #. module: membership
 #: field:res.partner,free_member:0
 msgid "Free member"
-msgstr ""
+msgstr "無料会員"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "シルバー会員"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "消費税"
 
 #. module: membership
 #: field:report.membership,date_to:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "請求済会員"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Starting Date Of Membership"
-msgstr ""
+msgstr "会員の開始日"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "会員をキャンセルした日付"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr ""
+msgstr "キャンセル日"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "待機会員"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 msgid "Invoice Membership"
-msgstr ""
+msgstr "請求会員"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
 msgid "Membership product"
-msgstr ""
+msgstr "会員製粉"
 
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "会員金額"
 
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Cancelled Member"
-msgstr ""
+msgstr "キャンセル済会員"
 
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "エラー：無効な商品識別番号です。"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
+msgstr "売上完了"
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
new file mode 100644
index 00000000000..9168d24393a
--- /dev/null
+++ b/addons/mrp/i18n/ja.po
@@ -0,0 +1,2233 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:49+0000\n"
+"PO-Revision-Date: 2012-05-29 04:20+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:45+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr "配送ワークセンター"
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
+msgstr ""
+"製造オーダーは通常はOpenERPにより部品表と調達ルールに基づき自動的に提案されます　。しかし、製造オーダーを手動で作成することもできます。OpenER"
+"Pはオーダーが処理される時に、原材料の消費（在庫減少）と最終製品の製造（在庫増加）を処理します。"
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr "システムが部品を探す場所"
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr "ワークセンター活用"
+
+#. module: mrp
+#: model:product.template,name:mrp.product_sugar_product_template
+msgid "Sugar"
+msgstr "砂糖"
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr "周期数"
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr "周期数"
+
+#. module: mrp
+#: model:product.uom.categ,name:mrp.product_uom_categ_fluid
+msgid "Fluid"
+msgstr "流体"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr "最小在庫ルールは最小在庫に達すると、システムが直ちに自動的に調達オーダーを作成します。"
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+msgid "Picking list"
+msgstr "集荷リスト"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Hourly Cost"
+msgstr "時間コスト"
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Cost Price per Uom"
+msgstr "単位当りのコスト価格"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr "スクラップ製品"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_routing_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
+msgid "Routings"
+msgstr "経路"
+
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr "ワークセンター製品"
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr "部品表の検索"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr "在庫可能製品と消耗品"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr "生産する"
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
+msgstr "このワークセンターは配送の特定の操作の中で反復回数実行される必要があります。"
+
+#. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr "完成した製品"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are currently in production."
+msgstr "現在生産中の製造オーダー"
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr "購入のため"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr "システムは優先仕入先にRFQ（見積依頼書）を自動的に起こします。"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr "終了する製品"
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr "設定する / 包む"
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr "時間当りのコスト"
+
+#. module: mrp
+#: model:product.template,name:mrp.product_orange_product_template
+msgid "Orange"
+msgstr "オレンジ"
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr "これは例えばトレーニングセッションといった、システムに何の影響も与えないでサービスをする場合に使用されます。"
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "UOM"
+msgstr ""
+
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid ""
+"Fill this product to track easily your production costs in the analytic "
+"accounting."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "For purchased material"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.product_form_config_action
+msgid ""
+"Create a product form for everything you buy or sell. Specify a supplier if "
+"the product can be purchased."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Work Cost"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids2:0
+msgid "Produced Products"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Partner Ref"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+msgid "Source Document"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_cloth_product_template
+msgid "Cloth"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Work Center Usage"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.production:0
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#: report:bom.structure:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
+msgid "Quantity"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid ""
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the needs."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the Internal Picking List that brings the finished product to the "
+"production plan"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Component Product"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "For Services."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle_account_id:0
+#: help:mrp.workcenter,costs_hour_account_id:0
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+msgid "Products to Produce"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_configure_workcenter
+msgid "Configure your work centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Force Reservation"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing Work Centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Picking Exception"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+msgid "Consumed Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:43
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Material Components"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Ready"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_buttons_product_template
+msgid "Shirt Buttons"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"plannification."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "In Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
+msgid "Print"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
+msgid "Type"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:78
+#: code:addons/mrp/wizard/change_production_qty.py:83
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "Product Name"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:503
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:734
+#: code:addons/mrp/mrp.py:762
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Printing date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Partial"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "WorkCenter"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are waiting for raw materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allow you to create and manage manufacturing units.  They "
+"consist of workers and/or machines, which are considered as units for "
+"capacity and planning forecast.  Keep in mind that the working time and "
+"resource leave are not taken into account in the time computation of the "
+"work center."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Ready to Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,name:0
+msgid "Modification name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+msgid "Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:45
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+msgid "Search"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:626
+#, python-format
+msgid "Could not cancel manufacturing order !"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:627
+#, python-format
+msgid ""
+"You must first cancel related internal picking attached to this "
+"manufacturing order."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:503
+#, python-format
+msgid "Cannot delete a manufacturing order in state '%s'"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:160
+#: code:addons/mrp/report/price.py:211
+#, python-format
+msgid "Total Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Work Center name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing,code:0
+msgid "Code"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+msgid "Property Group"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Qty"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:63
+#, python-format
+msgid "Active Id is not found"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr ""
+
+#. module: mrp
+#: model:res.groups,name:mrp.group_mrp_manager
+msgid "Manager"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "]"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.todo.category,name:mrp.category_mrp_config
+msgid "MRP Management"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work Center per hour."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid ""
+"Number of operations this Work Center can do in parallel. If this Work "
+"Center represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Cycles Cost"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+msgid "Finished Products Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+msgid "Resources"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid ""
+"Time in hours for this Work Center to achieve the operation of the specified "
+"routing."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allow you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.product_form_config_action
+msgid "Create or Import Products"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Notes"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are ready to start production."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter.load:0
+msgid "Select time unit"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:187
+#, python-format
+msgid "Components Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Day by day"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_shirt_product_template
+msgid "Shirt"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:1000
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:647
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:204
+#, python-format
+msgid "Work Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_water_product_template
+msgid "Water"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Component Name"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
+msgid "Product Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Components suppliers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:603
+#, python-format
+msgid "Couldn't find a bill of material for this product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+msgid "Active"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of Material Revision"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "SO Number"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Done"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
+#: field:mrp.bom,product_id:0
+#: view:mrp.production:0
+#: field:mrp.production,product_id:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+msgid "Raw Materials Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:358
+#, python-format
+msgid "Copy"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_finished:0
+msgid "End Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"planning."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uom:0
+msgid ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:734
+#, python-format
+msgid ""
+"You are going to consume total %s quantities of \"%s\".\n"
+"But you can only consume up to total %s quantities."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#: view:mrp.bom:0
+#, python-format
+msgid "Components"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product.produce:0
+msgid "Confirm"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
+msgstr ""
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "New"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"When the production order is created the state is set to 'Draft'.\n"
+" If the order is confirmed the state is set to 'Waiting Goods'.\n"
+" If any exceptions are there, the state is set to 'Picking Exception'.       "
+"                             \n"
+"If the stock is available then the state is set to 'Ready to Produce'.\n"
+" When the production gets started then the state is set to 'In Production'.\n"
+" When the production is over, the state is set to 'Done'."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,time_unit:0
+msgid "Type of period"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_orangejuice_product_template
+msgid "Orange Juice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,bom_id:0
+#: field:procurement.order,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Waiting Goods"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,last_indice:0
+msgid "last indice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
+msgid "BoM Revisions"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production started late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:146
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
+#, python-format
+msgid "Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: model:res.groups,name:mrp.group_mrp_user
+msgid "User"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Ref"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
+msgstr ""
+
+#. module: mrp
+#: model:product.uom,name:mrp.product_uom_litre
+msgid "Litre"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:762
+#, python-format
+msgid ""
+"You are going to produce total %s quantities of \"%s\".\n"
+"But you can only produce up to total %s quantities."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:603
+#: code:addons/mrp/wizard/change_production_qty.py:78
+#: code:addons/mrp/wizard/change_production_qty.py:83
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Production Started"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: field:product.product,bom_ids:0
+msgid "Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
+msgid "General Information"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: mrp
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+msgid "Change Product Qty"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom.revision:0
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: field:mrp.routing,note:0
+#: view:mrp.routing.workcenter:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
+#: field:mrp.workcenter,note:0
+msgid "Description"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+msgid "Manufacturing"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:874
+#: code:addons/mrp/mrp.py:929
+#: code:addons/mrp/mrp.py:954
+#, python-format
+msgid "PROD: %s"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: report:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+msgid "Products to Consume"
+msgstr ""
diff --git a/addons/mrp/i18n/lv.po b/addons/mrp/i18n/lv.po
new file mode 100644
index 00000000000..a259910f655
--- /dev/null
+++ b/addons/mrp/i18n/lv.po
@@ -0,0 +1,2231 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:49+0000\n"
+"PO-Revision-Date: 2012-05-28 13:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:45+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_sugar_product_template
+msgid "Sugar"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr ""
+
+#. module: mrp
+#: model:product.uom.categ,name:mrp.product_uom_categ_fluid
+msgid "Fluid"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,picking_id:0
+msgid "Picking list"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Hourly Cost"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Cost Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_routing_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
+msgid "Routings"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
+#: field:mrp.production,name:0
+msgid "Reference"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Finished Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are currently in production."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "Set / Pack"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+msgid "State"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour:0
+msgid "Cost per hour"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_orange_product_template
+msgid "Orange"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "UOM"
+msgstr ""
+
+#. module: mrp
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid ""
+"Fill this product to track easily your production costs in the analytic "
+"accounting."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "For purchased material"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.product_form_config_action
+msgid ""
+"Create a product form for everything you buy or sell. Specify a supplier if "
+"the product can be purchased."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle_account_id:0
+msgid "Cycle Account"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Work Cost"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Capacity Information"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids2:0
+msgid "Produced Products"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Partner Ref"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+msgid "Source Document"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_lines:0
+msgid "Scheduled goods"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Sets / Phantom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,position:0
+msgid "Reference to a position in an external plan."
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_cloth_product_template
+msgid "Cloth"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Work Center Usage"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.production:0
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#: report:bom.structure:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
+msgid "Quantity"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Confirm Production"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockproduction0
+msgid ""
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the needs."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the Internal Picking List that brings the finished product to the "
+"production plan"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Component Product"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action2
+msgid "Bill of Materials Structure"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "For Services."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle_account_id:0
+#: help:mrp.workcenter,costs_hour_account_id:0
+msgid ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+msgid "Products to Produce"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: field:mrp.routing,location_id:0
+msgid "Production Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Change Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_configure_workcenter
+msgid "Configure your work centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Force Reservation"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,author_id:0
+msgid "Author"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Search Production"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing Work Centers."
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uom:0
+#: field:mrp.production,product_uom:0
+#: field:mrp.production.product.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Picking Exception"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_lines:0
+msgid "BoM Lines"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_start:0
+msgid "Time before prod."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+msgid "Consumed Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:43
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Material Components"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Ready"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_buttons_product_template
+msgid "Shirt Buttons"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"plannification."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_cycle:0
+msgid "Time in hours for doing one cycle."
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "In Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
+msgid "Print"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
+msgid "Type"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:78
+#: code:addons/mrp/wizard/change_production_qty.py:83
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "Product Name"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:503
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:734
+#: code:addons/mrp/mrp.py:762
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Printing date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_orderrfq0
+#: model:process.node,name:mrp.process_node_rfq0
+msgid "RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Partial"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "WorkCenter"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are waiting for raw materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid ""
+"Work Centers allow you to create and manage manufacturing units.  They "
+"consist of workers and/or machines, which are considered as units for "
+"capacity and planning forecast.  Keep in mind that the working time and "
+"resource leave are not taken into account in the time computation of the "
+"work center."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,cycle_total:0
+msgid "Total Cycles"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Ready to Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,name:0
+msgid "Modification name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+msgid "Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,type:0
+msgid "BoM Type"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/procurement.py:45
+#, python-format
+msgid ""
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+msgid "Search"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:626
+#, python-format
+msgid "Could not cancel manufacturing order !"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:627
+#, python-format
+msgid ""
+"You must first cancel related internal picking attached to this "
+"manufacturing order."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:503
+#, python-format
+msgid "Cannot delete a manufacturing order in state '%s'"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:160
+#: code:addons/mrp/report/price.py:211
+#, python-format
+msgid "Total Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stockproduct0
+#: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
+msgid "Stockable Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Work Center name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing,code:0
+msgid "Code"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+msgid "Property Group"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Qty"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:63
+#, python-format
+msgid "Active Id is not found"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_prod_id:0
+msgid "Move product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_servicemts0
+msgid "Make to stock"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Start Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr ""
+
+#. module: mrp
+#: model:res.groups,name:mrp.group_mrp_manager
+msgid "Manager"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,name:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,name:0
+#: field:mrp.routing,name:0
+#: field:mrp.routing.workcenter,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "]"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.todo.category,name:mrp.category_mrp_config
+msgid "MRP Management"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work Center per hour."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid ""
+"Number of operations this Work Center can do in parallel. If this Work "
+"Center represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Cycles Cost"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in cycles"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_dest_id:0
+msgid "Finished Products Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+msgid "Resources"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid ""
+"Time in hours for this Work Center to achieve the operation of the specified "
+"routing."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Per week"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid ""
+"Routings allow you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.product_form_config_action
+msgid "Create or Import Products"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+msgid "Notes"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Manufacturing Orders which are ready to start production."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom
+#: view:mrp.bom:0
+#: field:mrp.production,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter.load:0
+msgid "Select time unit"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:187
+#, python-format
+msgid "Components Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
+msgid "Day by day"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Revisions"
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_shirt_product_template
+msgid "Shirt"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:1000
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Production Order N° :"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:647
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:204
+#, python-format
+msgid "Work Cost of %s %s"
+msgstr ""
+
+#. module: mrp
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_water_product_template
+msgid "Water"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Component Name"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
+msgid "Product Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#, python-format
+msgid "Components suppliers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_hour_account_id:0
+msgid "Hour Account"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:603
+#, python-format
+msgid "Couldn't find a bill of material for this product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,active:0
+#: field:mrp.routing,active:0
+msgid "Active"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Center Loads"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of Material Revision"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "SO Number"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Done"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,capacity_per_cycle:0
+msgid "Capacity per Cycle"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
+#: field:mrp.bom,product_id:0
+#: view:mrp.production:0
+#: field:mrp.production,product_id:0
+#: report:mrp.production.order:0
+#: field:mrp.production.product.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,hour_total:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,location_src_id:0
+msgid "Raw Materials Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:358
+#, python-format
+msgid "Copy"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_finished:0
+msgid "End Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,date_start:0
+#: help:mrp.bom,date_stop:0
+msgid "Validity of this BoM or component. Keep empty if it's always valid."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"planning."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property.group:0
+msgid "Properties categories"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: view:mrp.production.product.line:0
+msgid "Scheduled Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.lot.line:0
+msgid "Production Products Consommation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,costs_cycle:0
+msgid "Cost per cycle"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_uom:0
+msgid ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:734
+#, python-format
+msgid ""
+"You are going to consume total %s quantities of \"%s\".\n"
+"But you can only consume up to total %s quantities."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
+msgid "Amount in hours"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_cycle:0
+msgid "Time for 1 cycle (hour)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
+#: field:mrp.production.product.line,production_id:0
+#: field:mrp.production.workcenter.line,production_id:0
+#: model:process.node,name:mrp.process_node_production0
+#: model:process.node,name:mrp.process_node_productionorder0
+msgid "Production Order"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Compute Data"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,product_uos_qty:0
+msgid "Product UoS Qty"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:139
+#: view:mrp.bom:0
+#, python-format
+msgid "Components"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+#: model:ir.actions.report.xml,name:mrp.report_bom_structure
+msgid "BOM Structure"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,date_start:0
+msgid "Valid From"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Normal BoM"
+msgstr ""
+
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos_qty:0
+#: field:mrp.production.product.line,product_uos_qty:0
+msgid "Product UOS Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
+msgid ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.product.produce:0
+msgid "Confirm"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
+msgstr ""
+
+#. module: mrp
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_rounding:0
+msgid "Product Rounding"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "New"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Recreate Picking"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,type:0
+msgid ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"When the production order is created the state is set to 'Draft'.\n"
+" If the order is confirmed the state is set to 'Waiting Goods'.\n"
+" If any exceptions are there, the state is set to 'Picking Exception'.       "
+"                             \n"
+"If the stock is available then the state is set to 'Ready to Produce'.\n"
+" When the production gets started then the state is set to 'In Production'.\n"
+" When the production is over, the state is set to 'Done'."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter,time_stop:0
+msgid "Time after prod."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.workcenter.load,time_unit:0
+msgid "Type of period"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Total Qty"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,hour_nbr:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_purchaseprocure0
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.routing.workcenter,routing_id:0
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_start:0
+msgid "Time in hours for the setup."
+msgstr ""
+
+#. module: mrp
+#: model:product.template,name:mrp.product_orangejuice_product_template
+msgid "Orange Juice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,bom_id:0
+#: field:procurement.order,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Waiting Goods"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,last_indice:0
+msgid "last indice"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,revision_ids:0
+#: view:mrp.bom.revision:0
+msgid "BoM Revisions"
+msgstr ""
+
+#. module: mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Production started late"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:146
+#: model:ir.actions.report.xml,name:mrp.report_cost_structure
+#, python-format
+msgid "Cost Structure"
+msgstr ""
+
+#. module: mrp
+#: model:res.groups,name:mrp.group_mrp_user
+msgid "User"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Ref"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
+msgstr ""
+
+#. module: mrp
+#: model:product.uom,name:mrp.product_uom_litre
+msgid "Litre"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:762
+#, python-format
+msgid ""
+"You are going to produce total %s quantities of \"%s\".\n"
+"But you can only produce up to total %s quantities."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:603
+#: code:addons/mrp/wizard/change_production_qty.py:78
+#: code:addons/mrp/wizard/change_production_qty.py:83
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+msgid "Production Started"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.product.produce,product_qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
+#: field:product.product,bom_ids:0
+msgid "Bill of Materials"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: view:mrp.bom:0
+#: field:mrp.bom,property_ids:0
+#: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
+msgid "General Information"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Productions"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: mrp
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: mrp
+#: field:stock.move,production_id:0
+msgid "Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
+#: field:mrp.production.workcenter.line,name:0
+msgid "Work Order"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+msgid "Change Product Qty"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom.revision:0
+#: field:mrp.bom.revision,description:0
+#: view:mrp.property:0
+#: view:mrp.property.group:0
+#: field:mrp.routing,note:0
+#: view:mrp.routing.workcenter:0
+#: field:mrp.routing.workcenter,note:0
+#: view:mrp.workcenter:0
+#: field:mrp.workcenter,note:0
+msgid "Description"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+msgid "Manufacturing"
+msgstr ""
+
+#. module: mrp
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:874
+#: code:addons/mrp/mrp.py:929
+#: code:addons/mrp/mrp.py:954
+#, python-format
+msgid "PROD: %s"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,time_stop:0
+msgid "Time in hours for the cleaning."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicemto0
+msgid ""
+"If the service has a 'Produce' supply method, this creates a task in the "
+"project management module of OpenERP."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,method:0
+msgid "On Stock"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,sequence:0
+#: report:mrp.production.order:0
+#: field:mrp.production.workcenter.line,sequence:0
+#: field:mrp.routing.workcenter,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+msgid "Products to Consume"
+msgstr ""
diff --git a/addons/sale_journal/i18n/lv.po b/addons/sale_journal/i18n/lv.po
new file mode 100644
index 00000000000..b7e28dd62c7
--- /dev/null
+++ b/addons/sale_journal/i18n/lv.po
@@ -0,0 +1,130 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-05-28 08:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Type"
+msgstr ""
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid ""
+"This invoicing type will be used, by default, for invoicing the current "
+"partner."
+msgstr ""
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+
+#. module: sale_journal
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr ""
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr ""
diff --git a/addons/sale_layout/i18n/lv.po b/addons/sale_layout/i18n/lv.po
new file mode 100644
index 00000000000..a6c201c8f7c
--- /dev/null
+++ b/addons/sale_layout/i18n/lv.po
@@ -0,0 +1,254 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-05-28 08:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n"
+"X-Generator: Launchpad (build 15316)\n"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Line Type"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr ""
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""

From c90df64012d4294241f7fd13702f129042499ecb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 29 May 2012 16:30:06 +0200
Subject: [PATCH 125/126] [IMP] Moved Webkit Configuration to Technical menu

bzr revid: fp@tinyerp.com-20120529143006-u0q234936m9r1pr3
---
 addons/report_webkit/header_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index 267bc7cb0a4..c66afd4f66c 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -53,7 +53,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_header_img" id="menu_header_img" parent="base.menu_res_company_global" sequence="14"/>
+        <menuitem action="action_header_img" id="menu_header_img" parent="base.menu_custom" sequence="14"/>
 
         <record id="action_header_webkit" model="ir.actions.act_window">
             <field name="name">Webkit Headers/Footers</field>
@@ -61,7 +61,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_header_webkit" id="menu_header_webkit" parent="base.menu_res_company_global" sequence="14"/>
+        <menuitem action="action_header_webkit" id="menu_header_webkit" parent="base.menu_custom" sequence="14"/>
 
     </data>
 </openerp>

From cebad651c94ed2709dc6557398f6e6bea8d0eadd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 May 2012 17:32:38 +0200
Subject: [PATCH 126/126] [FIX] Formview: invalid fields sometimes list
 'undefined'

bzr revid: fme@openerp.com-20120529153238-zg88ensj232q5tuu
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 22f2a1c23a4..5f3d3faef5e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -673,7 +673,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
         var msg = "<ul>";
         _.each(this.fields, function(f) {
             if (!f.is_valid()) {
-                msg += "<li>" + f.node.attrs.string + "</li>";
+                msg += "<li>" + (f.node.attrs.string || f.field.string) + "</li>";
             }
         });
         msg += "</ul>";