diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index c3809b44c04..4d5a322a5e2 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -371,11 +371,11 @@ class account_bank_statement(osv.osv): self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name) done.append(st.id) - next_number = obj_seq.get(cr, uid, 'account.bank.statement') if not st.name == '/': - next_number = st.name + '/' + next_number[-1:] + next_number = st.name account_move_obj.write(cr, uid, [move_id], {'name': next_number}) - + else: + next_number = obj_seq.get(cr, uid, 'account.bank.statement') account_move_obj.write(cr, uid, [move_id], {'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted self.write(cr, uid, [st.id], {'name': next_number}, context=context) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 3cb21315350..24f4bb795a2 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -3,8 +3,8 @@ - - + + diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index de8c1ba0cd0..f9512cd4e83 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -470,6 +470,8 @@ OTAX X percent + + @@ -482,6 +484,8 @@ OTAX O percent + + @@ -524,6 +528,8 @@ ITAX X percent + + @@ -536,6 +542,8 @@ ITAX O percent + + diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml index af55e477b42..980834c0dee 100644 --- a/addons/account/data/account_data2.xml +++ b/addons/account/data/account_data2.xml @@ -247,8 +247,8 @@ state - - + + Sale/Purchase Journal View @@ -346,7 +346,7 @@ reconcile_id - + Sale/Purchase Refund Journal View @@ -444,7 +444,7 @@ reconcile_id - + @@ -461,12 +461,14 @@ Sale Journal account.journal - + + %(year)s/ Purchase Journal account.journal - + + %(year)s/ - - - - - - - diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 09ff786e94d..387dd28f77a 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -8,24 +8,25 @@
- + + - + - + @@ -73,7 +74,7 @@ Sales Receipt account.voucher.open form - [('journal_id.type','=','sale')] + [('journal_id.type','=','sale'), ('type','=','sale')] {'journal_type':'sale', 'type':'sale'} new @@ -89,33 +90,39 @@ - - - - + + + + + + - - - - + + + + - - - + - + - - - - - + + + + + + + + + + + @@ -130,7 +137,7 @@ -