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 | 59 | Account Journal Sequences | 59 | Account Journal Sequences |
| 6 | 60 | --> | 60 | --> |
| 7 | 61 | 61 | ||
| 8 | 62 | <record id="sequence_sale_journal" model="ir.sequence"> | ||
| 9 | 63 | <field name="name">Account Default Sales Journal</field> | ||
| 10 | 64 | <field eval="3" name="padding"/> | ||
| 11 | 65 | <field name="prefix">SAJ/%(year)s/</field> | ||
| 12 | 66 | </record> | ||
| 13 | 67 | <record id="sequence_refund_sales_journal" model="ir.sequence"> | ||
| 14 | 68 | <field name="name">Account Default Sales Credit Note Journal</field> | ||
| 15 | 69 | <field eval="3" name="padding"/> | ||
| 16 | 70 | <field name="prefix">SCNJ/%(year)s/</field> | ||
| 17 | 71 | </record> | ||
| 18 | 72 | <record id="sequence_purchase_journal" model="ir.sequence"> | ||
| 19 | 73 | <field name="name">Account Default Expenses Journal</field> | ||
| 20 | 74 | <field eval="3" name="padding"/> | ||
| 21 | 75 | <field name="prefix">EXJ/%(year)s/</field> | ||
| 22 | 76 | </record> | ||
| 23 | 77 | <record id="sequence_refund_purchase_journal" model="ir.sequence"> | ||
| 24 | 78 | <field name="name">Account Default Expenses Credit Notes Journal</field> | ||
| 25 | 79 | <field eval="3" name="padding"/> | ||
| 26 | 80 | <field name="prefix">ECNJ/%(year)s/</field> | ||
| 27 | 81 | </record> | ||
| 28 | 82 | <record id="sequence_bank_journal" model="ir.sequence"> | ||
| 29 | 83 | <field name="name">Account Default Bank Journal</field> | ||
| 30 | 84 | <field eval="3" name="padding"/> | ||
| 31 | 85 | <field name="prefix">BNK/%(year)s/</field> | ||
| 32 | 86 | </record> | ||
| 33 | 87 | <record id="sequence_check_journal" model="ir.sequence"> | ||
| 34 | 88 | <field name="name">Account Default Checks Journal</field> | ||
| 35 | 89 | <field eval="3" name="padding"/> | ||
| 36 | 90 | <field name="prefix">CHK/%(year)s/</field> | ||
| 37 | 91 | </record> | ||
| 38 | 92 | <record id="sequence_cash_journal" model="ir.sequence"> | ||
| 39 | 93 | <field name="name">Account Default Cash Journal</field> | ||
| 40 | 94 | <field eval="3" name="padding"/> | ||
| 41 | 95 | <field name="prefix">CSH/%(year)s/</field> | ||
| 42 | 96 | </record> | ||
| 43 | 97 | <record id="sequence_opening_journal" model="ir.sequence"> | ||
| 44 | 98 | <field name="name">Account Default Opening Entries Journal</field> | ||
| 45 | 99 | <field eval="3" name="padding"/> | ||
| 46 | 100 | <field name="prefix">OPEJ/%(year)s/</field> | ||
| 47 | 101 | </record> | ||
| 48 | 102 | <record id="sequence_miscellaneous_journal" model="ir.sequence"> | ||
| 49 | 103 | <field name="name">Account Default Miscellaneous Journal</field> | ||
| 50 | 104 | <field eval="3" name="padding"/> | ||
| 51 | 105 | <field name="prefix">MISJ/%(year)s/</field> | ||
| 52 | 106 | </record> | ||
| 53 | 107 | |||
| 54 | 108 | <!-- | 62 | <!-- |
| 55 | 109 | Account Statement Sequences | 63 | Account Statement Sequences |
| 56 | 110 | --> | 64 | --> |
| 57 | 111 | 65 | ||
| 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 | 312 | <field name="name">Sales Journal - (test)</field> | 312 | <field name="name">Sales Journal - (test)</field> |
| 63 | 313 | <field name="code">TSAJ</field> | 313 | <field name="code">TSAJ</field> |
| 64 | 314 | <field name="type">sale</field> | 314 | <field name="type">sale</field> |
| 65 | 315 | <field name="sequence_id" ref="sequence_sale_journal"/> | ||
| 66 | 316 | <field model="account.account" name="default_credit_account_id" ref="a_sale"/> | 315 | <field model="account.account" name="default_credit_account_id" ref="a_sale"/> |
| 67 | 317 | <field model="account.account" name="default_debit_account_id" ref="a_sale"/> | 316 | <field model="account.account" name="default_debit_account_id" ref="a_sale"/> |
| 68 | 318 | <field name="analytic_journal_id" ref="cose_journal_sale"/> | 317 | <field name="analytic_journal_id" ref="cose_journal_sale"/> |
| 69 | @@ -322,7 +321,6 @@ | |||
| 70 | 322 | <field name="name">Sales Credit Note Journal - (test)</field> | 321 | <field name="name">Sales Credit Note Journal - (test)</field> |
| 71 | 323 | <field name="code">TSCNJ</field> | 322 | <field name="code">TSCNJ</field> |
| 72 | 324 | <field name="type">sale_refund</field> | 323 | <field name="type">sale_refund</field> |
| 73 | 325 | <field name="sequence_id" ref="sequence_refund_sales_journal"/> | ||
| 74 | 326 | <field model="account.account" name="default_credit_account_id" ref="a_sale"/> | 324 | <field model="account.account" name="default_credit_account_id" ref="a_sale"/> |
| 75 | 327 | <field model="account.account" name="default_debit_account_id" ref="a_sale"/> | 325 | <field model="account.account" name="default_debit_account_id" ref="a_sale"/> |
| 76 | 328 | <field name="analytic_journal_id" ref="cose_journal_sale"/> | 326 | <field name="analytic_journal_id" ref="cose_journal_sale"/> |
| 77 | @@ -333,7 +331,6 @@ | |||
| 78 | 333 | <field name="name">Expenses Journal - (test)</field> | 331 | <field name="name">Expenses Journal - (test)</field> |
| 79 | 334 | <field name="code">TEXJ</field> | 332 | <field name="code">TEXJ</field> |
| 80 | 335 | <field name="type">purchase</field> | 333 | <field name="type">purchase</field> |
| 81 | 336 | <field name="sequence_id" ref="sequence_purchase_journal"/> | ||
| 82 | 337 | <field model="account.account" name="default_debit_account_id" ref="a_expense"/> | 334 | <field model="account.account" name="default_debit_account_id" ref="a_expense"/> |
| 83 | 338 | <field model="account.account" name="default_credit_account_id" ref="a_expense"/> | 335 | <field model="account.account" name="default_credit_account_id" ref="a_expense"/> |
| 84 | 339 | <field name="analytic_journal_id" ref="exp"/> | 336 | <field name="analytic_journal_id" ref="exp"/> |
| 85 | @@ -343,7 +340,6 @@ | |||
| 86 | 343 | <field name="name">Expenses Credit Notes Journal - (test)</field> | 340 | <field name="name">Expenses Credit Notes Journal - (test)</field> |
| 87 | 344 | <field name="code">TECNJ</field> | 341 | <field name="code">TECNJ</field> |
| 88 | 345 | <field name="type">purchase_refund</field> | 342 | <field name="type">purchase_refund</field> |
| 89 | 346 | <field name="sequence_id" ref="sequence_refund_purchase_journal"/> | ||
| 90 | 347 | <field model="account.account" name="default_debit_account_id" ref="a_expense"/> | 343 | <field model="account.account" name="default_debit_account_id" ref="a_expense"/> |
| 91 | 348 | <field model="account.account" name="default_credit_account_id" ref="a_expense"/> | 344 | <field model="account.account" name="default_credit_account_id" ref="a_expense"/> |
| 92 | 349 | <field name="analytic_journal_id" ref="exp"/> | 345 | <field name="analytic_journal_id" ref="exp"/> |
| 93 | @@ -354,7 +350,6 @@ | |||
| 94 | 354 | <field name="name">Bank Journal - (test)</field> | 350 | <field name="name">Bank Journal - (test)</field> |
| 95 | 355 | <field name="code">TBNK</field> | 351 | <field name="code">TBNK</field> |
| 96 | 356 | <field name="type">bank</field> | 352 | <field name="type">bank</field> |
| 97 | 357 | <field name="sequence_id" ref="sequence_bank_journal"/> | ||
| 98 | 358 | <field model="account.account" name="default_debit_account_id" ref="bnk"/> | 353 | <field model="account.account" name="default_debit_account_id" ref="bnk"/> |
| 99 | 359 | <field model="account.account" name="default_credit_account_id" ref="bnk"/> | 354 | <field model="account.account" name="default_credit_account_id" ref="bnk"/> |
| 100 | 360 | <field name="analytic_journal_id" ref="sit"/> | 355 | <field name="analytic_journal_id" ref="sit"/> |
| 101 | @@ -364,7 +359,6 @@ | |||
| 102 | 364 | <field name="name">Checks Journal - (test)</field> | 359 | <field name="name">Checks Journal - (test)</field> |
| 103 | 365 | <field name="code">TCHK</field> | 360 | <field name="code">TCHK</field> |
| 104 | 366 | <field name="type">bank</field> | 361 | <field name="type">bank</field> |
| 105 | 367 | <field name="sequence_id" ref="sequence_check_journal"/> | ||
| 106 | 368 | <field model="account.account" name="default_debit_account_id" ref="cash"/> | 362 | <field model="account.account" name="default_debit_account_id" ref="cash"/> |
| 107 | 369 | <field model="account.account" name="default_credit_account_id" ref="cash"/> | 363 | <field model="account.account" name="default_credit_account_id" ref="cash"/> |
| 108 | 370 | <field name="analytic_journal_id" ref="sit"/> | 364 | <field name="analytic_journal_id" ref="sit"/> |
| 109 | @@ -384,7 +378,6 @@ | |||
| 110 | 384 | that test OpenERP arrive directly in the touchscreen UI. | 378 | that test OpenERP arrive directly in the touchscreen UI. |
| 111 | 385 | --> | 379 | --> |
| 112 | 386 | <field name="cash_control" eval="False"/> | 380 | <field name="cash_control" eval="False"/> |
| 113 | 387 | <field name="sequence_id" ref="sequence_cash_journal"/> | ||
| 114 | 388 | <field model="account.account" name="default_debit_account_id" ref="cash"/> | 381 | <field model="account.account" name="default_debit_account_id" ref="cash"/> |
| 115 | 389 | <field model="account.account" name="default_credit_account_id" ref="cash"/> | 382 | <field model="account.account" name="default_credit_account_id" ref="cash"/> |
| 116 | 390 | <field name="analytic_journal_id" ref="sit"/> | 383 | <field name="analytic_journal_id" ref="sit"/> |
| 117 | @@ -394,7 +387,6 @@ | |||
| 118 | 394 | <field name="name">Miscellaneous Journal - (test)</field> | 387 | <field name="name">Miscellaneous Journal - (test)</field> |
| 119 | 395 | <field name="code">TMIS</field> | 388 | <field name="code">TMIS</field> |
| 120 | 396 | <field name="type">general</field> | 389 | <field name="type">general</field> |
| 121 | 397 | <field name="sequence_id" ref="sequence_miscellaneous_journal"/> | ||
| 122 | 398 | <field name="analytic_journal_id" ref="sit"/> | 390 | <field name="analytic_journal_id" ref="sit"/> |
| 123 | 399 | <field name="user_id" ref="base.user_root"/> | 391 | <field name="user_id" ref="base.user_root"/> |
| 124 | 400 | </record> | 392 | </record> |
| 125 | @@ -402,7 +394,6 @@ | |||
| 126 | 402 | <field name="name">Opening Entries Journal - (test)</field> | 394 | <field name="name">Opening Entries Journal - (test)</field> |
| 127 | 403 | <field name="code">TOEJ</field> | 395 | <field name="code">TOEJ</field> |
| 128 | 404 | <field name="type">situation</field> | 396 | <field name="type">situation</field> |
| 129 | 405 | <field name="sequence_id" ref="sequence_opening_journal"/> | ||
| 130 | 406 | <field model="account.account" name="default_debit_account_id" ref="o_income"/> | 397 | <field model="account.account" name="default_debit_account_id" ref="o_income"/> |
| 131 | 407 | <field model="account.account" name="default_credit_account_id" ref="o_expense"/> | 398 | <field model="account.account" name="default_credit_account_id" ref="o_expense"/> |
| 132 | 408 | <field eval="True" name="centralisation"/> | 399 | <field eval="True" name="centralisation"/> |
| 133 | 409 | 400 | ||
| 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 | 191 | <field name="name">Sales Journal - (OpenERP IN)</field> | 191 | <field name="name">Sales Journal - (OpenERP IN)</field> |
| 139 | 192 | <field name="code">SAJ-OpenERP IN</field> | 192 | <field name="code">SAJ-OpenERP IN</field> |
| 140 | 193 | <field name="type">sale</field> | 193 | <field name="type">sale</field> |
| 141 | 194 | <field name="sequence_id" ref="account.sequence_sale_journal"/> | ||
| 142 | 195 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> | 194 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 143 | 196 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> | 195 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 144 | 197 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> | 196 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 145 | @@ -203,7 +202,6 @@ | |||
| 146 | 203 | <field name="name">Sales Credit Note Journal - (OpenERP IN)</field> | 202 | <field name="name">Sales Credit Note Journal - (OpenERP IN)</field> |
| 147 | 204 | <field name="code">SCNJ-OpenERP IN</field> | 203 | <field name="code">SCNJ-OpenERP IN</field> |
| 148 | 205 | <field name="type">sale_refund</field> | 204 | <field name="type">sale_refund</field> |
| 149 | 206 | <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> | ||
| 150 | 207 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> | 205 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 151 | 208 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> | 206 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 152 | 209 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> | 207 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 153 | @@ -215,7 +213,6 @@ | |||
| 154 | 215 | <field name="name">Expenses Journal - (OpenERP IN)</field> | 213 | <field name="name">Expenses Journal - (OpenERP IN)</field> |
| 155 | 216 | <field name="code">EXJ-OpenERP IN</field> | 214 | <field name="code">EXJ-OpenERP IN</field> |
| 156 | 217 | <field name="type">purchase</field> | 215 | <field name="type">purchase</field> |
| 157 | 218 | <field name="sequence_id" ref="account.sequence_purchase_journal"/> | ||
| 158 | 219 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> | 216 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 159 | 220 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> | 217 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 160 | 221 | <field name="analytic_journal_id" ref="account.exp"/> | 218 | <field name="analytic_journal_id" ref="account.exp"/> |
| 161 | @@ -227,7 +224,6 @@ | |||
| 162 | 227 | <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field> | 224 | <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field> |
| 163 | 228 | <field name="code">ECNJ-OpenERP IN</field> | 225 | <field name="code">ECNJ-OpenERP IN</field> |
| 164 | 229 | <field name="type">purchase_refund</field> | 226 | <field name="type">purchase_refund</field> |
| 165 | 230 | <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> | ||
| 166 | 231 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> | 227 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 167 | 232 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> | 228 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 168 | 233 | <field name="analytic_journal_id" ref="account.exp"/> | 229 | <field name="analytic_journal_id" ref="account.exp"/> |
| 169 | @@ -239,7 +235,6 @@ | |||
| 170 | 239 | <field name="name">Bank Journal - (OpenERP IN)</field> | 235 | <field name="name">Bank Journal - (OpenERP IN)</field> |
| 171 | 240 | <field name="code">BNK-OpenERP IN</field> | 236 | <field name="code">BNK-OpenERP IN</field> |
| 172 | 241 | <field name="type">bank</field> | 237 | <field name="type">bank</field> |
| 173 | 242 | <field name="sequence_id" ref="account.sequence_bank_journal"/> | ||
| 174 | 243 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 238 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 175 | 244 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 239 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 176 | 245 | <field name="analytic_journal_id" ref="account.sit"/> | 240 | <field name="analytic_journal_id" ref="account.sit"/> |
| 177 | @@ -251,7 +246,6 @@ | |||
| 178 | 251 | <field name="name">Checks Journal - (OpenERP IN)</field> | 246 | <field name="name">Checks Journal - (OpenERP IN)</field> |
| 179 | 252 | <field name="code">CHK-OpenERP IN</field> | 247 | <field name="code">CHK-OpenERP IN</field> |
| 180 | 253 | <field name="type">bank</field> | 248 | <field name="type">bank</field> |
| 181 | 254 | <field name="sequence_id" ref="account.sequence_check_journal"/> | ||
| 182 | 255 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 249 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 183 | 256 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 250 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 184 | 257 | <field name="analytic_journal_id" ref="account.sit"/> | 251 | <field name="analytic_journal_id" ref="account.sit"/> |
| 185 | @@ -263,7 +257,6 @@ | |||
| 186 | 263 | <field name="name">Cash Journal - (OpenERP IN)</field> | 257 | <field name="name">Cash Journal - (OpenERP IN)</field> |
| 187 | 264 | <field name="code">CSH-OpenERP IN</field> | 258 | <field name="code">CSH-OpenERP IN</field> |
| 188 | 265 | <field name="type">cash</field> | 259 | <field name="type">cash</field> |
| 189 | 266 | <field name="sequence_id" ref="account.sequence_cash_journal"/> | ||
| 190 | 267 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 260 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 191 | 268 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 261 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 192 | 269 | <field name="analytic_journal_id" ref="account.sit"/> | 262 | <field name="analytic_journal_id" ref="account.sit"/> |
| 193 | @@ -276,7 +269,6 @@ | |||
| 194 | 276 | <field name="name">Sales Journal - (OpenERP US)</field> | 269 | <field name="name">Sales Journal - (OpenERP US)</field> |
| 195 | 277 | <field name="code">SAJ-OpenERP US</field> | 270 | <field name="code">SAJ-OpenERP US</field> |
| 196 | 278 | <field name="type">sale</field> | 271 | <field name="type">sale</field> |
| 197 | 279 | <field name="sequence_id" ref="account.sequence_sale_journal"/> | ||
| 198 | 280 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> | 272 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 199 | 281 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> | 273 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 200 | 282 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> | 274 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 201 | @@ -288,7 +280,6 @@ | |||
| 202 | 288 | <field name="name">Sales Credit Note Journal - (OpenERP US)</field> | 280 | <field name="name">Sales Credit Note Journal - (OpenERP US)</field> |
| 203 | 289 | <field name="code">SCNJ-OpenERP US</field> | 281 | <field name="code">SCNJ-OpenERP US</field> |
| 204 | 290 | <field name="type">sale_refund</field> | 282 | <field name="type">sale_refund</field> |
| 205 | 291 | <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> | ||
| 206 | 292 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> | 283 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 207 | 293 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> | 284 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 208 | 294 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> | 285 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 209 | @@ -300,7 +291,6 @@ | |||
| 210 | 300 | <field name="name">Expenses Journal - (OpenERP US)</field> | 291 | <field name="name">Expenses Journal - (OpenERP US)</field> |
| 211 | 301 | <field name="code">EXJ-OpenERP US</field> | 292 | <field name="code">EXJ-OpenERP US</field> |
| 212 | 302 | <field name="type">purchase</field> | 293 | <field name="type">purchase</field> |
| 213 | 303 | <field name="sequence_id" ref="account.sequence_purchase_journal"/> | ||
| 214 | 304 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> | 294 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 215 | 305 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> | 295 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 216 | 306 | <field name="analytic_journal_id" ref="account.exp"/> | 296 | <field name="analytic_journal_id" ref="account.exp"/> |
| 217 | @@ -312,7 +302,6 @@ | |||
| 218 | 312 | <field name="name">Expenses Credit Notes Journal - (OpenERP US)</field> | 302 | <field name="name">Expenses Credit Notes Journal - (OpenERP US)</field> |
| 219 | 313 | <field name="code">ECNJ-OpenERP US</field> | 303 | <field name="code">ECNJ-OpenERP US</field> |
| 220 | 314 | <field name="type">purchase_refund</field> | 304 | <field name="type">purchase_refund</field> |
| 221 | 315 | <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> | ||
| 222 | 316 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> | 305 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 223 | 317 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> | 306 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 224 | 318 | <field name="analytic_journal_id" ref="account.exp"/> | 307 | <field name="analytic_journal_id" ref="account.exp"/> |
| 225 | @@ -324,7 +313,6 @@ | |||
| 226 | 324 | <field name="name">Bank Journal - (OpenERP US)</field> | 313 | <field name="name">Bank Journal - (OpenERP US)</field> |
| 227 | 325 | <field name="code">BNK-OpenERP US</field> | 314 | <field name="code">BNK-OpenERP US</field> |
| 228 | 326 | <field name="type">bank</field> | 315 | <field name="type">bank</field> |
| 229 | 327 | <field name="sequence_id" ref="account.sequence_bank_journal"/> | ||
| 230 | 328 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 316 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 231 | 329 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 317 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 232 | 330 | <field name="analytic_journal_id" ref="account.sit"/> | 318 | <field name="analytic_journal_id" ref="account.sit"/> |
| 233 | @@ -336,7 +324,6 @@ | |||
| 234 | 336 | <field name="name">Checks Journal - (OpenERP US)</field> | 324 | <field name="name">Checks Journal - (OpenERP US)</field> |
| 235 | 337 | <field name="code">CHK-OpenERP US</field> | 325 | <field name="code">CHK-OpenERP US</field> |
| 236 | 338 | <field name="type">bank</field> | 326 | <field name="type">bank</field> |
| 237 | 339 | <field name="sequence_id" ref="account.sequence_check_journal"/> | ||
| 238 | 340 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 327 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 239 | 341 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 328 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 240 | 342 | <field name="analytic_journal_id" ref="account.sit"/> | 329 | <field name="analytic_journal_id" ref="account.sit"/> |
| 241 | @@ -348,7 +335,6 @@ | |||
| 242 | 348 | <field name="name">Cash Journal - (OpenERP US)</field> | 335 | <field name="name">Cash Journal - (OpenERP US)</field> |
| 243 | 349 | <field name="code">CSH-OpenERP US</field> | 336 | <field name="code">CSH-OpenERP US</field> |
| 244 | 350 | <field name="type">cash</field> | 337 | <field name="type">cash</field> |
| 245 | 351 | <field name="sequence_id" ref="account.sequence_cash_journal"/> | ||
| 246 | 352 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 338 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 247 | 353 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 339 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 248 | 354 | <field name="analytic_journal_id" ref="account.sit"/> | 340 | <field name="analytic_journal_id" ref="account.sit"/> |
| 249 | @@ -362,7 +348,6 @@ | |||
| 250 | 362 | <field name="name">Sales Journal - (OpenERP BE)</field> | 348 | <field name="name">Sales Journal - (OpenERP BE)</field> |
| 251 | 363 | <field name="code">SAJ-OpenERP BE</field> | 349 | <field name="code">SAJ-OpenERP BE</field> |
| 252 | 364 | <field name="type">sale</field> | 350 | <field name="type">sale</field> |
| 253 | 365 | <field name="sequence_id" ref="account.sequence_sale_journal"/> | ||
| 254 | 366 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> | 351 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 255 | 367 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> | 352 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 256 | 368 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> | 353 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 257 | @@ -374,7 +359,6 @@ | |||
| 258 | 374 | <field name="name">Sales Credit Note Journal - (OpenERP BE)</field> | 359 | <field name="name">Sales Credit Note Journal - (OpenERP BE)</field> |
| 259 | 375 | <field name="code">SCNJ-OpenERP BE</field> | 360 | <field name="code">SCNJ-OpenERP BE</field> |
| 260 | 376 | <field name="type">sale_refund</field> | 361 | <field name="type">sale_refund</field> |
| 261 | 377 | <field name="sequence_id" ref="account.sequence_refund_sales_journal"/> | ||
| 262 | 378 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> | 362 | <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/> |
| 263 | 379 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> | 363 | <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/> |
| 264 | 380 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> | 364 | <field name="analytic_journal_id" ref="account.cose_journal_sale"/> |
| 265 | @@ -386,7 +370,6 @@ | |||
| 266 | 386 | <field name="name">Expenses Journal - (OpenERP BE)</field> | 370 | <field name="name">Expenses Journal - (OpenERP BE)</field> |
| 267 | 387 | <field name="code">EXJ-OpenERP BE</field> | 371 | <field name="code">EXJ-OpenERP BE</field> |
| 268 | 388 | <field name="type">purchase</field> | 372 | <field name="type">purchase</field> |
| 269 | 389 | <field name="sequence_id" ref="account.sequence_purchase_journal"/> | ||
| 270 | 390 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> | 373 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 271 | 391 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> | 374 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 272 | 392 | <field name="analytic_journal_id" ref="account.exp"/> | 375 | <field name="analytic_journal_id" ref="account.exp"/> |
| 273 | @@ -398,7 +381,6 @@ | |||
| 274 | 398 | <field name="name">Expenses Credit Notes Journal - (OpenERP BE)</field> | 381 | <field name="name">Expenses Credit Notes Journal - (OpenERP BE)</field> |
| 275 | 399 | <field name="code">ECNJ-OpenERP BE</field> | 382 | <field name="code">ECNJ-OpenERP BE</field> |
| 276 | 400 | <field name="type">purchase_refund</field> | 383 | <field name="type">purchase_refund</field> |
| 277 | 401 | <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/> | ||
| 278 | 402 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> | 384 | <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/> |
| 279 | 403 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> | 385 | <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/> |
| 280 | 404 | <field name="analytic_journal_id" ref="account.exp"/> | 386 | <field name="analytic_journal_id" ref="account.exp"/> |
| 281 | @@ -410,7 +392,6 @@ | |||
| 282 | 410 | <field name="name">Bank Journal - (OpenERP BE)</field> | 392 | <field name="name">Bank Journal - (OpenERP BE)</field> |
| 283 | 411 | <field name="code">BNK-OpenERP BE</field> | 393 | <field name="code">BNK-OpenERP BE</field> |
| 284 | 412 | <field name="type">bank</field> | 394 | <field name="type">bank</field> |
| 285 | 413 | <field name="sequence_id" ref="account.sequence_bank_journal"/> | ||
| 286 | 414 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 395 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 287 | 415 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 396 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 288 | 416 | <field name="analytic_journal_id" ref="account.sit"/> | 397 | <field name="analytic_journal_id" ref="account.sit"/> |
| 289 | @@ -422,7 +403,6 @@ | |||
| 290 | 422 | <field name="name">Checks Journal - (OpenERP BE)</field> | 403 | <field name="name">Checks Journal - (OpenERP BE)</field> |
| 291 | 423 | <field name="code">CHK-OpenERP BE</field> | 404 | <field name="code">CHK-OpenERP BE</field> |
| 292 | 424 | <field name="type">bank</field> | 405 | <field name="type">bank</field> |
| 293 | 425 | <field name="sequence_id" ref="account.sequence_check_journal"/> | ||
| 294 | 426 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 406 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 295 | 427 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 407 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 296 | 428 | <field name="analytic_journal_id" ref="account.sit"/> | 408 | <field name="analytic_journal_id" ref="account.sit"/> |
| 297 | @@ -434,7 +414,6 @@ | |||
| 298 | 434 | <field name="name">Cash Journal - (OpenERP BE)</field> | 414 | <field name="name">Cash Journal - (OpenERP BE)</field> |
| 299 | 435 | <field name="code">CSH-OpenERP BE</field> | 415 | <field name="code">CSH-OpenERP BE</field> |
| 300 | 436 | <field name="type">cash</field> | 416 | <field name="type">cash</field> |
| 301 | 437 | <field name="sequence_id" ref="account.sequence_cash_journal"/> | ||
| 302 | 438 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> | 417 | <field model="account.account" name="default_debit_account_id" ref="account.cash"/> |
| 303 | 439 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> | 418 | <field model="account.account" name="default_credit_account_id" ref="account.cash"/> |
| 304 | 440 | <field name="analytic_journal_id" ref="account.sit"/> | 419 | <field name="analytic_journal_id" ref="account.sit"/> |
