odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]:improved title Minimum Salesman by Salesperson everywhere 

bzr revid: ssu@tinyerp.com-20120504121326-nqpx2eyqc1qrp04w
This commit is contained in:
Saurang Suthar (OpenERP) 2012-05-04 17:43:26 +05:30
parent a444982285
commit 2ad3b32160
32 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_invoice.py
View File

@ -273,7 +273,7 @@ class account_invoice(osv.osv):
help="Remaining amount due."),
'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, states={'draft':[('readonly',False)]}),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
}
_defaults = {

2
addons/account/account_invoice_view.xml
View File

@ -360,7 +360,7 @@
string="Reference"
filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
<field name="partner_id"/>
<field name="user_id" widget="selection" string="Salesman">
<field name="user_id" widget="selection" string="Salesperson">
<filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
</field>
</group>

2
addons/account/report/account_invoice_report.py
View File

@ -45,7 +45,7 @@ class account_invoice_report(osv.osv):
'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
'price_total': fields.float('Total Without Tax', readonly=True),
'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
'currency_rate': fields.float('Currency Rate', readonly=True),

2
addons/account/report/account_invoice_report_view.xml
View File

@ -107,7 +107,7 @@
<newline/>
<group expand="1" string="Group By...">
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
<filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>

2
addons/account_voucher/report/account_voucher_sales_receipt.py
View File

@ -37,7 +37,7 @@ class sale_receipt_report(osv.osv):
'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
'price_total': fields.float('Total Without Tax', readonly=True),
'price_total_tax': fields.float('Total With Tax', readonly=True),
'nbr':fields.integer('# of Voucher Lines', readonly=True),

2
addons/account_voucher/report/account_voucher_sales_receipt_view.xml
View File

@ -91,7 +91,7 @@
<newline/>
<group expand="1" string="Group By...">
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>

2
addons/crm/crm_lead.py
View File

@ -168,7 +168,7 @@ class crm_lead(crm_case, osv.osv):
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
'date_closed': fields.datetime('Closed', readonly=True),
'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
'user_id': fields.many2one('res.users', 'Salesman'),
'user_id': fields.many2one('res.users', 'Salesperson'),
'referred': fields.char('Referred By', size=64),
'date_open': fields.datetime('Opened', readonly=True),
'day_open': fields.function(_compute_day, string='Days to Open', \

4
addons/crm/crm_lead_view.xml
View File

@ -371,7 +371,7 @@
</field>
<newline/>
<group expand="0" string="Group By...">
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
<filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
<separator orientation="vertical"/>
@ -610,7 +610,7 @@
<newline/>
<group expand="0" string="Group By..." colspan="16">
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
<filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
<filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
<filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical" />

4
addons/crm/report/crm_lead_report_view.xml
View File

@ -119,7 +119,7 @@
domain="[('section_id.user_id','=',uid)]"
help="My Sales Team(s)" />
</field>
<field name="user_id" string="Salesman">
<field name="user_id" string="Salesperson">
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
</field>
</group>
@ -140,7 +140,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" name="user" icon="terp-personal"
<filter string="Salesperson" name="user" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
<filter string="Sales Team" icon="terp-personal+"
domain="[]"

4
addons/crm/report/crm_phonecall_report_view.xml
View File

@ -83,7 +83,7 @@
domain="[('section_id.user_id','=',uid)]"
help="My Sales Team(s)" />
</field>
<field name="user_id" string="Salesman">
<field name="user_id" string="Salesperson">
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
</field>
</group>
@ -99,7 +99,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" name="Salesman" icon="terp-personal"
<filter string="Salesperson" name="Salesperson" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
<filter string="Sales Team" icon="terp-personal+"
domain="[]"

4
addons/crm_claim/report/crm_claim_report_view.xml
View File

@ -95,7 +95,7 @@
help="My company"/>
</field>
<field name="user_id" string="Salesman">
<field name="user_id" string="Salesperson">
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
</field>
</group>
@ -121,7 +121,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" name="Salesman" icon="terp-personal"
<filter string="Salesperson" name="Salesperson" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
<filter string="Sales Team" icon="terp-personal+"
domain="[]"

4
addons/crm_fundraising/report/crm_fundraising_report_view.xml
View File

@ -112,7 +112,7 @@
domain="[('section_id.user_id.company_id','=',uid)]"
help="My company"/>
</field>
<field name="user_id" string="Salesman">
<field name="user_id" string="Salesperson">
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
</field>
</group>
@ -129,7 +129,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" name="Salesman" icon="terp-personal"
<filter string="Salesperson" name="Salesperson" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
<filter string="Sales Team" icon="terp-personal+"
domain="[]"

4
addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
View File

@ -86,7 +86,7 @@
domain="[('section_id.user_id.company_id','=',uid)]"
help="My company"/>
</field>
<field name="user_id" string="Salesman">
<field name="user_id" string="Salesperson">
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
</field>
</group>
@ -99,7 +99,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" icon="terp-personal"
<filter string="Salesperson" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Sales Team" icon="terp-personal+"
domain="[]"

2
addons/crm_partner_assign/report/crm_lead_report_view.xml
View File

@ -44,7 +44,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" name="user" icon="terp-personal"
<filter string="Salesperson" name="user" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
<filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />

2
addons/crm_partner_assign/report/crm_partner_report_view.xml
View File

@ -17,7 +17,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" name="user" icon="terp-personal"
<filter string="Salesperson" name="user" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
<filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" />
<separator orientation="vertical" />

2
addons/crm_partner_assign/res_partner_view.xml
View File

@ -176,7 +176,7 @@
<field name="type">search</field>
<field name="inherit_id" ref="base.view_res_partner_filter"/>
<field name="arch" type="xml">
<filter string="Salesman" position="after">
<filter string="Salesperson" position="after">
<filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
</filter>
</field>

2
addons/edi/static/src/xml/edi_sale_purchase.xml
View File

@ -39,7 +39,7 @@
<tr class="oe_edi_floor">
<th align="left">Your Reference</th>
<th align="left">Date</th>
<th align="left">Salesman</th>
<th align="left">Salesperson</th>
<th align="left">Payment terms</th>
</tr>
<tr class="oe_edi_data_row">

2
addons/hr_recruitment/hr_recruitment_demo.yml
View File

@ -7,7 +7,7 @@
partner_mobile: '9963214587'
job_id: hr.job_developer
stage_id: stage_job1
name: 'Salesman'
name: 'Salesperson'
partner_phone: '1236547890'
-

2
addons/membership/membership_view.xml
View File

@ -173,7 +173,7 @@
<field name="membership_start" invisible="1"/>
<newline/>
<group expand="0" string="Group By..." colspan="10" col="8">
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
<filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
<filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
<separator orientation="vertical"/>
<filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>

2
addons/membership/report/report_membership.py
View File

@ -59,7 +59,7 @@ class report_membership(osv.osv):
'associate_member_id': fields.many2one('res.partner', 'Associate Member', readonly=True),
'membership_id': fields.many2one('product.product', 'Membership Product', readonly=True),
'membership_state': fields.selection(STATE, 'Current Membership State', readonly=True),
'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True)
}

2
addons/membership/report/report_membership_view.xml
View File

@ -56,7 +56,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" icon="terp-personal" name="salesman"
<filter string="Salesperson" icon="terp-personal" name="salesman"
domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Associated Partner" icon="terp-partner" name="associate_member_id"
domain="[]" context="{'group_by':'associate_member_id'}"/>

2
addons/point_of_sale/point_of_sale_view.xml
View File

@ -148,7 +148,7 @@
<newline/>
<group expand="0" string="Group By...">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator string="" orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator string="" orientation="vertical"/>

2
addons/point_of_sale/report/pos_order_report.py
View File

@ -37,7 +37,7 @@ class pos_order_report(osv.osv):
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'state': fields.selection([('draft', 'New'), ('paid', 'Closed'), ('done', 'Synchronized'), ('invoiced', 'Invoiced'), ('cancel', 'Cancelled')],
'Status'),
'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
'user_id':fields.many2one('res.users', 'Salesperson', readonly=True),
'price_total':fields.float('Total Price', readonly=True),
'total_discount':fields.float('Total Discount', readonly=True),
'average_price': fields.float('Average Price', readonly=True,group_operator="avg"),

2
addons/point_of_sale/report/pos_order_report_view.xml
View File

@ -70,7 +70,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
<filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
<filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>

2
addons/point_of_sale/wizard/pos_payment_report_user.py
View File

@ -46,7 +46,7 @@ class pos_payment_report_user(osv.osv_memory):
}
_columns = {
'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesperson')
}
pos_payment_report_user()

