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-15 13:36:44 +0000
+++ account/report/account_print_overdue.rml 2012-10-22 12:32:25 +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-10 11:32:27 +0000
+++ crm/crm_lead.py 2012-10-22 12:32:25 +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 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py 2012-10-05 09:15:16 +0000
+++ sale_stock/sale_stock.py 2012-10-22 12:32:25 +0000
@@ -639,7 +639,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(
@@ -649,8 +649,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-13 11:22:53 +0000
+++ stock/product_view.xml 2012-10-22 12:32:25 +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
