Merge lp:~inddiana/sisb/yenni_secuencia_solicitud_presupuesto into lp:sisb

Proposed by [SISB] Yennifer Santiago Z
Status: Merged
Approved by: [SISB] Yennifer Santiago Z
Approved revision: 190
Merged at revision: 193
Proposed branch: lp:~inddiana/sisb/yenni_secuencia_solicitud_presupuesto
Merge into: lp:sisb
Diff against target: 55 lines (+22/-0)
3 files modified
sisb_purchase_management/__openerp__.py (+1/-0)
sisb_purchase_management/model/purchase_management.py (+4/-0)
sisb_purchase_management/purchase_sequence.xml (+17/-0)
To merge this branch: bzr merge lp:~inddiana/sisb/yenni_secuencia_solicitud_presupuesto
Reviewer Review Type Date Requested Status
Industrias Diana Pending
Review via email: mp+99815@code.launchpad.net

Description of the change

[ADD] sisb_purchase_management/purchase_sequence.xml
[FIX] Se agrego una secuencia para las solicitudes de presupestos.
Esto para diferenciar las solicitudes de presupesto de las
ordernes de compra

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sisb_purchase_management/__openerp__.py'
2--- sisb_purchase_management/__openerp__.py 2012-02-06 15:53:23 +0000
3+++ sisb_purchase_management/__openerp__.py 2012-03-28 20:12:24 +0000
4@@ -23,6 +23,7 @@
5 'update_xml': [
6 'security/sisb_purchase_management_security.xml',
7 'security/ir.model.access.csv',
8+ 'purchase_sequence.xml',
9 'wizard/comprador_report_wizard.xml',
10 'wizard/status_report_wizard.xml',
11 'wizard/status_requisition_wizard.xml',
12
13=== modified file 'sisb_purchase_management/model/purchase_management.py'
14--- sisb_purchase_management/model/purchase_management.py 2012-03-14 19:39:20 +0000
15+++ sisb_purchase_management/model/purchase_management.py 2012-03-28 20:12:24 +0000
16@@ -258,6 +258,7 @@
17 }
18
19 _defaults = {
20+ 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.draft'),
21 'invoice_method' : 'picking',
22 'approved' : False,
23 'via_envio': None,
24@@ -379,6 +380,9 @@
25
26 res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context=context)
27
28+ name = self.pool.get('ir.sequence').get(cr, uid, 'purchase.order')
29+ self.write(cr, uid, ids, {'name' : name})
30+
31 po_ids = self.search(cr, uid, [('requisition_id','=', po_obj[0].requisition_id.id)])
32 proc_ord_ids = self.pool.get('procurement.order').search(cr, 1, [('purchase_id', 'in', po_ids)])
33 self.pool.get('procurement.order').write(cr, uid, proc_ord_ids, {'purchase_id':po_obj[0].id, 'state':'done'})
34
35=== added file 'sisb_purchase_management/purchase_sequence.xml'
36--- sisb_purchase_management/purchase_sequence.xml 1970-01-01 00:00:00 +0000
37+++ sisb_purchase_management/purchase_sequence.xml 2012-03-28 20:12:24 +0000
38@@ -0,0 +1,17 @@
39+<?xml version="1.0" encoding="utf-8"?>
40+<openerp>
41+ <data noupdate="1">
42+ <!-- Sequences for purchase.order.draft -->
43+ <record id="seq_type_purchase_order_draft" model="ir.sequence.type">
44+ <field name="name">Purchase Order Draft</field>
45+ <field name="code">purchase.order.draft</field>
46+ </record>
47+ <record id="seq_purchase_order_draft" model="ir.sequence">
48+ <field name="name">Purchase Order Draft</field>
49+ <field name="code">purchase.order.draft</field>
50+ <field name="prefix">S/P-</field>
51+ <field name="padding">5</field>
52+ </record>
53+
54+ </data>
55+</openerp>

Subscribers

People subscribed via source and target branches