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

Improvements 

bzr revid: fp@tinyerp.com-23e1c6bb681d3022a25f58ee166403cc91f5564c
This commit is contained in:
Fabien Pinckaers 2008-06-30 15:33:15 +00:00
parent fca1637a6e
commit f5de25233d
9 changed files with 305 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/account/account_invoice_view.xml
View File

@ -30,15 +30,14 @@
<form string='Invoice Line'>
<notebook>
<page string='Line'>
<field name='name' select='1' colspan='4'/>
<field name='account_id' domain='[(&apos;company_id&apos;, &apos;=&apos;, parent.company_id), (&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id), (&apos;type&apos;, &apos;&lt;&gt;&apos;, &apos;view&apos;)]' on_change='onchange_account_id(parent.partner_id,account_id)'/>
<field name='account_analytic_id' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;view&apos;), (&apos;company_id&apos;, &apos;=&apos;, parent.company_id)]'/>
<newline/>
<field name='product_id' on_change='product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id)' select='1'/>
<field name='uos_id'/>
<field name='quantity' select='1'/>
<field name='price_unit' select='1'/>
<field name='discount'/>
<field name='name' select='1' colspan='4'/>
<field name='account_id' domain='[(&apos;company_id&apos;, &apos;=&apos;, parent.company_id), (&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id), (&apos;type&apos;, &apos;&lt;&gt;&apos;, &apos;view&apos;)]' on_change='onchange_account_id(parent.partner_id,account_id)'/>
<field name='account_analytic_id' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;view&apos;), (&apos;company_id&apos;, &apos;=&apos;, parent.company_id)]'/>
<newline/>
<field name='price_subtotal'/>
<field name='invoice_line_tax_id' colspan='4'/>

3
addons/account/wizard/wizard_automatic_reconcile.py
View File

