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

[IMP] Views and menus 

bzr revid: fp@tinyerp.com-20100128171309-7sy1zg4gbqxt84ik
This commit is contained in:
Fabien Pinckaers 2010-01-28 18:13:09 +01:00
parent 7b3007797f
commit 5f263cb9b0
6 changed files with 11 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/account/account_invoice_view.xml
View File

@ -327,14 +327,14 @@
<field name="arch" type="xml">
<search string="Search Invoice">
<group col="10" colspan="4">
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
<filter icon="terp-account" string="Unpaid" domain="[('state','in',('open','cancel'))]" help="Unpaid Invoices"/>
<separator orientation="vertical"/>
<field name="number" select='1'/>
<field name="partner_id" select='1'/>
<field name="amount_total" string="Price" select='1'/>
<field name="origin" select='1'/>
<separator orientation="vertical"/>
<field name="number" select='1'/>
<field name="partner_id" select='1'/>
<field name="amount_total" string="Price" select='1'/>
<field name="origin" select='1'/>
</group>
</search>
</field>
@ -349,18 +349,6 @@
<field name="context">{'type':'out_invoice'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
</record>
<record id="action_invoice_tree_panding_invoice" model="ir.actions.act_window">
<field name="name">Panding Invoice</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="view_id" ref="invoice_tree"/>
<field name="context">{'type':'out_invoice'}</field>
<field name="domain">[('state','=','draft')]</field>
<!-- <field name="search_view_id" ref="view_account_invoice_filter"/>-->
</record>
<record id="action_invoice_tree_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
@ -372,7 +360,7 @@
<field name="view_id" ref="invoice_form"/>
<field name="act_window_id" ref="action_invoice_tree"/>
</record>
<menuitem action="action_invoice_tree" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>
<menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>
<record id="action_invoice_tree1" model="ir.actions.act_window">
<field name="name">Customer Invoices</field>

13
addons/delivery/delivery_view.xml
View File

@ -169,18 +169,5 @@
<field name="search_view_id" ref="stock.view_picking_out_search"/>
</record>
<record id="action_picking_tree5" model="ir.actions.act_window">
<field name="name">Generate Draft Invoices On Receptions</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]</field>
<field name="filter" eval="True"/>
<field name="context">{'contact_display': 'partner'}</field>
<field name="search_view_id" ref="stock.view_picking_in_search"/>
</record>
<menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended"/>
</data>
</openerp>

9
addons/document_change/document_change.py
View File

@ -258,18 +258,15 @@ class document_change_process(osv.osv):
for phase_type_id in process.process_model_id.phase_type_ids:
new_doc_ids = []
for document_type_id in phase_type_id.document_type_ids:
print 'Creating', phase_type_id.name, document_type_id.name
document_ids = document_obj.search(cr, uid, [
('parent_id','in',directory_ids),
('change_type_id','=',document_type_id.id)
])
for document_id in document_ids:
print 'Found Some...'
vals = {}
new_doc_ids.append(document_obj.copy(cr, uid, document_id, vals))
if not document_ids:
if document_type_id.template_document_id:
print 'Copy'
new_doc_ids.append(document_obj.copy(cr, uid, document_type_id.template_document_id.id, {
'name': document_type_id.template_document_id.name,
'datas_fname': document_type_id.template_document_id.datas_fname,
@ -277,7 +274,6 @@ class document_change_process(osv.osv):
'change_type_id': document_type_id.id
}))
else:
print 'Create'
new_doc_ids.append(document_obj.create(cr, uid, {
'name': document_type_id.filename,
'datas_fname': document_type_id.filename,
@ -363,9 +359,10 @@ class document_file(osv.osv):
'state': 'in_production'
},
context=context)
file('/tmp/debug.png','wb+').write(base64.decodestring(attach.target))
self.write(cr, uid, [attach.id], {
'target': False,
'datas': base64.encodestring(attach.target),
#'target': False,
'datas': attach.target,
'state': 'in_production'
})
return True

1
addons/document_change/document_change_report.py
View File

@ -28,7 +28,6 @@ class document_change_report(osv.osv):
def _amount_all(self, cr, uid, ids, field_name, arg, context):
res = {}
for id in ids:
print context
dir, type = id.split(' ')
att = self.pool.get('ir.attachment')
fids = att.search(cr, uid, [('parent_id','child_of',[int(dir)]),('change_type_id','=',int(type))], context=context)

13
addons/sale/sale_view.xml
View File

@ -411,17 +411,6 @@
</field>
</record>
<record id="action_order_line_tree1" model="ir.actions.act_window">
<field name="name">Sales Order Lines</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line</field>
<field name="view_type">form</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_sales_order_line_filter"/>
</record>
<menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="base.menu_sales"
groups="base.group_extended" sequence="4"/>
<record id="action_order_line_tree2" model="ir.actions.act_window">
<field name="name">Uninvoiced Lines</field>
<field name="type">ir.actions.act_window</field>
@ -466,7 +455,7 @@
Set the policies selected by default when creating a new
sale order."/>
<separator colspan="4"
string="Configure Sale Order Logistic"/>
string="Configure Sale Order Logistic"/>
<newline/>
<field name="picking_policy"/>
<newline/>

12
addons/stock/stock_view.xml
View File

@ -817,19 +817,7 @@
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree_delivery"/>
</record>
<record id="action_picking_calendar_delivery" model="ir.actions.act_window">
<field name="name">Calendar of Deliveries</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">calendar,tree,form</field>
<field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
<field name="context">{'contact_display': 'partner'}</field>
</record>
<menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/>
<menuitem action="action_picking_calendar_delivery" id="menu_action_picking_calendar_delivery" parent="menu_action_picking_tree_delivery"/>
#
# Sending Products