From 43abfad689e8e9b08c129fdcb7a93c16fc127bf7 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 14 Jul 2010 18:51:43 +0530 Subject: [PATCH 1/8] [IMP]:mrp:improved production order report. bzr revid: apa@tinyerp.com-20100714132143-1etu0jk8rnzr2hjs --- addons/mrp/report/order.rml | 107 ++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml index 0f08d368900..0c83be6dacd 100644 --- a/addons/mrp/report/order.rml +++ b/addons/mrp/report/order.rml @@ -118,7 +118,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -322,70 +322,71 @@ - Consumed Products [[ o.move_lines2 ==[] and removeParentNode('para')]] - Products to Consume [[ o.move_lines ==[] and removeParentNode('para')]] - - - - - - - Product - - - Quantity - - - Source Location - - - Destination Location - - -
- [[ repeatIn(o.move_lines,'line') ]] - + - [[ line.product_id.code ]] [[ line.product_id.name ]] + Product - [[ formatLang( line.product_qty) ]] + Quantity - [[line.product_uom.name]] + Source Location - [[ line.location_id.name ]] - - - [[ line.location_dest_id.name ]] + Destination Location + Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]] +
+ [[ repeatIn(o.move_lines,'line') ]] + + + + [[ line.product_id.code ]] [[ line.product_id.name ]] + + + [[ formatLang( line.product_qty) ]] + + + [[line.product_uom.name]] + + + [[ line.location_id.name ]] + + + [[ line.location_dest_id.name ]] + + + +
- [[ repeatIn(o.move_lines2,'line2') ]] - - - - [[ line2.product_id.code ]] [[ line2.product_id.name ]] - - - [[ formatLang( line2.product_qty) ]] - - - [[line2.product_uom.name]] - - - [[ line2.location_id.name ]] - - - [[ line2.location_dest_id.name ]] - - - + Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]] +
+ [[ repeatIn(o.move_lines2,'line2') ]] + + + + [[ line2.product_id.code ]] [[ line2.product_id.name ]] + + + [[ formatLang( line2.product_qty) ]] + + + [[line2.product_uom.name]] + + + [[ line2.location_id.name ]] + + + [[ line2.location_dest_id.name ]] + + + +
From ae2bf29aa3cb2f11e3b027fb20730f2981fadeec Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Wed, 14 Jul 2010 19:15:23 +0530 Subject: [PATCH 2/8] [FIX]: fix a problem of reconcile for multiple invoice in single voucher [IMP]: implement log message for voucher bzr revid: mga@tinyerp.com-20100714134523-gd49iof5ac9avbgl --- addons/account/invoice.py | 4 ++++ addons/account_voucher/voucher.py | 4 ++++ .../account_voucher_payment.py | 12 ++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 423c39deea1..fe2c3d56b1d 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -891,7 +891,11 @@ class account_invoice(osv.osv): # make the invoice point to that move self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name}) self.pool.get('account.move').post(cr, uid, [move_id]) + message = _('Invoice ') + " '" + inv.name + "' "+ _("is confirm") + self.log(cr, uid, inv.id, message) + self._log_event(cr, uid, ids) + return True def line_get_convert(self, cr, uid, x, part, date, context=None): diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py index fa0ecf07786..7f74553f6bf 100644 --- a/addons/account_voucher/voucher.py +++ b/addons/account_voucher/voucher.py @@ -366,6 +366,10 @@ class account_voucher(osv.osv): 'move_id': move_id, 'move_ids':[(6, 0,line_ids)] } + + message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm") + self.log(cr, uid, inv.id, message) + self.write(cr, uid, [inv.id], rec) return True diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py index 66ee2c75ce1..38c8bf93f4a 100755 --- a/addons/account_voucher_payment/account_voucher_payment.py +++ b/addons/account_voucher_payment/account_voucher_payment.py @@ -102,6 +102,7 @@ class account_voucher(osv.osv): line_ids = [] line_ids += [move_line_pool.create(cr, uid, move_line)] + rec_ids = [] for line in inv.payment_ids: amount=0.0 move_line = { @@ -147,16 +148,23 @@ class account_voucher(osv.osv): line_ids += [move_line_id] if line.invoice_id: - rec_ids = [move_line_id] + rec_ids += [move_line_id] for move_line in line.invoice_id.move_id.line_id: if line.account_id.id == move_line.account_id.id: rec_ids += [move_line.id] - move_line_pool.reconcile_partial(cr, uid, rec_ids) + #move_line_pool.reconcile_partial(cr, uid, rec_ids) + + if rec_ids: + move_line_pool.reconcile_partial(cr, uid, rec_ids) rec = { 'move_id': move_id, 'move_ids':[(6, 0,line_ids)] } + + message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm") + self.log(cr, uid, inv.id, message) + self.write(cr, uid, [inv.id], rec) return True From 202db5c6093d1592ce8a7f013e1fb574004b3060 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 14 Jul 2010 19:22:20 +0530 Subject: [PATCH 3/8] [IMP]:mrp:improved production order report. bzr revid: apa@tinyerp.com-20100714135220-jj3pbwe44558adw0 --- addons/mrp/report/order.rml | 48 ++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml index 0c83be6dacd..5ed1af444f1 100644 --- a/addons/mrp/report/order.rml +++ b/addons/mrp/report/order.rml @@ -185,14 +185,8 @@ - - - - - - Production Order N° : [[ o.name ]] - + @@ -264,11 +258,11 @@
- + - Work Orders - + Work Orders [[ o.workcenter_lines ==[] and removeParentNode('para')]] + @@ -277,7 +271,7 @@ Sequence - Name + Name [[ o.workcenter_lines ==[] and removeParentNode('blockTable')]] WorkCenter @@ -322,23 +316,23 @@ + + + + Product + + + Quantity + + + Source Location + + + Destination Location + + +
- - - - Product - - - Quantity - - - Source Location - - - Destination Location - - - Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]]
[[ repeatIn(o.move_lines,'line') ]] From 7ae4ed20ea8eae15cd2a4c0febb5d7ac5c6cd76b Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 14 Jul 2010 17:17:13 +0200 Subject: [PATCH 4/8] [REF/IMP] crm, partner_geo_assign: moved basic partner assignation inside crm, added m2m with assigned opportunities to partner history, changed forward-to-partner to use same visual wizard everywhere bzr revid: odo@openerp.com-20100714151713-c2hwebfuvcb2s5qd --- addons/crm/crm_lead.py | 2 ++ addons/crm/crm_lead_view.xml | 3 +- addons/crm/crm_opportunity_view.xml | 15 +++++++++ addons/crm/res_partner.py | 8 +++-- addons/crm/res_partner_view.xml | 33 +++++++++++++++++++ addons/crm/wizard/crm_forward_to_partner.py | 5 +++ addons/partner_geo_assign/__openerp__.py | 8 +++-- .../partner_geo_assign/partner_geo_assign.py | 32 ++---------------- .../partner_geo_assign/res_partner_view.xml | 32 ++---------------- 9 files changed, 71 insertions(+), 67 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 606895e27a6..5c7fdb08522 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -154,6 +154,8 @@ and users"), \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)], readonly=True), 'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)], readonly=True), + 'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner', help="Partner this case has been forwarded/assigned to.", select=True), + 'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"), } _defaults = { diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 590aa9931ee..bcc72d74042 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -193,11 +193,10 @@ name="%(crm.action_crm_send_mail)d" context="{'mail':'new', 'model': 'crm.lead'}" icon="gtk-go-forward" type="action" /> -