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

[REF]: Small Modifications 

bzr revid: uco@tinyerp.co.in-20091028101332-2h2vz1a02pk1s4ph
This commit is contained in:
uco (OpenERP) 2009-10-28 15:43:32 +05:30
parent b88c9002b9
commit f0b5bc678c
7 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/account/account_move_line.py
View File

@ -283,6 +283,17 @@ class account_move_line(osv.osv):
result.append((line.id, line.name))
return result
def _balance_search(self, cursor, user, obj, name, args):
if not len(args):
return []
where = ' and '.join(map(lambda x: '(sum(debit-credit)'+x[1]+str(x[2])+')',args))
cursor.execute('select id, sum(debit-credit) from account_move_line \
group by id,debit,credit having '+where)
res = cursor.fetchall()
if not len(res):
return [('id', '=', '0')]
return [('id', 'in', [x[0] for x in res])]
def _invoice_search(self, cursor, user, obj, name, args):
if not len(args):
return []
@ -366,7 +377,7 @@ class account_move_line(osv.osv):
'date_created': fields.date('Creation date'),
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
'balance': fields.function(_balance, method=True, string='Balance'),
'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\

4
addons/account/account_view.xml
View File

@ -800,10 +800,10 @@
<filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
<separator orientation="vertical"/>
<field name="date" select='1'/>
<field name="invoice" select='1'/>
<field name="account_id" select='1'/>
<field name="partner_id" select='1'/>
<field name="debit" select='1'/>
<field name="credit" select='1'/>
<field name="balance" string="Debit/Credit" select='1'/>
</group>
</search>
</field>

8
addons/base_contact/base_contact_view.xml
View File

@ -176,11 +176,9 @@
<field name="inherit_id" ref="base.view_res_partner_filter"/>
<field name="arch" type="xml">
<search string="Search Partner">
<group col='6' colspan='4'>
<field name="address" mode="tree,form" select="1">
<field name="job_ids" select="1"/>
</field>
</group>
<field name="address" mode="tree,form" select="1" colspan="4">
<field name="job_ids" select="1" colspan="4"/>
</field>
</search>
</field>
</record>

3
addons/product/product_view.xml
View File

@ -21,11 +21,10 @@
<filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
<field name="name" select="1"/>
<field name="default_code" select="1"/>
<field name="categ_id" select="1" widget="selection"/>
</group>
<newline/>
<group col='8' colspan='4'>
<field name="categ_id" select="1" widget="selection"/>
<separator orientation="vertical"/>
<field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
</group>
</search>

3
addons/sale/sale.py
View File

@ -765,7 +765,8 @@ class sale_order_line(osv.osv):
'notes': fields.text('Notes'),
'th_weight': fields.float('Weight'),
'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'Status', required=True, readonly=True),
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer')
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
'salesman_id':fields.related('order_id','user_id',type='many2one',relation='res.users',string='Salesman'),
}
_order = 'sequence, id'
_defaults = {

12
addons/sale/sale_view.xml
View File

@ -260,7 +260,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
@ -271,7 +270,6 @@
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
@ -317,7 +315,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree4" id="menu_action_order_tree4" parent="sale.menu_action_order_tree_all" sequence="2" groups="base.group_extended_menu"/>
@ -330,7 +327,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree5" id="menu_action_order_tree5" parent="sale.menu_action_order_tree_all" sequence="1" groups="base.group_extended_menu"/>
@ -342,7 +338,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree7" id="menu_action_order_tree7" parent="menu_action_order_tree" groups="base.group_extended_menu"/>
@ -354,7 +349,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree8" id="menu_action_order_tree8" parent="sale.menu_action_order_tree" groups="base.group_extended_menu"/>
@ -366,7 +360,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree9" id="menu_action_order_tree9" parent="sale.menu_action_order_tree" sequence="2" groups="base.group_extended_menu"/>
@ -378,7 +371,6 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_sales_order_filter"/>
</record>
<menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.menu_action_order_tree" sequence="1" groups="base.group_extended_menu"/>
@ -486,6 +478,10 @@
<field name="order_id" select="1"/>
<field name="order_partner_id" select="1"/>
<field name="product_id" select="1"/>
<field name="salesman_id" select="1" widget="selection">
<filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
<filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
</field>
</group>
</search>
</field>

3
addons/stock/product_view.xml
View File

@ -8,8 +8,9 @@
<field name="type">search</field>
<field name="inherit_id" ref="product.product_search_form_view"/>
<field name="arch" type="xml">
<field name="categ_id" select="1" widget="selection" position="after">
<field name="pricelist_id" select="1" widget="selection" position="before">
<field name="warehouse_id" select="1" widget="selection" context="{'warehouse': self}" />
<separator orientation="vertical"/>
</field>
</field>
</record>