Meera Trambadia (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind-mtr into
lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bugfixes-Ind-mtr/+merge/63115
The following changes has been made:-
=>Sale: raise an exception when product or its category does not have an
account_id defined for it.
=>Sale: improved usability of Sales order line-> Extra Info-> Properties.
=>POS: workflow when set to draft deletes old instance of workflow so
duplication is avoided when print the workflow.
=>POS: changed the string of button 'state' to 'State' on Register Analysis.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bugfixes-Ind-mtr/+merge/63115
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind-mtr into
lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.
=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py 2011-05-19 09:31:42 +0000
+++ point_of_sale/point_of_sale.py 2011-06-01 13:17:29 +0000
@@ -497,6 +497,7 @@
self.write(cr, uid, ids, {'state': 'draft'})
wf_service = netsvc.LocalService("workflow")
for i in ids:
+ wf_service.trg_delete(uid, 'pos.order', i, cr)
wf_service.trg_create(uid, 'pos.order', i, cr)
return True
=== modified file 'point_of_sale/report/report_cash_register_view.xml'
--- point_of_sale/report/report_cash_register_view.xml 2011-01-14 00:11:01 +0000
+++ point_of_sale/report/report_cash_register_view.xml 2011-06-01 13:17:29 +0000
@@ -65,7 +65,7 @@
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/>
- <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2011-04-06 05:05:34 +0000
+++ sale/sale_view.xml 2011-06-01 13:17:29 +0000
@@ -171,7 +171,8 @@
<page groups="base.group_extended" string="Extra Info">
<field name="th_weight"/>
<field name="address_allotment_id"/>
- <field name="property_ids" colspan="4"/>
+ <separator colspan="4" string="Properties"/>
+ <field name="property_ids" colspan="4" nolabel="1"/>
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
=== modified file 'sale/wizard/sale_make_invoice_advance.py'
--- sale/wizard/sale_make_invoice_advance.py 2011-01-14 00:11:01 +0000
+++ sale/wizard/sale_make_invoice_advance.py 2011-06-01 13:17:29 +0000
@@ -65,6 +65,10 @@
that is defined as 'Automatic Invoice after delivery'."))
val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
+ if not val['value'].get('account_id'):
+ raise osv.except_osv(_('Error !'),
+ _("There is no Income Account defined " \
+ "for this product or its category: %s") %(val['value']['name'],))
line_id = obj_lines.create(cr, uid, {
'name': val['value']['name'],
'account_id': val['value']['account_id'],
_______________________________________________
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
