Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons_16_sales-mdi into
lp:openobject-addons.
Requested reviews:
Purnendu Singh (OpenERP) (psi-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_16_sales-mdi/+merge/129622
Hello,
I have improved the following things:
1. Traceback when paying invoice by percentage in SO, after installing
sale_stock.
2. In product kanban view, rename 'Available' to 'Future Quantity' to be
coherent with the tree and form view.
3. Added a tooltip for 'date_deadline'.
Thanks,
Divyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_16_sales-mdi/+merge/129622
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons_16_sales-mdi.
=== modified file 'account/report/account_print_overdue.rml'
--- account/report/account_print_overdue.rml 2012-10-18 14:33:32 +0000
+++ account/report/account_print_overdue.rml 2012-11-02 04:43:20 +0000
@@ -277,7 +277,7 @@
<font color="white"> </font>
</para>
<section>
- <para style="terp_default_Bold_9">[[ getLines(o) and removeParentNode('section')]]There is nothing due with this customer</para>
+ <para style="terp_default_Bold_9">[[ getLines(o) and removeParentNode('section')]]There is nothing due with this customer.</para>
</section>
<para style="terp_default_9">
<font color="white"> </font>
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-10-15 09:02:00 +0000
+++ crm/crm_lead.py 2012-11-02 04:43:20 +0000
@@ -236,7 +236,7 @@
'ref': fields.reference('Reference', selection=crm._links_get, size=128),
'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
'phone': fields.char("Phone", size=64),
- 'date_deadline': fields.date('Expected Closing'),
+ 'date_deadline': fields.date('Expected Closing', help="Estimate of the date on which the opportunity will be completed."),
'date_action': fields.date('Next Action Date', select=True),
'title_action': fields.char('Next Action', size=64),
'color': fields.integer('Color Index'),
=== modified file 'event/event.py'
--- event/event.py 2012-10-24 20:18:59 +0000
+++ event/event.py 2012-11-02 04:43:20 +0000
@@ -338,7 +338,7 @@
'date_closed': fields.datetime('Attended Date', readonly=True),
'date_open': fields.datetime('Registration Date', readonly=True),
'reply_to': fields.related('event_id','reply_to',string='Reply-to Email', type='char', size=128, readonly=True,),
- 'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
+ 'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('model','=',_name)]),
'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
'user_id': fields.many2one('res.users', 'User', states={'done': [('readonly', True)]}),
=== modified file 'pad/pad.py'
--- pad/pad.py 2012-10-23 07:02:25 +0000
+++ pad/pad.py 2012-11-02 04:43:20 +0000
@@ -4,10 +4,13 @@
import re
import string
import urllib2
+import logging
from tools.translate import _
from openerp.tools.misc import html2plaintext
from py_etherpad import EtherpadLiteClient
+_logger = logging.getLogger(__name__)
+
class pad_common(osv.osv_memory):
_name = 'pad.common'
@@ -59,10 +62,13 @@
def pad_get_content(self, cr, uid, url, context=None):
content = ''
if url:
- page = urllib2.urlopen('%s/export/html'%url).read()
- mo = re.search('<body>(.*)</body>',page)
- if mo:
- content = mo.group(1)
+ try:
+ page = urllib2.urlopen('%s/export/html'%url).read()
+ mo = re.search('<body>(.*)</body>',page)
+ if mo:
+ content = mo.group(1)
+ except:
+ _logger.warning("No url found '%s'.", url)
return content
# TODO
=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py 2012-10-24 20:14:24 +0000
+++ sale_stock/sale_stock.py 2012-11-02 04:43:20 +0000
@@ -636,7 +636,7 @@
result = super(sale_advance_payment_inv, self)._create_invoices(cr, uid, inv_values, sale_id, context=context)
sale_obj = self.pool.get('sale.order')
sale_line_obj = self.pool.get('sale.order.line')
- wizard = self.browse(cr, uid, ids[0], context)
+ wizard = self.browse(cr, uid, [result], context)
sale = sale_obj.browse(cr, uid, sale_id, context=context)
if sale.order_policy == 'postpaid':
raise osv.except_osv(
@@ -646,8 +646,8 @@
# If invoice on picking: add the cost on the SO
# If not, the advance will be deduced when generating the final invoice
- line_name = inv_values.get('invoice_line') and inv_values.get('invoice_line')[2].get('name') or ''
- line_tax = inv_values.get('invoice_line') and inv_values.get('invoice_line')[2].get('invoice_line_tax_id') or False
+ line_name = inv_values.get('invoice_line') and inv_values.get('invoice_line')[0][2].get('name') or ''
+ line_tax = inv_values.get('invoice_line') and inv_values.get('invoice_line')[0][2].get('invoice_line_tax_id') or False
if sale.order_policy == 'picking':
vals = {
'order_id': sale.id,
=== modified file 'stock/product_view.xml'
--- stock/product_view.xml 2012-10-15 09:02:00 +0000
+++ stock/product_view.xml 2012-11-02 04:43:20 +0000
@@ -219,7 +219,7 @@
</xpath>
<ul position="inside">
<li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
- <li t-if="record.type.raw_value != 'service'">Available: <field name="virtual_available"/> <field name="uom_id"/></li>
+ <li t-if="record.type.raw_value != 'service'">Future Quantity: <field name="virtual_available"/> <field name="uom_id"/></li>
</ul>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
