Commit Graph

1126 Commits

Author SHA1 Message Date
Denis Ledoux dle@openerp.com 7e1ffaf613 [REM]Remove all account.journal.view and account.journal.column references
bzr revid: dle@openerp.com-20121122104504-ezgj2666zkhgybpj
2012-11-22 11:45:04 +01:00
Denis Ledoux dle@openerp.com d05caecd7e [MERGE][FIX][IMP]Latest trunk + lots of things. I should have pushed more often, but its too late now : (
bzr revid: dle@openerp.com-20121121172954-qpnw0arhb632b8ve
2012-11-21 18:29:54 +01:00
Rajesh Prajapati (OpenERP) 5ead513bf2 [IMP] account : string changed
bzr revid: rpr@tinyerp.com-20121106092401-slfgkto8kvrv2o4v
2012-11-06 14:54:01 +05:30
Rajesh Prajapati (OpenERP) 76a5ceef15 [IMP] account : method code changed
bzr revid: rpr@tinyerp.com-20121106092152-sjyespyes2bxjrp2
2012-11-06 14:51:52 +05:30
Rajesh Prajapati (OpenERP) 43aefa10f6 [IMP] account : method name changed
bzr revid: rpr@tinyerp.com-20121106072825-6vza2ecmycimi4eo
2012-11-06 12:58:25 +05:30
Rajesh Prajapati (OpenERP) f4f45c476c [IMP] account : added constraints to check parent account
bzr revid: rpr@tinyerp.com-20121106062736-28vgz6515h4rt3s2
2012-11-06 11:57:36 +05:30
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Quentin (OpenERP) 5b4fde2485 [FIX] account: the readonly fields aren't send to the server at the record creation
bzr revid: qdp-launchpad@openerp.com-20121019133050-7h8gx3beir992xlw
2012-10-19 15:30:50 +02:00
Mayur Maheshwari (OpenERP) 8346293d72 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
Quentin (OpenERP) d56be2c622 [REF] account: removed dead field 'property_reserve_and_surplus_account' that was not used anymore
bzr revid: qdp-launchpad@openerp.com-20121015114847-j2po052ckxtgegqc
2012-10-15 13:48:47 +02:00
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Fabien Pinckaers 1d365f0d50 [MERGE]
bzr revid: fp@openerp.com-20121010204733-eqg9lhokufm387tr
2012-10-10 22:47:33 +02:00
Xavier Morel 536741bcd3 [MERGE] from trunk
bzr revid: xmo@openerp.com-20121003080711-d8g4kcdpeet3ovne
2012-10-03 10:07:11 +02:00
Antonin Bourguignon 2b2288a3bd [FIX] a few problems introduced with the last merge
bzr revid: abo@openerp.com-20121002111231-zo41jejkrm8afavu
2012-10-02 13:12:31 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Xavier Morel 49998b5f72 [FIX] account: correctly handle 'false' close_method
bzr revid: xmo@openerp.com-20121001075931-zyrmydt1s7uz7ihk
2012-10-01 09:59:31 +02:00
Xavier Morel 45ee8b434d [FIX] account: incorrect check for parent_id value
would try a read on parent_id=False, which blows up

bzr revid: xmo@openerp.com-20121001071728-npq7ieoe3rpz44i7
2012-10-01 09:17:28 +02:00
Fabien Pinckaers 2c0e250edc [MERGE] better domain on CoA template
bzr revid: fp@tinyerp.com-20120930124654-jbi90s6v042ve8q8
2012-09-30 14:46:54 +02:00
Fabien Pinckaers 6bae31462e [MERGE] fix unicode problem on account
bzr revid: fp@tinyerp.com-20120929120724-lkvn8cp3z7116s33
2012-09-29 14:07:24 +02:00
Fabien Pinckaers 135d96cafc [MERGE] for spanish localisation
bzr revid: fp@tinyerp.com-20120929093737-984akfhrl6l5khk2
2012-09-29 11:37:37 +02:00
Fabien Pinckaers 84a454c70a [FIX] translate journal view
bzr revid: fp@tinyerp.com-20120929093616-ru0god6cd7vxu6qh
2012-09-29 11:36:16 +02:00
Vijaykumar Baladaniya 338bf45e3d [FIX] Add Domain in parent_id and remove unnecessary code.
bzr revid: vba@tinyerp.com-20120928055852-utqbghq2e1we7r9g
2012-09-28 11:28:52 +05:30
Antonin Bourguignon 1fbb4a5c16 [IMP] handling of '(copy)' l10n
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
2012-09-24 18:26:45 +02:00
Fabien Pinckaers 5ffbf77067 [MERGE] fixes in account
bzr revid: fp@tinyerp.com-20120920092726-5747f5kj14u26sb1
2012-09-20 11:27:26 +02:00
Amit Patel e308d04d8e [MERGE]
bzr revid: apa@tinyerp.com-20120917100306-20mykzfvurzr71wm
2012-09-17 15:33:06 +05:30
Jigar Amin - OpenERP 9e25673a45 [Merge] lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-customers-suppliers-journal-items-kbh
bzr revid: jam@tinyerp.com-20120914093805-jh2sjnb923h1mx9j
2012-09-14 15:08:05 +05:30
Jigar Amin - OpenERP d7dfc3dc1c [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
Antonin Bourguignon 15b62537f5 [IMP] code cleaning
bzr revid: abo@openerp.com-20120913125228-mb17mk4m6dqbm5rt
2012-09-13 14:52:28 +02:00
Khushboo Bhatt (Open ERP) 2ef470f717 [FIX]account:fix the issue of customer/supplier journal items
bzr revid: kbh@tinyerp.com-20120913124136-ygcr1666kzmcm3bp
2012-09-13 18:11:36 +05:30
Antonin Bourguignon 0986f13047 [FIX] recurring line's model form view
properly set a company id when a journal is selected and, therefore, correctly display available accounts

bzr revid: abo@openerp.com-20120913122312-v2zz8m4r8wcxovtx
2012-09-13 14:23:12 +02:00
Antony Lesuisse b4441a1ca4 [IMP] account template loading speedup 1min on runbot
check parent_id type constraint before create/write
remove parent_id eval 0

bzr revid: al@openerp.com-20120912005721-ofpgkaorlm4zrwgy
2012-09-12 02:57:21 +02:00
Stephane Wirtel 6283d212e5 [MERGE] account: Fix a typo in the variable name
bzr revid: stw@openerp.com-20120910103747-f2ar7jj4w8az2dya
2012-09-10 12:37:47 +02:00
Jigar Amin - OpenERP c17a459f03 Merge lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-removed-tch
bzr revid: jam@tinyerp.com-20120910063452-mwa7zq3f91t1ndnf
2012-09-10 12:04:52 +05:30
Jigar Amin - OpenERP 6c7cdd7712 Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120910043039-vu4qn4t20je6ew8r
2012-09-10 10:00:39 +05:30
Twinkle Christian (OpenERP) cbd5cff60c [MERGE]merge with project barch main branch
bzr revid: tch@tinyerp.com-20120907073038-ezgc5cpmnost9zcm
2012-09-07 13:00:38 +05:30
Turkesh Patel (Open ERP) ac75763855 [MRG] merge with lp:openobjec-addons.
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30
Stephane Wirtel 58fe30e520 [MERGE] stock: fix the issue of counting of Deliveries
[MERGE] account: fix the KeyError in the lines of journal.entry

bzr revid: stw@openerp.com-20120906145520-twnqeb3wyezarcnx
2012-09-06 16:55:20 +02:00
Twinkle Christian (OpenERP) 3f600062d3 [IMP]remove server warnings
bzr revid: tch@tinyerp.com-20120906132533-51shfwfgzguwufsl
2012-09-06 18:55:33 +05:30
Fabien Pinckaers 6273941772 [MERGE] currency from company
bzr revid: fp@tinyerp.com-20120907134229-oblfauk8y435nwhz
2012-09-07 15:42:29 +02:00
Stephane Wirtel 2d89c39f89 [MERGE] account: If the credit or debit field does not exist in the journal entry line, return 0.0
bzr revid: stw@openerp.com-20120905130038-3lk43b0ftzoscobm
2012-09-05 15:00:38 +02:00
Stephane Wirtel d155b77a04 [MERGE] account: remove the payement term lines if we remove the payment term
bzr revid: stw@openerp.com-20120904151837-cuwhc0iawvl32vh9
2012-09-04 17:18:37 +02:00
Jiten (OpenERP) dfb82b2081 [MERGE] Merge from trunk.
bzr revid: jra@tinyerp.com-20120903065444-bcadcpsnadx0vhpx
2012-09-03 12:24:44 +05:30
Stephane Wirtel 1eac0fbe52 [REF] Replace the user id 1 by openerp.SUPERUSER_ID
bzr revid: stw@openerp.com-20120831135136-8k2wjeiixqt6tnkr
2012-08-31 15:51:36 +02:00
Quentin (OpenERP) 6104756d30 [MERGE] account: when generating objects from templates, set the default taxes as a super user + refactoring of deprecated set() method of ir.values
bzr revid: qdp-launchpad@openerp.com-20120831124141-yl4sq3ajrttvm81z
2012-08-31 14:41:41 +02:00
Bhumi Thakkar (Open ERP) 0cb8be90ab [IMP] If ids are int or long then convert into list.
bzr revid: bth@tinyerp.com-20120831114125-z3rk36ip710u1czd
2012-08-31 17:11:25 +05:30
Bhumi Thakkar (Open ERP) b5a8f42641 [MERGE] merge lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-account-bth
bzr revid: bth@tinyerp.com-20120831113829-vkkmdexyyhoeh3zu
2012-08-31 17:08:29 +05:30
Harry (OpenERP) 278ad45c38 [MERGE]
bzr revid: hmo@tinyerp.com-20120830141006-u0ptli8ab49uhafl
2012-08-30 19:40:06 +05:30
Bhumi Thakkar (Open ERP) 77593dcc2a [IMP] if not list then convert into list.
bzr revid: bth@tinyerp.com-20120829091107-ohpgyjikeaatrxd1
2012-08-29 14:41:07 +05:30
Quentin (OpenERP) baad695095 [FIX] account: company isn't a kwarg for set_default. company_id is
bzr revid: qdp-launchpad@openerp.com-20120828112329-g5y9n2e18bvci9r5
2012-08-28 13:23:29 +02:00
Stephane Wirtel 768d9cdb7e [IMP] account: Merge the opening_control and closing_control flags in cash_control
[IMP] account: In the case where the bank statement is a cash register, we can get the coins of the last register.
[IMP] account: Hide the 'Available Coins' if the journal hasn't the cash_control flag.
[FIX] account: Use some default values for the profit/loss and internal account.
[IMP] point_of_sale: Avoid to have two payment methods with the cash_control in a pos.config object.
[REF] point_of_sale: Refactor the computation code of the cash_journal, cash_register and cash_control flags.
[IMP] point_of_sale: Store the difference in the right account if the journal of the statement is a cash_control or nota.
[FIX] point_of_sale: Use the session name instead of the order name for the account.bank.statement.line .
[IMP] point_of_sale: [DEMO] Define the default payment_methods for the pos.config.

bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
2012-08-28 13:21:16 +02:00