2
addons/point_of_sale/wizard/pos_sales_user.py
View File

@ -30,7 +30,7 @@ class pos_sale_user(osv.osv_memory):
_columns = {
'date_start': fields.date('Date Start', required=True),
'date_end': fields.date('Date End', required=True),
'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesman'),
'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesperson'),
}
def print_report(self, cr, uid, ids, context=None):

2
addons/point_of_sale/wizard/pos_sales_user_today.py
View File

@ -27,7 +27,7 @@ class pos_sales_user_today(osv.osv_memory):
_description = 'Sales User Today'
_columns = {
'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesman'),
'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesperson'),
}
def print_report(self, cr, uid, ids, context=None):

2
addons/sale/report/sale_order.rml
View File

@ -204,7 +204,7 @@
<para style="terp_tblheader_General_Centre">[[ o.state &lt;&gt; 'draft' and removeParentNode('para') ]] Quotation Date</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Salesman</para>
<para style="terp_tblheader_General_Centre">Salesperson</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Payment Term</para>

2
addons/sale/report/sale_report.py
View File

@ -44,7 +44,7 @@ class sale_report(osv.osv):
'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),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
'price_total': fields.float('Total Price', readonly=True),
'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True),
'categ_id': fields.many2one('product.category','Category of Product', readonly=True),

2
addons/sale/report/sale_report_view.xml
View File

@ -95,7 +95,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
<filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
<filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-partner" name="Customer" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>

4
addons/sale/sale.py
View File

@ -215,7 +215,7 @@ class sale_order(osv.osv):
'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('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', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
'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."),
@ -1032,7 +1032,7 @@ class sale_order_line(osv.osv):
\n* The \'Done\' state is set when the sales order line has been picked. \
\n* The \'Cancelled\' state is set when a user cancel the sales order related.'),
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesman'),
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
_order = 'sequence, id'

4
addons/sale/sale_view.xml
View File

@ -278,7 +278,7 @@
<newline/>
<group expand="0" string="Group By...">
<filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
@ -433,7 +433,7 @@
<group expand="0" string="Group By...">
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
<filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
<filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>