Antonin Bourguignon
1653332080
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +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
Quentin (OpenERP)
0fb11f25c4
[FIX] account: when generating objects from templates, set the default taxes as a super user + use of set_default() instead of deprecated set(key='default') (on ir.values)
...
bzr revid: qdp-launchpad@openerp.com-20120828095345-erwdm59r3wspqbah
2012-08-28 11:53:45 +02:00
Amit Bhavsar (Open ERP)
ae3970d9a3
Merge with latest addons.
...
bzr revid: amb@tinyerp.com-20120827130303-5d1w7r5dau6wj14g
2012-08-27 18:33:03 +05:30
pso (OpenERP)
f06f0da395
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120823130751-55j9naym9rab8492
bzr revid: pso@tinyerp.com-20120827053644-mzy2bj3fppc3ij4e
2012-08-27 11:06:44 +05:30
Mayur Maheshwari (OpenERP)
3e79640aaf
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120824083535-hvv8cex6d33hfh2o
2012-08-24 14:05:35 +05:30
Quentin (OpenERP)
afa60ebc74
[FIX] lp: 1039013, where an id is given to name_get instead of a list of ids
...
lp bug: https://launchpad.net/bugs/1039013 fixed
bzr revid: qdp-launchpad@openerp.com-20120823142656-nsqml3jnyylpgzxu
2012-08-23 16:26:56 +02:00
pso (OpenERP)
7fa9451428
[IMP] Added onchange on company to fetch currency related to it
...
bzr revid: pso@tinyerp.com-20120823095141-oc840e23y1sk1mjs
2012-08-23 15:21:41 +05:30
Turkesh Patel (Open ERP)
6bb1c6cc98
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20120823075233-qusrimwu903wdsmf
2012-08-23 13:22:33 +05:30
pso (OpenERP)
56177da6c5
[IMP] Improved default view and method of set accounting options wizard
...
bzr revid: pso@tinyerp.com-20120820073038-3dmkx96br61t9gd0
2012-08-20 13:00:38 +05:30
Harry (OpenERP)
3a99e1b2cc
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120809130639-vykbp1cqi02y66ct
2012-08-09 18:36:39 +05:30
Stephane Wirtel
4ae8ce4516
[MERGE]
...
bzr revid: stw@openerp.com-20120808140846-ay7qn0bymtdbwj9q
2012-08-08 16:08:46 +02:00
Antonin Bourguignon
59aa37f0e4
[IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
...
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
Antonin Bourguignon
b0e8ae4c7d
[IMP] error messages
...
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')
bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
2012-08-07 13:06:16 +02:00
Antonin Bourguignon
48e0915804
[IMP] rephrase some error and warning messages in account
...
remove exclamation marks at the end of messages
remove first person usage ('I' and 'We')
remove unjustified capital letters
rephrase the clumsy form 'No <some attribute> is defined'
bzr revid: abo@openerp.com-20120806154410-kbf9aai2uzq2b0c4
2012-08-06 17:44:10 +02:00
Antonin Bourguignon
206252d606
[IMP] fix a first batch of typos and spelling mistakes (listed by UCO on the 2012-08-01)
...
bzr revid: abo@openerp.com-20120803172636-s23g6yturpb5chd6
2012-08-03 19:26:36 +02:00
pso (OpenERP)
773c2d5c63
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
pso (OpenERP)
b411fa65d8
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120731104554-ku0mpomglio4jtjn
2012-07-31 16:15:54 +05:30