Merge lp:~openerp-dev/openobject-addons/trunk-bug-1097934-rmu into lp:openobject-addons
- trunk-bug-1097934-rmu
- Merge into trunk
Proposed by
Ravish(OpenERP)
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-bug-1097934-rmu |
| Merge into: | lp:openobject-addons |
| Diff against target: |
304 lines (+0/-76) 3 files modified
account/data/account_data.xml (+0/-46) account/demo/account_minimal.xml (+0/-9) multi_company/multi_company_demo.xml (+0/-21) |
| To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1097934-rmu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Core Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Hello,
I have solved the issue of "account - duplicate sequence for some journals".
Thanks,
To post a comment you must log in.
Unmerged revisions
- 8507. By Ravish(OpenERP)
-
account - duplicate sequence for some journals
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'account/data/account_data.xml' |
| 2 | --- account/data/account_data.xml 2012-12-21 16:48:08 +0000 |
| 3 | +++ account/data/account_data.xml 2013-01-17 12:59:54 +0000 |
| 4 | @@ -59,52 +59,6 @@ |
| 5 | Account Journal Sequences |
| 6 | --> |
| 7 | |
| 8 | - <record id="sequence_sale_journal" model="ir.sequence"> |
| 9 | - <field name="name">Account Default Sales Journal</field> |
| 10 | - <field eval="3" name="padding"/> |
| 11 | - <field name="prefix">SAJ/%(year)s/</field> |
| 12 | - </record> |
| 13 | - <record id="sequence_refund_sales_journal" model="ir.sequence"> |
| 14 | - <field name="name">Account Default Sales Credit Note Journal</field> |
| 15 | - <field eval="3" name="padding"/> |
| 16 | - <field name="prefix">SCNJ/%(year)s/</field> |
| 17 | - </record> |
| 18 | - <record id="sequence_purchase_journal" model="ir.sequence"> |
| 19 | - <field name="name">Account Default Expenses Journal</field> |
| 20 | - <field eval="3" name="padding"/> |
| 21 | - <field name="prefix">EXJ/%(year)s/</field> |
| 22 | - </record> |
| 23 | - <record id="sequence_refund_purchase_journal" model="ir.sequence"> |
| 24 | - <field name="name">Account Default Expenses Credit Notes Journal</field> |
| 25 | - <field eval="3" name="padding"/> |
| 26 | - <field name="prefix">ECNJ/%(year)s/</field> |
| 27 | - </record> |
| 28 | - <record id="sequence_bank_journal" model="ir.sequence"> |
| 29 | - <field name="name">Account Default Bank Journal</field> |
| 30 | - <field eval="3" name="padding"/> |
| 31 | - <field name="prefix">BNK/%(year)s/</field> |
| 32 | - </record> |
| 33 | - <record id="sequence_check_journal" model="ir.sequence"> |
| 34 | - <field name="name">Account Default Checks Journal</field> |
| 35 | - <field eval="3" name="padding"/> |
| 36 | - <field name="prefix">CHK/%(year)s/</field> |
| 37 | - </record> |
| 38 | - <record id="sequence_cash_journal" model="ir.sequence"> |
| 39 | - <field name="name">Account Default Cash Journal</field> |
| 40 | - <field eval="3" name="padding"/> |
| 41 | - <field name="prefix">CSH/%(year)s/</field> |
| 42 | - </record> |
| 43 | - <record id="sequence_opening_journal" model="ir.sequence"> |
| 44 | - <field name="name">Account Default Opening Entries Journal</field> |
| 45 | - <field eval="3" name="padding"/> |
| 46 | - <field name="prefix">OPEJ/%(year)s/</field> |
| 47 | - </record> |
| 48 | - <record id="sequence_miscellaneous_journal" model="ir.sequence"> |
| 49 | - <field name="name">Account Default Miscellaneous Journal</field> |
| 50 | - <field eval="3" name="padding"/> |
| 51 | - <field name="prefix">MISJ/%(year)s/</field> |
| 52 | - </record> |
| 53 | - |
| 54 | <!-- |
| 55 | Account Statement Sequences |
| 56 | --> |
| 57 | |
| 58 | === modified file 'account/demo/account_minimal.xml' |
| 59 | --- account/demo/account_minimal.xml 2012-12-15 18:15:44 +0000 |
| 60 | +++ account/demo/account_minimal.xml 2013-01-17 12:59:54 +0000 |
| 61 | @@ -312,7 +312,6 @@ |
| 62 | <field name="name">Sales Journal - (test)</field> |
| 63 | <field name="code">TSAJ</field> |
| 64 | <field name="type">sale</field> |
| 65 | - <field name="sequence_id" ref="sequence_sale_journal"/> |
| 66 | <field model="account.account" name="default_credit_account_id" ref="a_sale"/> |
| 67 | <field model="account.account" name="default_debit_account_id" ref="a_sale"/> |
| 68 | <field name="analytic_journal_id" ref="cose_journal_sale"/> |
| 69 | @@ -322,7 +321,6 @@ |
| 70 | <field name="name">Sales Credit Note Journal - (test)</field> |
| 71 | <field name="code">TSCNJ</field> |
| 72 | <field name="type">sale_refund</field> |
| 73 | - <field name="sequence_id" ref="sequence_refund_sales_journal"/> |
| 74 | <field model="account.account" name="default_credit_account_id" ref="a_sale"/> |
| 75 | <field model="account.account" name="default_debit_account_id" ref="a_sale"/> |
| 76 | <field name="analytic_journal_id" ref="cose_journal_sale"/> |
| 77 | @@ -333,7 +331,6 @@ |
| 78 | <field name="name">Expenses Journal - (test)</field> |
| 79 | <field name="code">TEXJ</field> |
| 80 | <field name="type">purchase</field> |
| 81 | - <field name="sequence_id" ref="sequence_purchase_journal"/> |
| 82 | <field model="account.account" name="default_debit_account_id" ref="a_expense"/> |
| 83 | <field model="account.account" name="default_credit_account_id" ref="a_expense"/> |
| 84 | <field name="analytic_journal_id" ref="exp"/> |
| 85 | @@ -343,7 +340,6 @@ |
| 86 | <field name="name">Expenses Credit Notes Journal - (test)</field> |
| 87 | <field name="code">TECNJ</field> |
| 88 | <field name="type">purchase_refund</field> |
| 89 | - <field name="sequence_id" ref="sequence_refund_purchase_journal"/> |
| 90 | <field model="account.account" name="default_debit_account_id" ref="a_expense"/> |
| 91 | <field model="account.account" name="default_credit_account_id" ref="a_expense"/> |
| 92 | <field name="analytic_journal_id" ref="exp"/> |
| 93 | @@ -354,7 +350,6 @@ |
| 94 | <field name="name">Bank Journal - (test)</field> |
| 95 | <field name="code">TBNK</field> |
| 96 | <field name="type">bank</field> |
| 97 | - <field name="sequence_id" ref="sequence_bank_journal"/> |
| 98 | <field model="account.account" name="default_debit_account_id" ref="bnk"/> |
| 99 | <field model="account.account" name="default_credit_account_id" ref="bnk"/> |
| 100 | <field name="analytic_journal_id" ref="sit"/> |
| 101 | @@ -364,7 +359,6 @@ |
| 102 | <field name="name">Checks Journal - (test)</field> |
| 103 | <field name="code">TCHK</field> |
| 104 | <field name="type">bank</field> |
| 105 | - <field name="sequence_id" ref="sequence_check_journal"/> |
| 106 | <field model="account.account" name="default_debit_account_id" ref="cash"/> |
| 107 | <field model="account.account" name="default_credit_account_id" ref="cash"/> |
| 108 | <field name="analytic_journal_id" ref="sit"/> |
| 109 | @@ -384,7 +378,6 @@ |
| 110 | that test OpenERP arrive directly in the touchscreen UI. |
| 111 | --> |
| 112 | <field name="cash_control" eval="False"/> |
| 113 | - <field name="sequence_id" ref="sequence_cash_journal"/> |
| 114 | <field model="account.account" name="default_debit_account_id" ref="cash"/> |
| 115 | <field model="account.account" name="default_credit_account_id" ref="cash"/> |
| 116 | <field name="analytic_journal_id" ref="sit"/> |
| 117 | @@ -394,7 +387,6 @@ |
| 118 | <field name="name">Miscellaneous Journal - (test)</field> |
| 119 | <field name="code">TMIS</field> |
| 120 | <field name="type">general</field> |
| 121 | - <field name="sequence_id" ref="sequence_miscellaneous_journal"/> |
| 122 | <field name="analytic_journal_id" ref="sit"/> |
| 123 | <field name="user_id" ref="base.user_root"/> |
| 124 | </record> |
| 125 | @@ -402,7 +394,6 @@ |
| 126 | <field name="name">Opening Entries Journal - (test)</field> |
| 127 | <field name="code">TOEJ</field> |
| 128 | <field name="type">situation</field> |
| 129 | - <field name="sequence_id" ref="sequence_opening_journal"/> |
| 130 | <field model="account.account" name="default_debit_account_id" ref="o_income"/> |
| 131 | <field model="account.account" name="default_credit_account_id" ref="o_expense"/> |
| 132 | <field eval="True" name="centralisation"/> |
| 133 | |
| 134 | === modified file 'multi_company/multi_company_demo.xml' |
| 135 | --- multi_company/multi_company_demo.xml 2012-11-29 22:26:45 +0000 |
| 136 | +++ multi_company/multi_company_demo.xml 2013-01-17 12:59:54 +0000 |
| 137 | @@ -191,7 +191,6 @@ |
| 138 | <field name="name">Sales Journal - (OpenERP IN)</field> |
| 139 | <field name="code">SAJ-OpenERP IN</field> |
| 140 | <field name="type">sale</field> |
| 141 | - <field name="sequence_id" ref="account.sequence_sale_journal"/> |
| 142 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 143 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 144 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 145 | @@ -203,7 +202,6 @@ |
| 146 | <field name="name">Sales Credit Note Journal - (OpenERP IN)</field> |
| 147 | <field name="code">SCNJ-OpenERP IN</field> |
| 148 | <field name="type">sale_refund</field> |
| 149 | - <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> |
| 150 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 151 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 152 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 153 | @@ -215,7 +213,6 @@ |
| 154 | <field name="name">Expenses Journal - (OpenERP IN)</field> |
| 155 | <field name="code">EXJ-OpenERP IN</field> |
| 156 | <field name="type">purchase</field> |
| 157 | - <field name="sequence_id" ref="account.sequence_purchase_journal"/> |
| 158 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 159 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 160 | <field name="analytic_journal_id" ref="account.exp"/> |
| 161 | @@ -227,7 +224,6 @@ |
| 162 | <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field> |
| 163 | <field name="code">ECNJ-OpenERP IN</field> |
| 164 | <field name="type">purchase_refund</field> |
| 165 | - <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> |
| 166 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 167 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 168 | <field name="analytic_journal_id" ref="account.exp"/> |
| 169 | @@ -239,7 +235,6 @@ |
| 170 | <field name="name">Bank Journal - (OpenERP IN)</field> |
| 171 | <field name="code">BNK-OpenERP IN</field> |
| 172 | <field name="type">bank</field> |
| 173 | - <field name="sequence_id" ref="account.sequence_bank_journal"/> |
| 174 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 175 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 176 | <field name="analytic_journal_id" ref="account.sit"/> |
| 177 | @@ -251,7 +246,6 @@ |
| 178 | <field name="name">Checks Journal - (OpenERP IN)</field> |
| 179 | <field name="code">CHK-OpenERP IN</field> |
| 180 | <field name="type">bank</field> |
| 181 | - <field name="sequence_id" ref="account.sequence_check_journal"/> |
| 182 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 183 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 184 | <field name="analytic_journal_id" ref="account.sit"/> |
| 185 | @@ -263,7 +257,6 @@ |
| 186 | <field name="name">Cash Journal - (OpenERP IN)</field> |
| 187 | <field name="code">CSH-OpenERP IN</field> |
| 188 | <field name="type">cash</field> |
| 189 | - <field name="sequence_id" ref="account.sequence_cash_journal"/> |
| 190 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 191 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 192 | <field name="analytic_journal_id" ref="account.sit"/> |
| 193 | @@ -276,7 +269,6 @@ |
| 194 | <field name="name">Sales Journal - (OpenERP US)</field> |
| 195 | <field name="code">SAJ-OpenERP US</field> |
| 196 | <field name="type">sale</field> |
| 197 | - <field name="sequence_id" ref="account.sequence_sale_journal"/> |
| 198 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 199 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 200 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 201 | @@ -288,7 +280,6 @@ |
| 202 | <field name="name">Sales Credit Note Journal - (OpenERP US)</field> |
| 203 | <field name="code">SCNJ-OpenERP US</field> |
| 204 | <field name="type">sale_refund</field> |
| 205 | - <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> |
| 206 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 207 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 208 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 209 | @@ -300,7 +291,6 @@ |
| 210 | <field name="name">Expenses Journal - (OpenERP US)</field> |
| 211 | <field name="code">EXJ-OpenERP US</field> |
| 212 | <field name="type">purchase</field> |
| 213 | - <field name="sequence_id" ref="account.sequence_purchase_journal"/> |
| 214 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 215 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 216 | <field name="analytic_journal_id" ref="account.exp"/> |
| 217 | @@ -312,7 +302,6 @@ |
| 218 | <field name="name">Expenses Credit Notes Journal - (OpenERP US)</field> |
| 219 | <field name="code">ECNJ-OpenERP US</field> |
| 220 | <field name="type">purchase_refund</field> |
| 221 | - <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> |
| 222 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 223 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 224 | <field name="analytic_journal_id" ref="account.exp"/> |
| 225 | @@ -324,7 +313,6 @@ |
| 226 | <field name="name">Bank Journal - (OpenERP US)</field> |
| 227 | <field name="code">BNK-OpenERP US</field> |
| 228 | <field name="type">bank</field> |
| 229 | - <field name="sequence_id" ref="account.sequence_bank_journal"/> |
| 230 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 231 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 232 | <field name="analytic_journal_id" ref="account.sit"/> |
| 233 | @@ -336,7 +324,6 @@ |
| 234 | <field name="name">Checks Journal - (OpenERP US)</field> |
| 235 | <field name="code">CHK-OpenERP US</field> |
| 236 | <field name="type">bank</field> |
| 237 | - <field name="sequence_id" ref="account.sequence_check_journal"/> |
| 238 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 239 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 240 | <field name="analytic_journal_id" ref="account.sit"/> |
| 241 | @@ -348,7 +335,6 @@ |
| 242 | <field name="name">Cash Journal - (OpenERP US)</field> |
| 243 | <field name="code">CSH-OpenERP US</field> |
| 244 | <field name="type">cash</field> |
| 245 | - <field name="sequence_id" ref="account.sequence_cash_journal"/> |
| 246 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 247 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 248 | <field name="analytic_journal_id" ref="account.sit"/> |
| 249 | @@ -362,7 +348,6 @@ |
| 250 | <field name="name">Sales Journal - (OpenERP BE)</field> |
| 251 | <field name="code">SAJ-OpenERP BE</field> |
| 252 | <field name="type">sale</field> |
| 253 | - <field name="sequence_id" ref="account.sequence_sale_journal"/> |
| 254 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 255 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 256 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 257 | @@ -374,7 +359,6 @@ |
| 258 | <field name="name">Sales Credit Note Journal - (OpenERP BE)</field> |
| 259 | <field name="code">SCNJ-OpenERP BE</field> |
| 260 | <field name="type">sale_refund</field> |
| 261 | - <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> |
| 262 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 263 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 264 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 265 | @@ -386,7 +370,6 @@ |
| 266 | <field name="name">Expenses Journal - (OpenERP BE)</field> |
| 267 | <field name="code">EXJ-OpenERP BE</field> |
| 268 | <field name="type">purchase</field> |
| 269 | - <field name="sequence_id" ref="account.sequence_purchase_journal"/> |
| 270 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 271 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 272 | <field name="analytic_journal_id" ref="account.exp"/> |
| 273 | @@ -398,7 +381,6 @@ |
| 274 | <field name="name">Expenses Credit Notes Journal - (OpenERP BE)</field> |
| 275 | <field name="code">ECNJ-OpenERP BE</field> |
| 276 | <field name="type">purchase_refund</field> |
| 277 | - <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> |
| 278 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 279 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 280 | <field name="analytic_journal_id" ref="account.exp"/> |
| 281 | @@ -410,7 +392,6 @@ |
| 282 | <field name="name">Bank Journal - (OpenERP BE)</field> |
| 283 | <field name="code">BNK-OpenERP BE</field> |
| 284 | <field name="type">bank</field> |
| 285 | - <field name="sequence_id" ref="account.sequence_bank_journal"/> |
| 286 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 287 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 288 | <field name="analytic_journal_id" ref="account.sit"/> |
| 289 | @@ -422,7 +403,6 @@ |
| 290 | <field name="name">Checks Journal - (OpenERP BE)</field> |
| 291 | <field name="code">CHK-OpenERP BE</field> |
| 292 | <field name="type">bank</field> |
| 293 | - <field name="sequence_id" ref="account.sequence_check_journal"/> |
| 294 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 295 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 296 | <field name="analytic_journal_id" ref="account.sit"/> |
| 297 | @@ -434,7 +414,6 @@ |
| 298 | <field name="name">Cash Journal - (OpenERP BE)</field> |
| 299 | <field name="code">CSH-OpenERP BE</field> |
| 300 | <field name="type">cash</field> |
| 301 | - <field name="sequence_id" ref="account.sequence_cash_journal"/> |
| 302 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 303 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 304 | <field name="analytic_journal_id" ref="account.sit"/> |
