diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index de046de6211..47b6ebf3110 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -58,6 +58,9 @@
+
@@ -71,17 +74,19 @@
+ string="Customer Invoices"
+ domain="[('type','=','out_invoice')]"
+ default="1"/>
+ string="Customer Refunds"
+ domain="[('type','=','out_refund')]"/>
+
+ string="Supplier Invoices"
+ domain="[('type','=','in_invoice')]"/>
+ string="Supplier Refunds"
+ domain="[('type','=','in_refund')]"/>
@@ -90,6 +95,7 @@
+
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index e9558f7a101..0c3c46690ac 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -204,7 +204,7 @@ class account_analytic_account(osv.osv):
'date': fields.date('Date End'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
- 'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True,readonly=True,
+ 'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,readonly=True,
help='* When an account is created its in \'Draft\' state.\
\n* If any associated partner is there, it can be in \'Open\' state.\
\n* If any pending balance is there it can be in \'Pending\'. \
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 6677bf7184b..f791a1b86cc 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -14,7 +14,7 @@
+ id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
@@ -28,7 +28,7 @@
+ id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
@@ -42,8 +42,8 @@
+ id="menu_crm_claim_stage_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -57,26 +57,26 @@
-
+
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="done,cancel" type="object" icon="gtk-convert" />
@@ -132,20 +132,20 @@
+ states="open,draft,pending" type="object"
+ icon="gtk-jump-to" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ string="Reset to Draft" states="done,cancel"
+ type="object" icon="gtk-convert" />
@@ -183,10 +183,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.claim'}"
+ icon="gtk-undo" type="action" />
@@ -195,9 +195,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.claim'}"
+ icon="gtk-go-forward" type="action" />
@@ -206,7 +206,7 @@
-
+
CRM - Claims Calendar
@@ -222,7 +222,7 @@
-
+
CRM -Graph
@@ -237,7 +237,7 @@
-
+
CRM - Claims Search
@@ -263,28 +263,28 @@
-
-
+
+
-
+ widget="selection"
+ default="context.get('section_id', False)">
+
-
-
+
+
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 170e7f9b4a0..ec4f0d49236 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -8,29 +8,29 @@
Fundraising Categories
crm.case.categ
form
-
- [('object_id.model', '=', 'crm.fundraising')]
- {'object_id':'crm.fundraising'}
+
+ [('object_id.model', '=', 'crm.fundraising')]
+ {'object_id':'crm.fundraising'}
+ id="menu_crm_case_fundraising-act"
+ parent="crm.menu_crm_case_categ" />
-
- Fundraising Stages
- crm.case.stage
- form
-
- [('object_id.model', '=', 'crm.fundraising')]
- {'object_id':'crm.fundraising'}
-
+
+ Fundraising Stages
+ crm.case.stage
+ form
+
+ [('object_id.model', '=', 'crm.fundraising')]
+ {'object_id':'crm.fundraising'}
+
-
+
@@ -39,13 +39,13 @@
crm.case.resource.type
form
- [('object_id.model', '=', 'crm.fundraising')]
- {'object_id':'crm.fundraising'}
+ [('object_id.model', '=', 'crm.fundraising')]
+ {'object_id':'crm.fundraising'}
+ id="menu_crm_fundraising_resource_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -56,31 +56,31 @@
tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -96,20 +96,20 @@
+ domain="[('object_id.model', '=', 'crm.fundraising')]" />
-
-
-
-
-
+
+
+
+
+
@@ -117,13 +117,13 @@
-
+
-
-
-
+
+
+
@@ -131,23 +131,23 @@
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ string="Reset to Draft" states="done,cancel"
+ type="object" icon="gtk-convert" />
@@ -191,10 +191,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.fundraising'}"
+ icon="gtk-undo" type="action" />
@@ -203,9 +203,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.fundraising'}"
+ icon="gtk-go-forward" type="action" />
@@ -256,32 +256,33 @@
separator="1"
help="Funds Related to Current User"
/>
+
+ domain="[('state','in',('draft', 'open'))]"
+ help="Current Funds" />
+ domain="[('state','=','open')]"
+ help="Open Funds" />
+ string="Pending Funds"
+ domain="[('state','=','pending')]"
+ help="Pending Funds" />
+ string="Fund Description" />
-
+ widget="selection">
+
-
+ widget="selection"
+ default="context.get('section_id', False)">
+
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 542b37d69ab..6bb356bacfb 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -8,13 +8,13 @@
Helpdesk Categories
crm.case.categ
form
-
+
[('object_id.model', '=', 'crm.helpdesk')]
- {'object_id':'crm.helpdesk'}
+ {'object_id':'crm.helpdesk'}
+ id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
@@ -31,20 +31,20 @@
-
+
+ on_change="onchange_partner_id(partner_id, email_from)"
+ select="1" />
+ on_change="onchange_partner_address_id(partner_address_id, email_from)"
+ select="2" />
+ states="open,pending"
+ string="Send Reminder" type="object"
+ icon="gtk-go-forward" />
@@ -53,37 +53,37 @@
+ states="open,pending"
+ string="Send Reminder" type="object"
+ icon="gtk-go-forward" />
+ nolabel="1" widget="text_tag" readonly="1" />
+ states="open,draft,pending" string="Close"
+ type="object" icon="gtk-close" />
+ states="draft,pending" string="Open"
+ type="object" icon="gtk-go-forward" />
+ states="draft,open,pending" string="Cancel"
+ type="object" icon="gtk-cancel" />
+ states="draft,open" string="Pending"
+ type="object" icon="gtk-media-pause" />
+ states="open,draft,pending"
+ string="Escalate" type="object"
+ icon="gtk-go-up" />
+ states="done,cancel"
+ string="Reset to Draft" type="object"
+ icon="gtk-convert" />
@@ -126,10 +126,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+ icon="gtk-undo" type="action" />
@@ -138,9 +138,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.helpdesk'}"
+ icon="gtk-go-forward" type="action" />
@@ -162,25 +162,25 @@
-
+
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ states="done,cancel" type="object" icon="gtk-convert" />
@@ -224,24 +224,24 @@
+ domain="[('user_id','=',uid)]"
+ help="My Helpdesk Requests" default="1" />
-
+ default="context.get('section_id', False)" select="1"
+ widget="selection" string="Section">
+
+ domain="[]" context="{'group_by':'partner_id'}" />
+ context="{'group_by':'state'}" />
+ domain="[]" context="{'group_by':'priority'}" />
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 13a9abe2cfd..dd8373538ba 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,7 @@
{'object_id':'crm.lead'}
+ parent="crm.menu_crm_case_stage" />
@@ -22,12 +22,12 @@
crm.case.resource.type
form
- [('object_id.model', '=', 'crm.lead')]
- {'object_id':'crm.lead'}
+ [('object_id.model', '=', 'crm.lead')]
+ {'object_id':'crm.lead'}
+ id="menu_crm_lead_resource_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -50,18 +50,18 @@
attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
+ widget="selection" />
+ readonly="1"
+ domain="[('object_id.model', '=', 'crm.lead')]" />
-
-
+
+
@@ -104,65 +104,31 @@
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ string="Reset to Draft" states="done,cancel"
+ type="object" icon="gtk-convert" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ groups="base.group_multi_company"
+ widget="selection" colspan="2" />
@@ -181,6 +147,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -206,30 +207,30 @@
+ states="open,pending" type="object" icon="gtk-go-back" />
+ states="open,pending" type="object"
+ icon="gtk-go-forward" />
+ invisible="context.get('invisible_section', True)" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ name="%(action_crm_lead2opportunity)d"
+ states="draft,open,pending" icon="gtk-index"
+ type="action" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
@@ -243,11 +244,11 @@
-
-
-
+ date_start="create_date" color="user_id"
+ date_delay="duration">
+
+
+
@@ -273,9 +274,9 @@
+ domain="[('create_date','<', time.strftime('%%Y-%%m-%%d 23:59:59')), \
+ ('create_date','>=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+ help="Todays' Opportunities" />
@@ -299,7 +303,7 @@
+ help="Show Sales Team"/>
@@ -313,7 +317,7 @@
+ domain="[]" context="{'group_by':'create_date'}" />
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4e37620839d..caf4e0bf101 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,8 @@
+ id="menu_crm_case_opportunity-act"
+ parent="crm.menu_crm_case_categ" />
@@ -29,8 +29,8 @@
+ id="menu_crm_opportunity_stage_act"
+ parent="crm.menu_crm_case_stage" />
@@ -44,8 +44,8 @@
+ id="menu_crm_opportunity_resource_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -61,19 +61,19 @@
+ on_change="onchange_stage_id(stage_id)"
+ widget="selection"
+ domain="[('object_id.model', '=', 'crm.opportunity')]" />
+ states="open,pending" type="object"
+ icon="gtk-go-back" string="" />
+ type="object" icon="gtk-go-forward" string="" />
+ string="Schedule Meeting" icon="gtk-redo" />
@@ -84,14 +84,14 @@
-
+
+ on_change="onchange_partner_id(partner_id, email_from)"
+ colspan="2" />
+ string="Contact"
+ on_change="onchange_partner_address_id(partner_address_id, email_from)"
+ colspan="1" />
@@ -101,8 +101,8 @@
+ string="Category" widget="selection"
+ domain="[('object_id.model', '=', 'crm.opportunity')]" />
@@ -112,23 +112,23 @@
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ states="draft,open" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="done,cancel" type="object"
+ icon="gtk-convert" />
@@ -175,10 +175,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.opportunity'}"
+ icon="gtk-undo" type="action" />
@@ -187,9 +187,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.opportunity'}"
+ icon="gtk-go-forward" type="action" />
@@ -211,10 +211,10 @@
+ states="open,pending" type="object" icon="gtk-go-back" />
+ states="open,pending" type="object"
+ icon="gtk-go-forward" />
@@ -222,17 +222,17 @@
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ states="open,draft" type="object"
+ icon="gtk-media-pause" />
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
@@ -260,14 +260,24 @@
search
+
+
+
+
-
@@ -277,44 +287,41 @@
domain="[('user_id','=',uid)]"
help="My Opportunities" default="1"
/>
+
-
-
-
-
+ default="context.get('section_id', False)" select="1"
+ widget="selection">
+
-
+
+ context="{'group_by':'stage_id'}" />
+ domain="[]" context="{'group_by':'categ_id'}" />
+ domain="[]" context="{'group_by':'type_id'}" />
+ context="{'group_by':'partner_id'}" />
+ domain="[]" context="{'group_by':'user_id'}" />
+ domain="[]" context="{'group_by':'create_date'}" />
+ domain="[]" context="{'group_by':'date_deadline'}" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 42692eee9ce..ec773cf78ef 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -14,7 +14,7 @@
+ id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
@@ -23,13 +23,13 @@
crm.case.resource.type
form
- [('object_id.model', '=', 'crm.phonecall')]
- {'object_id':'crm.phonecall'}
+ [('object_id.model', '=', 'crm.phonecall')]
+ {'object_id':'crm.phonecall'}
+ id="menu_crm_phonecall_resource_act"
+ parent="crm.menu_crm_case_resource_type" />
@@ -87,9 +87,9 @@
name="%(phonecall2opportunity_act)d"
icon="gtk-index" type="action"
attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-
-
+
@@ -97,7 +97,7 @@
+ on_change="onchange_partner_id(partner_id, email_from)" />
+ on_change="onchange_partner_address_id(partner_address_id, email_from)" />
@@ -120,19 +120,19 @@
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ states="open" type="object" icon="gtk-undo" />
+ states="open,draft,pending" type="object"
+ icon="gtk-jump-to" />
+ states="done,cancel" type="object"
+ icon="gtk-convert" />
@@ -177,35 +177,30 @@
+ domain="[('user_id','=',uid)]" help="My Phonecalls"
+ default="1" />
-
-
-
+ domain="[('user_id','=',False)]"
+ help="Unassigned Phonecalls" />
-
+ default="context.get('section_id', False)" select="1"
+ widget="selection" string="Section">
+
+ context="{'group_by':'partner_id'}" />
+ domain="[]" context="{'group_by':'user_id'}" />
+ domain="[]" context="{'group_by':'create_date'}" />
+ context="{'group_by':'date'}" />
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a87a67e3e1c..f0a44c56c8c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -141,8 +141,8 @@
+ id="menu_crm_case_section_act"
+ parent="crm.menu_crm_configuration" />
@@ -184,7 +184,7 @@
+ parent="crm.menu_crm_configuration" />
Cases by section
@@ -241,11 +241,11 @@
calendar
-
-
-
+ date_stop="date_deadline" day_length="12"
+ string="Cases">
+
+
+
@@ -267,22 +267,22 @@
+ states="open,draft,pending" string="Close"
+ type="object" icon="gtk-close" />
+ string="Open" type="object" icon="gtk-go-forward" />
+ states="draft,open,pending" string="Cancel"
+ type="object" icon="gtk-cancel" />
+ string="Pending" type="object"
+ icon="gtk-media-pause" />
+ states="open,draft,pending" string="Escalate"
+ type="object" icon="gtk-go-up" />
+ string="Reset to Draft" type="object"
+ icon="gtk-convert" />
@@ -305,24 +305,24 @@
+ on_change="onchange_partner_id(partner_id, email_from)"
+ select="1" />
+ name="partner_address_id"
+ on_change="onchange_partner_address_id(partner_address_id, email_from)"
+ select="2" />
+ select="2" />
+ states="open,pending"
+ string="Send Reminder" type="object"
+ icon="gtk-go-forward" />
+ states="open,pending"
+ string="Send Reminder" type="object"
+ icon="gtk-go-forward" />
@@ -330,27 +330,27 @@
+ states="open,draft,pending"
+ string="Close" type="object"
+ icon="gtk-close" />
+ states="draft,pending" string="Open"
+ type="object" icon="gtk-go-forward" />
+ states="draft,open,pending"
+ string="Cancel" type="object"
+ icon="gtk-cancel" />
+ states="draft,open" string="Pending"
+ type="object" icon="gtk-media-pause" />
+ states="open,draft,pending"
+ string="Escalate" type="object"
+ icon="gtk-go-up" />
+ states="done,cancel"
+ string="Reset to Draft" type="object"
+ icon="gtk-convert" />
@@ -385,10 +385,10 @@
+ string="Reply to Last Email"
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'reply', 'model': 'crm.case'}"
+ icon="gtk-undo" type="action" />
@@ -397,9 +397,9 @@
+ name="%(action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'crm.case'}"
+ icon="gtk-go-forward" type="action" />
@@ -414,28 +414,28 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -453,7 +453,7 @@
crm.case
form
- [('state','<>','done'),('state','<>','cancel'),('state','<>','pending')]
+ [('state','<>','done'),('state','<>','cancel'),('state','<>','pending')]
@@ -503,15 +503,15 @@
+ domain="[('user_id','=',uid)]"
+ help="My Histories" />
+ default="context.get('section_id', False)"
+ select="1" widget="selection"/>
@@ -573,11 +573,11 @@
form
@@ -639,8 +639,8 @@
tree,form
+ id="menu_crm_segmentation-act"
+ parent="crm.menu_crm_configuration" />
view.users.form.crm.modif.inherited1
@@ -650,8 +650,8 @@
+ widget="selection"
+ context="{'user_prefence':True}" />
@@ -671,7 +671,7 @@
-
+
view.res.partner.form.crm.inherited1
res.partner
form
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index e4729b78cad..53d4f1b5476 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -1,53 +1,53 @@
-
+
-
+
-
- crm.lead2partner.view.create
- crm.lead2partner
- form
-
-
-
-
+
+ crm.lead2partner.view.create
+ crm.lead2partner
+ form
+
+
+
+
-
+
-
- crm.lead2partner.view
- crm.lead2partner
- form
-
-
-
-
+
+ crm.lead2partner.view
+ crm.lead2partner
+ form
+
+
+
+
-
+
-
+
-
+
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 3df61afbcab..057d049af9c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -88,7 +88,6 @@
-
@@ -106,7 +105,6 @@
-
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index aef696dc676..49a7d83d239 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -156,32 +156,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 472061e2789..bdd902923eb 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -47,7 +47,7 @@
""",
'author': 'Tiny & Axelor',
'website': 'http://www.openerp.com',
- 'depends': ['hr', 'crm', 'process'],
+ 'depends': ['hr', 'crm', 'process', 'resource'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index efd0e8438a0..6c11cbdf7a6 100755
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -224,6 +224,16 @@ class hr_holidays(osv.osv):
else:
raise osv.except_osv(_('Warning !'),_('Either there is no Employee defined, or no User attached with it.'))
self.write(cr, uid, ids, vals)
+
+ vals= {
+ 'name':record.name,
+ 'date_from':record.date_from,
+ 'date_to':record.date_to,
+ 'calendar_id':record.employee_id.calendar_id.id,
+ 'company_id':record.employee_id.company_id.id,
+ 'resource_id':record.employee_id.resource_id.id
+ }
+ self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
return True
def holidays_confirm(self, cr, uid, ids, *args):
@@ -246,17 +256,7 @@ class hr_holidays(osv.osv):
'number_of_days': nb,
'user_id': user_id
})
- #vals= {
- # 'name':record.name,
- # 'date_from':record.date_from,
- # 'date_to':record.date_to,
- # 'calendar_id':record.employee_id.calendar_id.id,
- # 'company_id':record.employee_id.company_id.id,
- # 'resource_id':record.employee_id.resource_id.id
- # }
- #self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
-
- return True
+ return True
def holidays_refuse(self, cr, uid, ids, *args):
vals = {
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
index f5a84a5b649..bdc5664abfb 100644
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -67,11 +67,7 @@ class wizard_report(wizard.interface):
states={
'init':{
'actions':[_check],
-<<<<<<< TREE
- 'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('checkemp', 'Print', 'gtk-ok')]}
-=======
'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel','gtk-cancel'), ('checkemp', 'Print', 'gtk-print')]}
->>>>>>> MERGE-SOURCE
},
'checkemp': {
'actions': [],
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 9144d3b0ca3..d8f318d148b 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -7,7 +7,7 @@
hr.analytic.timesheet
tree
-
+
@@ -50,12 +50,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -83,11 +83,6 @@
tree,form
-
hr.timesheet.employee.extd_form
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 79086640262..c895250284e 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -68,16 +68,16 @@
search
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -124,8 +124,8 @@
search
-
-
+
+
@@ -207,17 +207,17 @@
search
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -281,17 +281,17 @@
search
@@ -323,15 +323,15 @@
tree
-
-
-
-
+
+
+
+
-
+
-
+
Random Timesheet
report.random.timesheet
form
@@ -347,21 +347,21 @@
tree
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
ir.actions.act_window
Timesheet Lines
random.timesheet.lines
@@ -376,7 +376,7 @@
name="Time Tracking"
parent="base.menu_main_pm" sequence="3"/>
-
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 21f4775386a..580fc64638f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -1,7 +1,6 @@
-
hr.timesheet.sheet.tree
hr_timesheet_sheet.sheet
@@ -10,10 +9,10 @@
-
+
@@ -182,14 +181,13 @@
-
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
@@ -308,17 +306,6 @@
-
- hr.attendance.tree
- hr.attendance
- tree
-
-
-
-
-
-
-
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a238658302c..eb80bb512f6 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -198,7 +198,6 @@ class mrp_bom(osv.osv):
'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
'revision_type': fields.selection([('numeric','numeric indices'),('alpha','alphabetical indices')], 'Index type'),
- 'child_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
'child_complete_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
'company_id': fields.many2one('res.company','Company',required=True),
'multi_level_bom': fields.boolean('Multi-level BoM'),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 15729a8c985..3614ebf67bb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -242,21 +242,21 @@
@@ -291,7 +288,7 @@
child_complete_ids
-
+
@@ -461,8 +458,8 @@
+ name="%(mrp.action_change_production_qty)d"
+ string="Change Qty" states="ready,confirmed" />
@@ -484,45 +481,45 @@
mode="tree,form" height="275" domain="[('state','<>', ('done', 'cancel'))]">
-
-
+
+
-
-
+
+
-
-
-
-
+ widget="one2many_list" mode="tree,form" height="275">
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -540,38 +537,38 @@
mode="tree,form" height="275" domain="[('state','<>', ('done', 'cancel'))]">
-
-
+
+
-
-
+
+
-
-
-
-
+ widget="one2many_list" mode="tree,form" height="275">
+
+
+
+
-
+
-
-
-
-
+
+
+
@@ -1039,12 +1036,12 @@
res_model="mrp.bom"
src_model="product.product"/>
-
-
+
+
-
-
-
+
+
+
diff --git a/addons/product/product.py b/addons/product/product.py
index d51d0733e81..72fcfa5afd2 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -444,7 +444,7 @@ class product_product(osv.osv):
'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock'),
'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming'),
'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing'),
- 'price': fields.function(_product_price, method=True, type='float', string='Customer Price', digits_compute=dp.get_precision('Sale Price')),
+ 'price': fields.function(_product_price, method=True, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
'lst_price' : fields.function(_product_lst_price, method=True, type='float', string='List Price', digits_compute=dp.get_precision('Sale Price')),
'code': fields.function(_product_code, method=True, type='char', string='Code'),
'partner_ref' : fields.function(_product_partner_ref, method=True, type='char', string='Customer ref'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b910515c950..e7191045118 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -110,7 +110,7 @@
-
+
@@ -121,7 +121,6 @@
-
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 20d65aec356..5c28d106c22 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -41,11 +41,11 @@ class report_project_task_user(osv.osv):
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
'state': fields.selection([('draft', 'Draft'),
- ('open', 'In Progress'),
- ('pending', 'Pending'),
- ('cancelled', 'Cancelled'),
- ('done', 'Done')],
- 'State', readonly=True),
+ ('open', 'In Progress'),
+ ('pending', 'Pending'),
+ ('cancelled', 'Cancelled'),
+ ('done', 'Done')],
+ 'State', readonly=True),
}
_order = 'name desc, project_id'
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index dd271ee97da..deb89d3c747 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -1,7 +1,7 @@
-
+
report.project.task.user.tree
@@ -31,30 +31,29 @@
report.project.task.user
search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project_issue/project_feature_menu.xml b/addons/project_issue/project_feature_menu.xml
index caf533efb7d..1c757a73909 100644
--- a/addons/project_issue/project_feature_menu.xml
+++ b/addons/project_issue/project_feature_menu.xml
@@ -3,36 +3,5 @@
- ######################## Feature Request (menu) ###########################
-
-
- Feature Requests
- project.issue
- form
- tree,calendar
-
-
-
-
-
-
- tree
-
-
-
-
-
- calendar
-
-
-
-
-
- form
-
-
-
-
-
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 03ecfdcc778..8e3c891657b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -91,8 +91,7 @@ class project_issue(osv.osv):
'assigned_to' : fields.many2one('res.users', 'Assigned to'),
'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
- domain="[('partner_id', '=', partner_id)]",
- required=True),
+ domain="[('partner_id', '=', partner_id)]"),
}
def _get_project(self, cr, uid, context):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f09643c2590..579a426bdff 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -27,7 +27,7 @@
form
- # ------------------------------------------------------
+ # ------------------------------------------------------
# Project Phase
# ------------------------------------------------------
@@ -46,38 +46,43 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
@@ -91,46 +96,46 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -194,15 +199,15 @@
-
-
-
-
-
+
+
+
+
+
+
-
-
+
@@ -223,51 +228,51 @@
- # ------------------------------------------------------
+ # ------------------------------------------------------
# Project
# ------------------------------------------------------
- phase.project.form1
- project.project
- form
-
-
-
-
-
+ phase.project.form1
+ project.project
+ form
+
+
+
+
+
-
-
+
+
- # ------------------------------------------------------
+ # ------------------------------------------------------
# Project Task
# ------------------------------------------------------
-
- project.phase.task.form1
- project.task
- form
-
-
-
-
-
+
+ project.phase.task.form1
+ project.task
+ form
+
+
+
+
+
-
-
+
+
-
- project.phase.task.form2
- project.task
- form
-
-
-
-
-
-
-
+
+ project.phase.task.form2
+ project.task
+ form
+
+
+
+
+
+
+
- # ------------------------------------------------------
+ # ------------------------------------------------------
# Menu Items
# ------------------------------------------------------
-
+
-
-
-
+
+
+
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index f08b03600f8..4fbcdd1c284 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -2,27 +2,26 @@
-
+
-
+
resource.resource.search
resource.resource
search
-
-
+
-
-
-
-
-
+
+
+
+
-
+
+
@@ -37,10 +36,9 @@
-
-
-
-
+
+
+
@@ -71,7 +69,7 @@
resource.calendar
form
-
-
+
resource.calendar.leaves.calendar
resource.calendar.leaves
calendar
@@ -143,20 +141,20 @@
+ id="resource_calendar_closing_days"
+ name="Closing Days"
+ res_model="resource.calendar.leaves"
+ src_model="resource.calendar"
+ view_mode="calendar,tree,form"
+ domain="[('calendar_id','=',active_id), ('resource_id','=',False)]"/>
+ id="resource_calendar_resources_leaves"
+ name="Resources Leaves"
+ res_model="resource.calendar.leaves"
+ src_model="resource.calendar"
+ view_mode="calendar,tree,form"
+ domain="[('calendar_id','=',active_id), ('resource_id','!=',False)]"/>
resource.resource.form
@@ -166,7 +164,7 @@
Who are you?
@@ -94,11 +94,11 @@
-
+
- 1
+ 1
Where are you located?
multiple_choice_multiple_ans
@@ -135,14 +135,14 @@
-
+
at least
This question requires an answer.
- 1
+ 1
When did you become an OpenERP official partner?
multiple_choice_only_one_ans
@@ -180,11 +180,11 @@
-
+
- 1
+ 1
What kind of solutions do you sell to your customers?
multiple_choice_multiple_ans
@@ -218,7 +218,7 @@
- 1
+ 1
What do you think about the partnership contract?
multiple_choice_only_one_ans
@@ -250,11 +250,11 @@
-
+
- 1
+ 1
When do you propose a maintenance contract to your customers?
multiple_choice_only_one_ans
@@ -283,11 +283,11 @@
-
+
- 1
+ 1
Which maintenance contract do you sell to your customers.
multiple_choice_only_one_ans
@@ -313,7 +313,7 @@
-
+
@@ -323,7 +323,7 @@
- 1
+ 1
Give your opinion about Launchpad reporting :
matrix_of_choices_only_one_ans
@@ -372,8 +372,8 @@
1
1
-
- 1
+
+ 1
Leads
matrix_of_choices_only_one_ans
@@ -423,7 +423,7 @@
- 1
+ 1
How is Tiny's communication with partners about...
matrix_of_choices_only_one_ans
@@ -473,14 +473,14 @@
1
- 1
+ 1
at least
This question requires an answer.
- 1
+ 1
In your opinion, how could Tiny better communicate with partners and on which subjects?
comment
@@ -489,16 +489,16 @@
-
+
- Odoo Feedback
-
- 20
-
- open
- 1
- 1
-
+ Odoo Feedback
+
+ 20
+
+ open
+ 1
+ 1
+
Who are you?
@@ -507,7 +507,7 @@
- 1
+ 1
What is your company's name?
single_textbox
@@ -517,7 +517,7 @@
- 1
+ 1
What is your company's sector?
multiple_choice_multiple_ans
@@ -645,7 +645,7 @@
- 1
+ 1
Which activities do you plan to manage with Odoo ?
multiple_choice_multiple_ans
@@ -707,7 +707,7 @@
- 1
+ 1
How did you discover Odoo ?
multiple_choice_multiple_ans
@@ -763,7 +763,7 @@
- 1
+ 1
Why did you subscribe to Odoo?
multiple_choice_only_one_ans
@@ -802,7 +802,7 @@
- 1
+ 1
How much time did you spend to configure the application?
matrix_of_choices_only_one_ans
@@ -871,7 +871,7 @@
- 1
+ 1
Do you plan to continue using Odoo?
multiple_choice_only_one_ans
@@ -894,7 +894,7 @@
-
+
@@ -903,7 +903,7 @@
- 1
+ 1
Which interface would you prefer to use?
multiple_choice_only_one_ans
@@ -929,11 +929,11 @@
-
+
- 1
+ 1
Give your opinion :
matrix_of_choices_only_one_ans
@@ -1003,7 +1003,7 @@
- 1
+ 1
What do you think about ...
matrix_of_choices_only_one_ans
@@ -1073,14 +1073,14 @@
1
- 1
+ 1
at least
This question requires an answer.
- 1
+ 1
In your opinion, which modules are missing in Odoo? Give examples :
single_textbox
@@ -1097,7 +1097,7 @@
- 1
+ 1
How often would you prefer to receive your prepaid bill?
multiple_choice_only_one_ans
@@ -1123,11 +1123,11 @@
-
+
- 1
+ 1
Do you plan to use the document management system?
multiple_choice_only_one_ans
@@ -1150,11 +1150,11 @@
-
+
- 1
+ 1
How satisfied are you with Odoo's support services :
matrix_of_choices_only_one_ans
@@ -1210,7 +1210,7 @@
- 1
+ 1
Give your opinion about Odoo's
matrix_of_choices_only_one_ans
@@ -1272,7 +1272,7 @@
-
-
-
-
- 20
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 20
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
+
+
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
-
-
+
+
+
+
+
+
1
1
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- 1
-
-
-
-
-
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Most Important
-
-
-
-
-
-
-
- Very Important
-
-
-
-
-
-
-
- Important
-
-
-
-
-
-
-
- Less Important
-
-
-
-
-
-
-
- Not Important
-
-
-
-
-
-
-
- Excellent
-
-
-
-
-
-
-
- Above Average
-
-
-
-
-
-
-
- Average
-
-
-
-
-
-
-
- Below Average
-
-
-
-
-
-
-
- Poor
-
-
-
-
-
-
-
- N/A
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2010-03-03 14:25:03
-
-
-
-
-
-
- 2010-03-03 14:29:36
-
-
-
-
-
-
- 2010-03-03 14:25:03.603599
- done
-
-
- link
-
-
-
-
- 2010-03-03 14:29:36.247905
- done
-
-
- link
-
-
-
-
- 2010-03-03 14:25:03.631622
- done
-
-
-
-
-
-
- 2010-03-03 14:25:03.653849
- done
-
-
-
-
-
-
- 2010-03-03 14:25:03.671836
- done
-
-
-
-
-
-
- 2010-03-03 14:25:03.689999
- done
-
-
-
-
-
-
- 2010-03-03 14:25:03.706175
- done
-
- Tiny ERP
-
-
-
-
-
- 2010-03-03 14:25:29.087116
- done
-
-
-
-
-
-
- 2010-03-03 14:25:29.107571
- done
-
-
-
-
-
-
- 2010-03-03 14:25:29.126023
- done
-
-
-
-
-
-
- 2010-03-03 14:26:14.844451
- done
-
-
-
-
-
-
- 2010-03-03 14:26:14.872224
- done
-
-
-
-
-
-
- 2010-03-03 14:26:14.897764
- skip
-
-
-
-
-
-
- 2010-03-03 14:26:14.918989
- done
-
-
-
-
-
-
- 2010-03-03 14:29:36.27459
- done
-
-
-
-
-
-
- 2010-03-03 14:29:36.301461
- done
-
-
-
-
-
-
- 2010-03-03 14:29:36.33203
- done
-
- Tiny ERP
-
-
-
-
-
- 2010-03-03 14:29:36.35911
- done
-
-
-
-
-
-
- 2010-03-03 14:30:11.376172
- done
-
-
-
-
-
-
- 2010-03-03 14:30:11.397675
- done
-
-
-
-
-
-
- 2010-03-03 14:30:11.414119
- done
-
-
-
-
-
-
- 2010-03-03 14:31:18.637519
- done
-
-
-
-
-
-
- 2010-03-03 14:31:18.653091
- done
-
- survey
-
-
-
-
-
- 2010-03-03 14:31:18.669619
- done
-
-
-
-
-
-
- 2010-03-03 14:31:18.691933
- done
-
-
-
-
-
-
- 2010-03-03 14:32:08.47899
- done
-
-
-
-
-
-
- 2010-03-03 14:32:08.501274
- done
-
-
-
-
-
-
- 2010-03-03 14:32:08.523878
- skip
-
-
-
-
-
-
- 2010-03-03 14:32:08.538988
- done
-
-
-
-
-
-
- 2010-03-03 14:32:08.555196
- done
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Most Important
+
+
+
+
+
+
+
+ Very Important
+
+
+
+
+
+
+
+ Important
+
+
+
+
+
+
+
+ Less Important
+
+
+
+
+
+
+
+ Not Important
+
+
+
+
+
+
+
+ Excellent
+
+
+
+
+
+
+
+ Above Average
+
+
+
+
+
+
+
+ Average
+
+
+
+
+
+
+
+ Below Average
+
+
+
+
+
+
+
+ Poor
+
+
+
+
+
+
+
+ N/A
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2010-03-03 14:25:03
+
+
+
+
+
+
+ 2010-03-03 14:29:36
+
+
+
+
+
+
+ 2010-03-03 14:25:03.603599
+ done
+
+
+ link
+
+
+
+
+ 2010-03-03 14:29:36.247905
+ done
+
+
+ link
+
+
+
+
+ 2010-03-03 14:25:03.631622
+ done
+
+
+
+
+
+
+ 2010-03-03 14:25:03.653849
+ done
+
+
+
+
+
+
+ 2010-03-03 14:25:03.671836
+ done
+
+
+
+
+
+
+ 2010-03-03 14:25:03.689999
+ done
+
+
+
+
+
+
+ 2010-03-03 14:25:03.706175
+ done
+
+ Tiny ERP
+
+
+
+
+
+ 2010-03-03 14:25:29.087116
+ done
+
+
+
+
+
+
+ 2010-03-03 14:25:29.107571
+ done
+
+
+
+
+
+
+ 2010-03-03 14:25:29.126023
+ done
+
+
+
+
+
+
+ 2010-03-03 14:26:14.844451
+ done
+
+
+
+
+
+
+ 2010-03-03 14:26:14.872224
+ done
+
+
+
+
+
+
+ 2010-03-03 14:26:14.897764
+ skip
+
+
+
+
+
+
+ 2010-03-03 14:26:14.918989
+ done
+
+
+
+
+
+
+ 2010-03-03 14:29:36.27459
+ done
+
+
+
+
+
+
+ 2010-03-03 14:29:36.301461
+ done
+
+
+
+
+
+
+ 2010-03-03 14:29:36.33203
+ done
+
+ Tiny ERP
+
+
+
+
+
+ 2010-03-03 14:29:36.35911
+ done
+
+
+
+
+
+
+ 2010-03-03 14:30:11.376172
+ done
+
+
+
+
+
+
+ 2010-03-03 14:30:11.397675
+ done
+
+
+
+
+
+
+ 2010-03-03 14:30:11.414119
+ done
+
+
+
+
+
+
+ 2010-03-03 14:31:18.637519
+ done
+
+
+
+
+
+
+ 2010-03-03 14:31:18.653091
+ done
+
+ survey
+
+
+
+
+
+ 2010-03-03 14:31:18.669619
+ done
+
+
+
+
+
+
+ 2010-03-03 14:31:18.691933
+ done
+
+
+
+
+
+
+ 2010-03-03 14:32:08.47899
+ done
+
+
+
+
+
+
+ 2010-03-03 14:32:08.501274
+ done
+
+
+
+
+
+
+ 2010-03-03 14:32:08.523878
+ skip
+
+
+
+
+
+
+ 2010-03-03 14:32:08.538988
+ done
+
+
+
+
+
+
+ 2010-03-03 14:32:08.555196
+ done
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+