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
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
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
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
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
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
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
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
3e79640aaf
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120824083535-hvv8cex6d33hfh2o
2012-08-24 14:05:35 +05:30
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
6bb1c6cc98
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20120823075233-qusrimwu903wdsmf
2012-08-23 13:22:33 +05:30
4ae8ce4516
[MERGE]
...
bzr revid: stw@openerp.com-20120808140846-ay7qn0bymtdbwj9q
2012-08-08 16:08:46 +02:00
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
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
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
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
773c2d5c63
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
fe071b4816
[IMP]account : made c capital for Centralised Counterpart
...
bzr revid: cha@tinyerp.com-20120727084642-42ronls2600r2thk
2012-07-27 14:16:42 +05:30
962ab82207
[MERGE] fixed error in account.account.__compute(). Courtesy of Guewen Baconnier (Camptocamp)
...
bzr revid: qdp-launchpad@openerp.com-20120725192632-n5x1h25gugb2icue
2012-07-25 21:26:32 +02:00
0bc828b75e
[MERGE] account/account.py: use of tools.float_utils float_round() method instead of round(). lp: 977300
...
bzr revid: qdp-launchpad@openerp.com-20120725142836-mtts1wub192861pw
2012-07-25 16:28:36 +02:00
e5da0e191b
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
238bbc539a
[IMP] Improved warning messages for account module
...
bzr revid: pso@tinyerp.com-20120725073357-kcdgglpmbxrtbq6d
2012-07-25 13:03:57 +05:30
1e3535e877
[IMP] Improved warning messages for account module
...
bzr revid: pso@tinyerp.com-20120725065901-8yz655wmvys729kj
2012-07-25 12:29:01 +05:30
fa0b196382
[MERGE] lp:~openerp-dev/openobject-addons/trunk-tooltip_imp-psi
...
bzr revid: stw@openerp.com-20120724075723-qdvvhhpfdt1rzvnl
2012-07-24 09:57:23 +02:00
d5ec4a6535
[IMP] update pot files
...
bzr revid: psi@tinyerp.com-20120720114402-yipigtjmk4j7qk1r
2012-07-20 17:14:02 +05:30
7a8ac01d31
[MERGE] merge with main branch
...
bzr revid: psi@tinyerp.com-20120720061520-fzq1vhfyn88z8q3d
2012-07-20 11:45:20 +05:30
9e0be9ffd1
[IMP]vat to tax : changed the label tax in lowercase
...
bzr revid: rpr@tinyerp.com-20120719111115-ap37b1bo2o7w1w1k
2012-07-19 16:41:15 +05:30
1916eadb89
[IMP]vat to tax : changed the label Tax as its abbreviation
...
bzr revid: rpr@tinyerp.com-20120719055821-1d6ipvw6i8s0n7uk
2012-07-19 11:28:21 +05:30
e068ed2663
[IMP]vat to tax : changed the label Vat as its abbreviation
...
bzr revid: rpr@tinyerp.com-20120719053803-r4p9dhh28h2bysmm
2012-07-19 11:08:03 +05:30
531444a6f6
[IMP] account: do not open a non-existing view after setting taxes
...
bzr revid: rco@openerp.com-20120718135102-34gvep3dbpqznozc
2012-07-18 15:51:02 +02:00
74a58c0f15
[IMP]vat to tax : I have changed the label as tax inplace of vat
...
bzr revid: rpr@tinyerp.com-20120718121821-esupnmy423ukxniz
2012-07-18 17:48:21 +05:30
f186ff2145
[MERGE] Merge with main addons
...
bzr revid: psi@tinyerp.com-20120718055314-7a8w836mzjlueexu
2012-07-18 11:23:14 +05:30
f2a73d9286
merge
...
bzr revid: fp@openerp.com-20120716221706-esjx9mluww4zfio5
2012-07-17 00:17:06 +02:00
71122ae47a
[IMP]tooltip : I have changed the tooltip of fields as suggested
...
bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
2012-07-13 15:47:51 +05:30
cd3a0c2b73
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120711162837-xirr40vvc81xk8ra
2012-07-11 18:28:37 +02:00
6cc0f8f888
[MERGE] add the possiblity to round taxes per line or globally. Courtesy of Alexis de Lattre, Akretion
...
bzr revid: qdp-launchpad@openerp.com-20120711090753-xflurvchm638c5cv
2012-07-11 11:07:53 +02:00
3fadbdcfc0
[IMP]Account : Changes in Warning Message
...
bzr revid: hsa@tinyerp.com-20120711084821-4reozitt3vgo9u31
2012-07-11 14:18:21 +05:30
fb7120d7b6
Add analytic account on taxes and invoice tax lines.
...
bzr revid: alexis@via.ecp.fr-20120710212115-r56jev507ka9eca5
2012-07-10 23:21:15 +02:00
f8d32d3304
[MERGE] point_of_sale
...
bzr revid: fva@openerp.com-20120710142447-s0z5ca89bofh0n2c
2012-07-10 16:24:47 +02:00
e9e069a216
Add an option "Tax calculation rounding method" that can be set to "Round per line" (it's the default value and the behavior of the previous versions of OpenERP) or to "Round globally".
...
bzr revid: alexis@via.ecp.fr-20120707163605-byo0o11f2q9dsczl
2012-07-07 18:36:05 +02:00
ce583333f9
[FIX] minor fixes before merge
...
bzr revid: al@openerp.com-20120626200909-rnriwjhsvr8u7i7w
2012-06-26 22:09:09 +02:00
ae45655ef3
[MERGE] changes for string
...
bzr revid: sbh@tinyerp.com-20120625132114-t1pkogn3r1od75lm
2012-06-25 18:51:14 +05:30
06391b7936
[IMP] add logger instead of_loggerdoc or _log., Add .warning() instead of .debug() in account
...
bzr revid: fka@tinyerp.com-20120625090619-r25n9pqs89oh5180
2012-06-25 14:36:19 +05:30
3c50eb017a
[IMP] set logging.getLogger(__name__)
...
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
e02d8a68ef
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120621093607-eczt3bj4j215cfl2
2012-06-21 15:06:07 +05:30
a0088a0835
[IMP] account: remove unused field in account configuration
...
bzr revid: rco@openerp.com-20120619145728-r4um4cdxx1gk11zx
2012-06-19 16:57:28 +02:00
bd02df1493
[IMP] account: clean up wizard.multi.charts.accounts
...
bzr revid: rco@openerp.com-20120619143809-l61w89poos2r33db
2012-06-19 16:38:09 +02:00
344ddfbdd5
[FIX]base:fix the issue of KeyError when changes in line of Journal Entry
...
lp bug: https://launchpad.net/bugs/955910 fixed
bzr revid: mma@tinyerp.com-20120619062426-x5ykv2thycvpvs4l
2012-06-19 11:54:26 +05:30
ceddfafdc7
[IMP]add logging and remove warning
...
bzr revid: kjo@tinyerp.com-20120613090600-3ib3r220zpn1yo5o
2012-06-13 14:36:00 +05:30
7b8f7cb44f
[IMP]account: remove warning
...
bzr revid: kjo@tinyerp.com-20120612120907-0ife6ga0zcvfebsb
2012-06-12 17:39:07 +05:30
Stephane Wirtel
Quentin (OpenERP)
Mayur Maheshwari (OpenERP)
Turkesh Patel (Open ERP)
Antonin Bourguignon
pso (OpenERP)
Ajay Chauhan (OpenERP)
Purnendu Singh (OpenERP)
Rajesh Prajapati (OpenERP)
Raphael Collet
Fabien Pinckaers
Frédéric van der Essen
Hardik
Alexis de Lattre
Antony Lesuisse
Sbh (Openerp)
Foram Katharotiya (OpenERP)
Kuldeep Joshi (OpenERP)