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

improvement 

bzr revid: fp@tinyerp.com-20080919143502-9ed1rufs8kmis002
This commit is contained in:
Fabien Pinckaers 2008-09-19 16:35:02 +02:00
parent 2b8402d590
commit ae297f0207
6 changed files with 282 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_payment/payment.py
View File

@ -438,7 +438,7 @@ class payment_line(osv.osv):
if move_line_id:
line = self.pool.get('account.move.line').browse(cr,uid,move_line_id)
data['amount_currency']=line.amount_to_pay
res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency, company_currency,
#res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency, company_currency,
if res:
data['amount'] = res['value']['amount']
data['partner_id']=line.partner_id.id

6
addons/mrp/mrp_view.xml
View File

@ -677,7 +677,7 @@
<field name="view_type">form</field>
<field name="view_id" eval="False"/>
</record>
<menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"/>
<menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" />
<record id="mrp_procurement_action2" model="ir.actions.act_window">
<field name="name">Draft procurements</field>
@ -706,7 +706,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','exception')]</field>
</record>
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="mrp.menu_mrp_procurement_action"/>
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="stock.menu_stock_root"/>
<record id="mrp_procurement_action4" model="ir.actions.act_window">
<field name="name">Exceptions procurements to fix</field>
@ -735,7 +735,7 @@
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action5"/>
<menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action"/>
<!-- Order Point -->
<record id="view_warehouse_orderpoint_tree" model="ir.ui.view">

4
addons/sale/sale.py
View File

@ -214,7 +214,7 @@ class sale_order(osv.osv):
'partner_shipping_id':fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3),
'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True ),
'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True),
'order_policy': fields.selection([
('prepaid','Payment before delivery'),
('manual','Shipping & Manual Invoice'),
@ -241,7 +241,7 @@ class sale_order(osv.osv):
'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
'amount_total': fields.function(_amount_total, method=True, string='Total'),
'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."),
'invoice_quantity': fields.selection([('order','Ordered Quantities'),('procurement','Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.",required=True),
'payment_term' : fields.many2one('account.payment.term', 'Payment Term'),
}
_defaults = {

1
addons/sale/sale_view.xml
View File

@ -101,7 +101,6 @@
</group>
<notebook colspan="4">
<page string="Sale Order">
<field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" select="1"/>
<field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>

12
addons/sale_journal/sale_journal_view.xml
View File

@ -279,6 +279,18 @@
src_model="sale_journal.sale.journal"
id="act_sale_journal_sale_journal_2_sale_order_approved"/>
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">res.partner.journal.property.form.inherit</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="property_product_pricelist" position="after"/>
<field name="property_invoice_type"/>
</field>
</field>
</record>
</data>
</openerp>

6
addons/stock/stock_view.xml
View File

@ -563,7 +563,7 @@
<page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
</page>
<page string="Others info">
<page string="Others info" groups="base.group_extended">
<field name="origin" select="2"/>
<field name="active" select="2"/>
<field name="auto_picking"/>
@ -651,7 +651,7 @@
<page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
</page>
<page string="Others info">
<page string="Others info" groups="base.group_extended">
<field name="auto_picking"/>
<field name="active" select="2"/>
<newline/>
@ -819,7 +819,7 @@
<page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
</page>
<page string="Others info">
<page string="Others info" groups="base.group_extended">
<field name="active" select="2"/>
<field name="auto_picking"/>
<newline/>