@ -55,7 +55,8 @@ import time
_reconcile_form = '''<?xml version="1.0"?>
<form string="Reconciliation">
<separator string="Options" colspan="4"/>
<field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
<field name="account_ids" colspan="4" domain="[('reconcile','=',1)]" views="account.view_account_list">
</field>
<field name="date1"/>
<field name="date2"/>
<field name="power"/>

14
addons/l10n_fr/fr_wizard.xml
View File

@ -1,11 +1,15 @@
<?xml version='1.0'?>
<terp>
<data>
<wizard name='account.chart.report' id='wizard_chart_report' model='account.account' menu='False' string='Account Report'/>
<menuitem name='Financial Management/Reporting/Balance Sheet &amp; Profit and Loss' action='wizard_chart_report' type='wizard' id='menu_fr_chart_report'/>
<menuitem
name='Financial Management/Reporting/CERFA Declaration'
action='wizard_chart_report'
type='wizard'
id='menu_fr_chart_report'/>
</data>
</terp>

BIN
addons/l10n_fr/wizard/fpdftemp.fdf
View File

Binary file not shown.

6
addons/mrp/mrp.py
View File

@ -680,7 +680,7 @@ class mrp_procurement(osv.osv):
'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
'message': fields.char('Latest error', size=64),
'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('exception','Exception'),('running','Running'),('cancel','Cancel'),('done','Done')], 'State')
'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('exception','Exception'),('running','Running'),('cancel','Cancel'),('done','Done'),('waiting','Waiting')], 'State')
}
_defaults = {
'state': lambda *a: 'draft',
@ -1065,8 +1065,8 @@ class StockMove(osv.osv):
'move_dest_id': move.id,
'state': state,
'location_dest_id': dest,
'move_history_ids2': [(6,0,[move.id])],
'move_history_ids': [],
'move_history_ids': [(6,0,[move.id])],
'move_history_ids2': [(6,0,[])],
'procurements': []
}
mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef)

12
addons/mrp/mrp_view.xml
View File

@ -422,7 +422,7 @@
<field name='date_start' select='2'/>
<field name='date_finnished'/>
<field name='picking_id'/>
<field name='origin'/>
<field name='origin' select="1"/>
<field name='move_prod_id'/>
<newline/>
<field name='move_created_ids' nolabel='1' colspan='4'/>
@ -614,7 +614,7 @@
<field name='state' readonly='1' select='2'/>
<button name='button_confirm' states='draft' string='Confirm'/>
<button name='button_restart' states='exception' string='Retry'/>
<button name='button_cancel' states='exception' string='Cancel'/>
<button name='button_cancel' states='exception,waiting' string='Cancel'/>
<button name='button_check' states='confirmed' string='Run procurement'/>
<button name='button_cancel' states='draft,running' string='Cancel'/>
</group>
@ -730,12 +730,12 @@
</record>
<menuitem name='Reordering Policy' sequence='4' id='menu_mrp_reordering' parent='stock.menu_stock_root'/>
<menuitem action='action_orderpoint_form' id='menu_action_orderpoint_form' parent='menu_mrp_reordering'/>
<act_window name='Minimum Stock Rules' domain='[(&apos;warehouse_id&apos;, &apos;=&apos;, active_id)]' id='act_stock_warehouse_2_stock_warehouse_orderpoint' src_model='stock.warehouse' res_model='stock.warehouse.orderpoint'/>
<!-- add product_uom to context to be the default value when adding new orderpoints -->
<act_window name='Minimum Stock Rules' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id)]' id='act_product_product_2_stock_warehouse_orderpoint' src_model='product.product' context='{&apos;product_uom&apos;: locals().has_key(&apos;uom_id&apos;) and uom_id}' res_model='stock.warehouse.orderpoint'/>
<act_window name='Bill of Material' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id)]' id='act_product_product_2_mrp_bom' src_model='product.product' res_model='mrp.bom'/>
<act_window name='Bill of Material' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id),(&apos;bom_id&apos;,&apos;=&apos;,False)]' id='act_product_product_2_mrp_bom' src_model='product.product' res_model='mrp.bom'/>
</data>
</terp>

18
addons/mrp/mrp_workflow.xml
View File

@ -192,12 +192,11 @@
</record>
<record model="workflow.activity" id="act_wait_done">
<field name="wkf_id" ref="wkf"/>
<field name="flow_stop">True</field>
<field name="name">wait_done</field>
<field name="kind">function</field>
<field name="action">write({'state':'done'})</field>
<field name="action">write({'state':'waiting'})</field>
</record>
<record model="workflow.activity" id="act_done">
<field name="wkf_id" ref="wkf"/>
<field name="flow_stop">True</field>
@ -217,6 +216,14 @@
<field name="signal">button_wait_done</field>
<field name="condition">True</field>
</record>
<record model="workflow.transition" id="trans_confirm_wait_done">
<field name="act_from" ref="act_wait_done"/>
<field name="act_to" ref="act_done"/>
<field name="condition">check_move_done()</field>
<field name="trigger_model">stock.move</field>
<field name="trigger_expr_id">[move_id.id]</field>
</record>
<record model="workflow.transition" id="trans_confirm_cancel">
<field name="act_from" ref="act_confirm"/>
<field name="act_to" ref="act_cancel"/>
@ -244,6 +251,11 @@
<field name="act_to" ref="act_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record model="workflow.transition" id="trans_confirm_waiting_cancel">
<field name="act_from" ref="act_wait_done"/>
<field name="act_to" ref="act_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record model="workflow.transition" id="trans_confirm_mts_confirm">
<field name="act_from" ref="act_confirm_mts"/>
<field name="act_to" ref="act_confirm"/>

267
addons/sale/report/order.rml
View File

File diff suppressed because one or more lines are too long

3
addons/sale/sale_view.xml
View File

@ -90,9 +90,9 @@
<notebook>
<page string='Order Line'>
<separator string='Automatic Declaration' colspan='4'/>
<field name='product_id' on_change='product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, &apos;lang&apos; in context and context[&apos;lang&apos;], True, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom' colspan='4' select='1'/>
<field name='product_uom_qty' on_change='product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, &apos;lang&apos; in context and context[&apos;lang&apos;], False, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom' select='1'/>
<field name='product_uom' on_change='product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, &apos;lang&apos; in context and context[&apos;lang&apos;], False, parent.date_order)'/>
<field name='product_id' on_change='product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, &apos;lang&apos; in context and context[&apos;lang&apos;], True, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom' colspan='4' select='1'/>
<separator string='Manual Description' colspan='4'/>
<field name='name' colspan='4' select='2'/>
<field name='price_unit' select='2'/>
@ -129,7 +129,6 @@
</form>
<tree string='Sales order lines'>
<field name='name' colspan='4'/>
<field name='product_id'/>
<field name='product_uom_qty' string='Qty'/>
<field name='product_uom' string='UoM'/>
<field name='discount'/>