pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source 
bzr revid: sbh@tinyerp.com-20100304082852-4eke5hf26cvxe7t9
This commit is contained in:
sbh (Open ERP)
2010-03-04 13:58:52 +05:30
parent 48afffbd85 a6226fd53f
commit f7ae764b8c
12 changed files with 255 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_lead_view.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<form string="Leads Form">
<group colspan="4" col="6">
<field name="partner_name" required="1"/>
<field name="priority" required="1"/>
<field name="priority"/>
<field name="date_deadline"/>
<newline/>
addons/crm/crm_opportunity.py
+1 -1
View File
@@ -26,7 +26,7 @@ AVAILABLE_STATES = [
('draft','New'),
('open','Open'),
('cancel', 'Lost'),
('done', 'Won'),
('done', 'Converted'),
('pending','Pending')
]
addons/crm/crm_opportunity_view.xml
+2
View File
@@ -149,6 +149,8 @@
<field name="name" string="Opportunity"/>
<field name="partner_id"/>
<field name="stage_id"/>
<field name="categ_id" invisible="1"/>
<field name="type_id" invisible="1"/>
<button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
<button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
<field name="planned_revenue" sum="Total of Planned Revenue"/>
addons/hr_evaluation/hr_evaluation.py
+4 -4
View File
@@ -129,15 +129,15 @@ class hr_evaluation(osv.osv):
'evaluation_id',
'survey_id',
'Appraisal Forms'),
'plan_id': fields.many2one('hr_evaluation.plan', 'Plan'),
'phase_id': fields.many2one('hr_evaluation.plan.phase', 'Phase'),
'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
'state': fields.selection([
('draft','Draft'),
('wait','Plan In Progress'),
('progress','Final Validation'),
('done','Done'),
('cancel','Cancelled'),
], 'State', required=True,readonly=True)
], 'State', required=True,readonly=True),
'date_close': fields.date('Ending Date')
}
_defaults = {
'date' : lambda *a: time.strftime('%Y-%m-%d'),
@@ -153,7 +153,7 @@ class hr_evaluation(osv.osv):
return True
def button_done(self,cr, uid, ids, context):
self.write(cr,uid,ids,{'state':'done'})
self.write(cr,uid,ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')})
return True
def button_cancel(self,cr, uid, ids, context):
addons/hr_evaluation/hr_evaluation_view.xml
+208 -198
View File
@@ -1,249 +1,259 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record model="ir.ui.view" id="view_hr_evaluation_plan_form">
<field name="name">hr_evaluation.plan.form</field>
<field name="model">hr_evaluation.plan</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Evaluation Plan">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="company_id" select="1" widget="selection"/>
<field name="active"/>
<field name="month_first"/>
<field name="month_next"/>
<label string="(months)" align="0.0"/>
</group>
<notebook colspan="4">
<page string="Evaluation Phases">
<data>
<record model="ir.ui.view" id="view_hr_evaluation_plan_form">
<field name="name">hr_evaluation.plan.form</field>
<field name="model">hr_evaluation.plan</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Evaluation Plan">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="company_id" select="1" widget="selection"/>
<field name="active"/>
<field name="month_first"/>
<field name="month_next"/>
<label string="(months)" align="0.0"/>
</group>
<notebook colspan="4">
<page string="Evaluation Phases">
<field name="phase_ids" nolabel="1" colspan="4"/>
</page>
</page>
</notebook>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_plan_tree">
<field name="name">hr_evaluation.plan.form</field>
<field name="model">hr_evaluation.plan</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation Plan">
<field name="name"/>
<field name="month_first"/>
<field name="month_next"/>
<field name="company_id"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="open_view_hr_evaluation_plan_tree">
<field name="res_model">hr_evaluation.plan</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/>
<!--menuitem name="HR Responsible" parent="menu_eval_hr" id="menu_resp_hr"/-->
<menuitem
name="Evaluation Plan" parent="menu_eval_hr"
id="menu_open_view_hr_evaluation_plan_tree"
action="open_view_hr_evaluation_plan_tree"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_plan_tree">
<field name="name">hr_evaluation.plan.form</field>
<field name="model">hr_evaluation.plan</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation Plan">
<field name="name"/>
<field name="month_first"/>
<field name="month_next"/>
<field name="company_id"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="open_view_hr_evaluation_plan_tree">
<field name="res_model">hr_evaluation.plan</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/>
<!--menuitem name="HR Responsible" parent="menu_eval_hr" id="menu_resp_hr"/-->
<menuitem
name="Evaluation Plan" parent="menu_eval_hr"
id="menu_open_view_hr_evaluation_plan_tree"
action="open_view_hr_evaluation_plan_tree"/>
<record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
<field name="name">hr_evaluation.plan.phase.form</field>
<field name="model">hr_evaluation.plan.phase</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Evaluation Plan Phase">
<field name="plan_id" invisible="1"/>
<group col="6" colspan="4">
<field name="name"/>
<field name="wait"/>
<field name="sequence"/>
</group>
<group col="4" colspan="4">
<separator string="Action to Perform" colspan="4"/>
<field name="action"/>
<field name="survey_id" widget="selection"/>
</group>
<group col="4" colspan="4">
<group col="4" colspan="2">
<separator string="Send to Managers" colspan="2"/>
<newline/>
<field name="send_answer_manager"/>
<newline/>
<field name="send_anonymous_manager"/>
</group>
<group col="4" colspan="2">
<separator string="Send to Employees" colspan="2"/>
<newline/>
<field name="send_answer_employee"/>
<newline/>
<field name="send_anonymous_employee"/>
</group>
</group>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_plan_phase_tree">
<field name="name">hr_evaluation.plan.phase.form</field>
<field name="model">hr_evaluation.plan.phase</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation Plan Phase" editable="bottom" >
<field name="sequence"/>
<field name="name"/>
<field name="action"/>
<field name="survey_id" widget="selection"/>
<field name="wait"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
<field name="name">hr_evaluation.plan.phase.form</field>
<field name="model">hr_evaluation.plan.phase</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Evaluation Plan Phase">
<field name="plan_id" invisible="1"/>
<group col="6" colspan="4">
<field name="name"/>
<field name="wait"/>
<field name="sequence"/>
</group>
<group col="4" colspan="4">
<separator string="Action to Perform" colspan="4"/>
<field name="action"/>
<field name="survey_id" widget="selection"/>
</group>
<group col="4" colspan="4">
<group col="4" colspan="2">
<separator string="Send to Managers" colspan="2"/>
<newline/>
<field name="send_answer_manager"/>
<newline/>
<field name="send_anonymous_manager"/>
</group>
<group col="4" colspan="2">
<separator string="Send to Employees" colspan="2"/>
<newline/>
<field name="send_answer_employee"/>
<newline/>
<field name="send_anonymous_employee"/>
</group>
</group>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_plan_phase_tree">
<field name="name">hr_evaluation.plan.phase.form</field>
<field name="model">hr_evaluation.plan.phase</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation Plan Phase" editable="bottom" >
<field name="sequence"/>
<field name="name"/>
<field name="action"/>
<field name="survey_id" widget="selection"/>
<field name="wait"/>
</tree>
</field>
</record>
<record id="hr_hr_employee_view_form" model="ir.ui.view">
<record id="hr_hr_employee_view_form" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Evaluation">
<field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id)"/>
<field name="evaluation_date"/>
<field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id)"/>
<field name="evaluation_date"/>
</page>
</notebook>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_form">
<field name="name">hr_evaluation.evaluation.form</field>
<field name="model">hr_evaluation.evaluation</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Evaluation">
<group col="4" colspan="4">
<field name="date" select="1"/>
<field name="rating"/>
<field name="employee_id" select="1"/>
<field name="plan_id"/>
<field name="phase_id" domain="[('plan_id', '=', plan_id)]"/>
</group>
<notebook colspan="4">
<page string="Appraisal">
<field name="survey_request_ids" context="{'phase_id': phase_id}" nolabel="1" colspan="4"/>
</page>
<page string="Action Plan">
<field name="note_action" colspan="4" nolabel="1"/>
</page>
<page string="Summary">
<field name="note_summary" colspan="4" nolabel="1"/>
</page>
</notebook>
<newline/>
<group col="6" colspan="4">
<field name="state"/>
<button name="button_plan_in_progress"
string="Plan In Progress"
<field name="name">hr_evaluation.evaluation.form</field>
<field name="model">hr_evaluation.evaluation</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Evaluation">
<group col="4" colspan="3">
<separator string="Evaluation Data" colspan="4"/>
<field name="employee_id"/>
<field name="plan_id"/>
<field name="date"/>
</group>
<group col="2" colspan="1">
<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">
<field name="survey_request_ids" context="{'phase_id': phase_id}" nolabel="1" colspan="4" widget="one2many"/>
</page>
<page string="Internal Notes">
<field name="note_action" colspan="4" nolabel="1"
groups="hr.group_hr_manager"/>
</page>
<page string="Public Notes">
<field name="note_summary" colspan="4" nolabel="1"/>
</page>
</notebook>
<newline/>
<group col="6" colspan="4">
<field name="state"/>
<button name="button_plan_in_progress"
string="Plan In Progress"
states="draft"
type="object"/>
<button name="button_final_validation"
string="Final Validation"
string="Final Validation"
states="wait"
type="object"/>
<button name="button_done"
string="Done"
string="Done"
states="progress"
type="object"/>
<button name="button_cancel"
string="Cancel"
string="Cancel"
states="draft,wait,progress"
type="object"/>
</group>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_tree">
<field name="name">hr_evaluation.evaluation.form</field>
<field name="model">hr_evaluation.evaluation</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation">
<field name="date"/>
<field name="employee_id"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="open_view_hr_evaluation_tree">
<field name="res_model">hr_evaluation.evaluation</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
name="Evaluation" parent="menu_eval_hr"
id="menu_open_view_hr_evaluation_tree"
action="open_view_hr_evaluation_tree"/>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_tree">
<field name="name">hr_evaluation.evaluation.tree</field>
<field name="model">hr_evaluation.evaluation</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation">
<field name="create_date"/>
<field name="employee_id"/>
<!-- field name="progress"/ -->
<field name="plan_id"/>
<field name="rating"/>
<field name="date"/>
<field name="state"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="open_view_hr_evaluation_tree">
<field name="res_model">hr_evaluation.evaluation</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
name="Evaluation" parent="menu_eval_hr"
id="menu_open_view_hr_evaluation_tree"
action="open_view_hr_evaluation_tree"/>
<record model="ir.ui.view" id="view_hr_evaluation_interview_form">
<field name="name">hr_evaluation.interview.form</field>
<field name="model">hr.evaluation.interview</field>
<field name="type">form</field>
<field name="arch" type="xml">
<record model="ir.ui.view" id="view_hr_evaluation_interview_form">
<field name="name">hr_evaluation.interview.form</field>
<field name="model">hr.evaluation.interview</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Survey Request">
<group col="4" colspan="4">
<field name="survey_id" widget="selection" colspan="3"/>
<group colspan="1">
<button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': response, 'active' : response, '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"
icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : response,}" attrs="{'readonly':[('response','!=',True),('survey_id','!=',True)]}" />
</group>
</group>
<group col="4" colspan="4">
<field name="date_deadline"/>
<field name="response" readonly="1"/>
<field name="user_to_review_id"/>
<field name="user_id"/>
</group>
<group col="4" colspan="4">
<field name="survey_id" widget="selection" colspan="3"/>
<group colspan="1">
<button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': response, 'active' : response, '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"
icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : response,}" attrs="{'readonly':[('response','!=',True),('survey_id','!=',True)]}" />
</group>
</group>
<group col="4" colspan="4">
<field name="date_deadline"/>
<field name="response" readonly="1"/>
<field name="user_to_review_id"/>
<field name="user_id"/>
</group>
<newline/>
<separator string="State" colspan="4"/>
<group colspan="4" col="5">
<field name="state"/>
<field name="state"/>
<button name="survey_req_waiting_answer" string="Set to Watting Answer" states="cancel,done" type="object" icon="gtk-new"/>
<button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
<button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_interview_tree">
<field name="name">hr_evaluation.interview.tree</field>
<field name="model">hr.evaluation.interview</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation Plan Phase">
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_interview_tree">
<field name="name">hr_evaluation.interview.tree</field>
<field name="model">hr.evaluation.interview</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation Plan Phase">
<field name="date_deadline"/>
<field name="survey_id" widget="selection"/>
<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, 'active' : response, '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="waiting_answer,done,cancel"
icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : response,}" attrs="{'readonly':[('response','!=',True),('survey_id','!=',True)]}" />
<field name="state" />
</tree>
</field>
</record>
<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, 'active' : response, '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="waiting_answer,done,cancel"
icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : response,}" attrs="{'readonly':[('response','!=',True),('survey_id','!=',True)]}" />
<field name="state" />
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_hr_evaluation_interview_tree">
<field name="res_model">hr.evaluation.interview</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<record model="ir.actions.act_window" id="action_hr_evaluation_interview_tree">
<field name="res_model">hr.evaluation.interview</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
name="Intreview Requests" parent="menu_eval_hr"
id="menu_open_hr_evaluation_interview_requests"
action="action_hr_evaluation_interview_tree"/>
<menuitem
name="Intreview Requests" parent="menu_eval_hr"
id="menu_open_hr_evaluation_interview_requests"
action="action_hr_evaluation_interview_tree"/>
</data>
</data>
</openerp>
addons/sale/report_sale_view.xml
+2 -85
View File
@@ -1,89 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_sale_order_report_tree" model="ir.ui.view">
<field name="name">report.sale.order.tree</field>
<field name="model">sale.order</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sale Orders">
<field name="name"/>
<field name="partner_id"/>
<field name="date_order"/>
<field name="invoiced_rate" widget="progressbar"/>
<field name="picked_rate" widget="progressbar"/>
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<field name="amount_total" sum="Total Amount"/>
<field name="state"/>
</tree>
</field>
</record>
<record id="action_sale_order_report_all" model="ir.actions.act_window">
<field name="name">Sale Orders By Partner </field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="context">{'report':True}</field>
<field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
<field name="search_view_id" ref="sale.view_sales_order_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_sale_order_01">
<field name="sequence" eval="2"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="sale.view_sale_order_report_tree"/>
<field name="act_window_id" ref="action_sale_order_report_all"/>
</record>
<record model="ir.actions.act_window.view" id="action_sale_order_02">
<field name="sequence" eval="1"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="sale.view_sale_order_graph"/>
<field name="act_window_id" ref="action_sale_order_report_all"/>
</record>
<!-- Sale Orders by Product-->
<record id="view_order_report_tree" model="ir.ui.view">
<field name="name">report.sale.order.line.tree</field>
<field name="model">sale.order.line</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sale Orders by Product">
<field name="order_id"/>
<field name="product_uom_qty" />
<field name="product_uos_qty"/>
<field name="product_uos"/>
<field name="product_id"/>
<field name="price_unit" />
<field name="price_net"/>
<field name="price_subtotal" sum="Total"/>
<field name="state"/>
</tree>
</field>
</record>
<record id="action_order_report_tree_all" model="ir.actions.act_window">
<field name="name">Sale Orders by Product</field>
<field name="res_model">sale.order.line</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="context">{'report':True}</field>
<field name="domain">[('product_uom_qty','!=','0')]</field>
<field name="search_view_id" ref="sale.view_sales_order_line_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_order_product01">
<field name="sequence" eval="2"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_order_report_tree"/>
<field name="act_window_id" ref="action_order_report_tree_all"/>
</record>
<record model="ir.actions.act_window.view" id="action_order_product02">
<field name="sequence" eval="1"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="sale.view_order_line_graph"/>
<field name="act_window_id" ref="action_order_report_tree_all"/>
</record>
</data>
</openerp>
</data>
</openerp>
addons/sale/sale.py
+8 -7
View File
@@ -197,7 +197,8 @@ class sale_order(osv.osv):
('cancel', 'Cancelled')
], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'create_date': fields.date('Creation Date', readonly=True),
'date_confirm': fields.date('Confirmation Date', readonly=True),
'user_id': fields.many2one('res.users', 'Salesman', 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.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}),
@@ -361,10 +362,10 @@ class sale_order(osv.osv):
def button_dummy(self, cr, uid, ids, context={}):
return True
#FIXME: the method should return the list of invoices created (invoice_ids)
# and not the id of the last invoice created (res). The problem is that we
# cannot change it directly since the method is called by the sale order
# workflow and I suppose it expects a single id...
#FIXME: the method should return the list of invoices created (invoice_ids)
# and not the id of the last invoice created (res). The problem is that we
# cannot change it directly since the method is called by the sale order
# workflow and I suppose it expects a single id...
def _inv_get(self, cr, uid, order, context={}):
return {}
@@ -522,9 +523,9 @@ class sale_order(osv.osv):
'partner_type': 'customer', 'probability': 1.0,\
'planned_revenue': o.amount_untaxed})
if (o.order_policy == 'manual'):
self.write(cr, uid, [o.id], {'state': 'manual'})
self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime('%Y-%m-%d')})
else:
self.write(cr, uid, [o.id], {'state': 'progress'})
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
def procurement_lines_get(self, cr, uid, ids, *args):
addons/sale/sale_report.py
+2 -1
View File
@@ -35,13 +35,13 @@ class sale_report(osv.osv):
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'product_uom':fields.many2one('product.uom', 'UoM', readonly=True),
'product_qty':fields.float('Qty', readonly=True),
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
'price_total':fields.float('Total Price', readonly=True),
'delay':fields.float('Avg Closing Days', digits=(16,2), readonly=True),
'price_average':fields.float('Average Price', readonly=True),
'nbr':fields.integer('# of Lines', readonly=True),
'state': fields.selection([
@@ -71,6 +71,7 @@ class sale_report(osv.osv):
s.user_id as user_id,
s.shop_id as shop_id,
s.company_id as company_id,
extract(epoch from avg(s.date_confirm-s.create_date))/(24*60*60)::decimal(16,2) as delay,
sum(l.product_uom_qty*l.price_unit) as price_total,
(sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
count(*) as nbr,
addons/sale/sale_report_view.xml
+1
View File
@@ -16,6 +16,7 @@
<field name="partner_id"/>
<field name="product_id"/>
<field name="product_qty"/>
<field name="delay" avg="Days to Close"/>
<field name="nbr" sum="# of Lines"/>
<field name="price_average" avg="Average Price"/>
<field name="price_total" sum="Total Price"/>
addons/sale/sale_view.xml
+24 -10
View File
@@ -204,15 +204,29 @@
</group>
</page>
<page string="Other data">
<field groups="base.group_extended" name="incoterm"/>
<field groups="base.group_extended" name="picking_policy" required="True"/>
<field name="user_id"/>
<field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
<field groups="base.group_extended" name="origin"/>
<field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
<field name="payment_term" widget="selection"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<group colspan="2" col="2">
<separator string="Logistic" colspan="2"/>
<field groups="base.group_extended" name="incoterm"/>
<field groups="base.group_extended" name="picking_policy" required="True"/>
<field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
<field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
</group>
<group colspan="2" col="2">
<separator string="References" colspan="2"/>
<field name="user_id"/>
<field groups="base.group_extended" name="origin"/>
</group>
<group colspan="2" col="2">
<separator string="Conditions" colspan="2"/>
<field name="payment_term" widget="selection"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group colspan="2" col="2">
<separator string="Dates" colspan="2"/>
<field name="create_date"/>
<field name="date_confirm"/>
</group>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>
</page>
@@ -243,7 +257,7 @@
</field>
<field name="date_order" select="1" string="Order date" />
<newline/>
<group expand="1" string="Group By..." colspan="4" col="8">
<group expand="1" string="Group By..." colspan="11" col="11">
<filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
<filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
addons/sale/sale_workflow.xml
-2
View File
@@ -58,7 +58,6 @@
<field name="kind">stopall</field>
<field name="action">action_cancel()</field>
</record>
<record id="act_invoice" model="workflow.activity">
<field name="wkf_id" ref="wkf_sale"/>
<field name="name">invoice</field>
@@ -85,7 +84,6 @@
<field name="kind">stopall</field>
<field name="action">action_cancel()</field>
</record>
<record id="act_ship" model="workflow.activity">
<field name="wkf_id" ref="wkf_sale"/>
<field name="name">ship</field>
addons/survey/survey.py
+2 -2
View File
@@ -1580,7 +1580,7 @@ class survey_request(osv.osv):
'email' : fields.char("E-mail", size=64),
'survey_id' : fields.many2one("survey", "Survey", required=1),
'response' : fields.many2one('survey.response', 'Answer'),
'state' : fields.selection([('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
'state' : fields.selection([('draft','Draft'),('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
}
_defaults = {
'state' : lambda * a: 'waiting_answer',
@@ -1642,4 +1642,4 @@ class survey_print_answer(osv.osv_memory):
survey_print_answer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: