Commit Graph

157 Commits

Author SHA1 Message Date
Stephane Wirtel ec308a08e7 [IMP] account: Add new wizard for the cash register "Take Money Out", "Put Money In"
[FIX] point_of_sale: Fix some bugs

bzr revid: stw@openerp.com-20120504125158-p45qfzo8mif6x9xe
2012-05-04 14:51:58 +02:00
Stephane Wirtel 1070cda369 [MERGE] lp:~openerp-dev/openobject-addons/trunk-pos-fva
bzr revid: stw@openerp.com-20120430092650-3oozjjx9pgbqh73j
2012-04-30 11:26:50 +02:00
Stephane Wirtel 9fe0bbc472 [COMMIT] Don't want to lose my work
bzr revid: stw@openerp.com-20120426123017-joglkawvmn0f3pe0
2012-04-26 14:30:17 +02:00
Stephane Wirtel a3c8319deb [FIX] account: Change some labels
bzr revid: stw@openerp.com-20120418113249-ft56ys15ha2a10de
2012-04-18 13:32:49 +02:00
Stephane Wirtel 6cba88d946 [FIX] account: Remove the button to load the definition of the currencies in the cash register and replace it by an on_change which returns an one2many with the right values - Not compatible with the GTK client
bzr revid: stw@openerp.com-20120418093811-ycfyi4l69lhgbn1s
2012-04-18 11:38:11 +02:00
Stephane Wirtel 712a7749d0 [IMP] account: Avoid to create a cash register if there is another one with the same journal
bzr revid: stw@openerp.com-20120417145204-yduc7j1xdpis6i46
2012-04-17 16:52:04 +02:00
Stephane Wirtel 938ae552fa [IMP] account: load the pieces of the currency in the cash register
bzr revid: stw@openerp.com-20120416113633-418a4s4h55hchwkr
2012-04-16 13:36:33 +02:00
Stephane Wirtel 24687ac6bc [FIX] point_of_sale: Add some basic elements for new features
bzr revid: stw@openerp.com-20120416090122-52h5qt0tyga70p3r
2012-04-16 11:01:22 +02:00
Olivier Dony ee77b351b4 [MERGE] Latest fixes from 6.1
bzr revid: odo@openerp.com-20120322143654-w7etvdnq4z5tg6bt
2012-03-22 15:36:54 +01:00
Stefan Rijnhart e792a85858 [FIX] Reference to undefined context variable
[ADD] Check on 'None' context in account module's sequence override

bzr revid: stefan@therp.nl-20120322113959-79wxzej9ih4igg28
2012-03-22 12:39:59 +01:00
Stefan Rijnhart 94896a9c0b [FIX] Pass context to ir.sequence.next_by*
lp bug: https://launchpad.net/bugs/974355 fixed

bzr revid: stefan@therp.nl-20120314125324-g1kbltrcygxlmcgt
2012-03-14 13:53:24 +01:00
Quentin (OpenERP) 08267723ea [FIX] account: cannot iter on a boolean. stupid me
bzr revid: qdp-launchpad@openerp.com-20120223125900-p08apwvl38ygv9i9
2012-02-23 13:59:00 +01:00
Quentin (OpenERP) 274086825b [FIX] account, cash statement: creation through web client
bzr revid: qdp-launchpad@openerp.com-20120223103930-xv7f3lumv6w3i756
2012-02-23 11:39:30 +01:00
fp 8aff5209ea [IMP] improved error message, constraints must allways propose a solution
bzr revid: fp@fp-laptop-20111231075720-4kak7o320td4wxqc
2011-12-31 08:57:20 +01:00
Vo Minh Thu bd341cc6fe [IMP] ir_sequence: call it with the new methods.
bzr revid: vmt@openerp.com-20110929132254-eevlq6t9d6i6um7z
2011-09-29 15:22:54 +02:00
Fabien Pinckaers 42baed019e merge
bzr revid: fp@tinyerp.com-20110925222445-vcji6x4ww9ve2lf0
2011-09-26 00:24:45 +02:00
Fabien Pinckaers 440ed51b9f fix
bzr revid: fp@tinyerp.com-20110925215457-a40td30n6bedg2ug
2011-09-25 23:54:57 +02:00
Fabien Pinckaers d0f8dc83e5 [IMP] Useability and misc fixes in POS
bzr revid: fp@tinyerp.com-20110925210020-5jvd7x38asnbzv5b
2011-09-25 23:00:20 +02:00
Fabien Pinckaers 7cbfe6118e merge
bzr revid: fp@tinyerp.com-20110924150234-ffaq5wjyfkldo37t
2011-09-24 17:02:34 +02:00
Fabien Pinckaers c4047f3936 [useability] better error/warning message
bzr revid: fp@tinyerp.com-20110918135310-sx5wzu22opr9cdwo
2011-09-18 15:53:10 +02:00
Vo Minh Thu (OpenERP) 373e5b6e4d [MERGE] account: remove duplicate code between cash/bank statements
bzr revid: odo@openerp.com-20110917005007-55khqnqrkqsir9st
2011-09-17 02:50:07 +02:00
Bharat (OpenERP) 1f611417f5 [FIX] account : removed the date which was getting updated in button_open method
bzr revid: bde@tinyerp.com-20110913103458-xqclq7dbwk6bxjrh
2011-09-13 16:04:58 +05:30
Bharat (OpenERP) 804755f9a8 [FIX] account : Changing date on register in draft state
lp bug: https://launchpad.net/bugs/847581 fixed

bzr revid: bde@tinyerp.com-20110913094942-930lf6c9641lv38p
2011-09-13 15:19:42 +05:30
Bharat (OpenERP) d7a3a1d7ab [FIX] Applied changes for cash register too
bzr revid: bde@tinyerp.com-20110829122328-kgue1z0rob1zbwtp
2011-08-29 17:53:28 +05:30
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
Vo Minh Thu 922bcfebc1 [REF] account: removed now identical code, added comments for the previous change.
bzr revid: vmt@openerp.com-20110608142653-rchn5lqt3wm1w5rx
2011-06-08 16:26:53 +02:00
Vo Minh Thu 7f86e4d2ed [REF] account: removed duplicated _columns in account_cash_statement w.r.t. account_bank_statement:
- duplicate code is bad by itself,
- but it is a problem when trying to load the models in two passes in the server.

bzr revid: vmt@openerp.com-20110608122020-355pf5nczahm5tmm
2011-06-08 14:20:20 +02:00
ARA (OpenERP) 1984fc62cb [FIX] account: journal seqence not respected
lp bug: https://launchpad.net/bugs/726092 fixed

bzr revid: ara@tinyerp.com-20110317133419-87dwll6uv39lw3cl
2011-03-17 19:04:19 +05:30
nel@tinyerp.com 4c46053132 [FIX] add rec_name on account.cashbox.line
bzr revid: nel@tinyerp.com-20110303085222-im7vv52kdthnyb3q
2011-03-03 09:52:22 +01:00
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
uco (OpenERP) b1cf433ecc [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
2010-12-06 18:41:02 +05:30
uco (OpenERP) eb04af83f3 [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101124050709-w2cc1ox2heixbszx
bzr revid: uco@tinyerp.com-20101125074120-k0njj67uxv5934dw
2010-11-25 13:11:20 +05:30
uco (OpenERP) 3700e08ed6 [REF]: Refactored some lines from previous commit.
bzr revid: uco@tinyerp.com-20101123113152-0ue71yg9usp1gklx
2010-11-23 17:01:52 +05:30
Harry (OpenERP) 1442f13817 [MERGE]
bzr revid: hmo@tinyerp.com-20101122110334-rsh6dqq9p2in012u
2010-11-22 16:33:34 +05:30
uco (OpenERP) 427cd9af23 [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101122050522-dd1d0r9663bib603
2010-11-22 10:35:22 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
Mustufa Rangwala c0c5573c8c [REF] Account: Code clean
bzr revid: mra@mra-laptop-20101111134023-a3p5ha24ye0gu8zl
2010-11-11 19:10:23 +05:30
rpa (Open ERP) 6de3dcb878 [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101111051634-iy69y3q2sucboa46
2010-11-11 10:46:34 +05:30
pso 751166ef62 [IMP] account, hr modules: Put lambda in _defaults
bzr revid: pso@tinyerp.com-20101104124242-djqmwoq9jzenr8cn
2010-11-04 18:12:42 +05:30
rpa (Open ERP) aacf0a1dfe [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101101055003-icatoauxn5q3sqf4
2010-11-01 11:20:03 +05:30
ARA (OpenERP) 469a3c10ce [MERGE] merge from trunk addons3
bzr revid: ara@tinyerp.com-20101028125920-c6lforf52g5x0ub9
2010-10-28 18:29:20 +05:30
ARA (OpenERP) c62536705f [FIX] account: po file export BUG in account module
bzr revid: ara@tinyerp.com-20101028115004-voh5j8rq292xy6e1
2010-10-28 17:20:04 +05:30
Mustufa Rangwala 859a492340 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101028101534-16fqtdcltf8as2ib
2010-10-28 15:45:34 +05:30
Harry (OpenERP) 2cf297f028 [FIX] account, point_of_sale: remove force_allow feature due to security issue on opening account cash statement
bzr revid: hmo@tinyerp.com-20101028071827-2nap7ev4f6w8n1fy
2010-10-28 12:48:27 +05:30
rpa (Open ERP) d6ba50f386 [FIX]: Fixed translation of warning messages
lp bug: https://launchpad.net/bugs/660494 fixed

bzr revid: rpa@tinyerp.com-20101027133524-2mijip7zskzwevnh
2010-10-27 19:05:24 +05:30
Mustufa Rangwala dd271353a9 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101027105819-cmpjwyq11x18173v
2010-10-27 16:28:19 +05:30
Harry (OpenERP) abc40474e0 [FIX] account: fixed yml issue of account cash statement
bzr revid: hmo@tinyerp.com-20101027103208-xvtzje41n2rb5kl1
2010-10-27 16:02:08 +05:30
Harry (OpenERP) 1769bc9476 [MERGE]
bzr revid: hmo@tinyerp.com-20101026055347-yxz72wusdbhty34e
2010-10-26 11:23:47 +05:30
mtr da994fffd8 [IMP] account:-On creation of new Cash Register record,the value of 'Cashbox Balance' remains zero
bzr revid: mtr@mtr-20101022073620-i1yqwvl35579m0zc
2010-10-22 13:06:20 +05:30
ssi 84a6dad5ce [IMP]account: pep-8 in account cash statement
bzr revid: ssi@tinyerp.com-20101021120826-dpd7zuwcujb3rdk3
2010-10-21 17:38:26 +05:30
ssi ea61572b9a [IMP]account: removed unused variables and imports
bzr revid: ssi@tinyerp.com-20101021114631-md6h3d21ceoboii8
2010-10-21 17:16:31 +05:30
HMO(Openerp), MTR(OpenERP) 7f62b37258 [IMP] account,point_of_sale:-improvements in the account.bank.statement and code cleaning
bzr revid: mtr@mtr-20101021070855-tkvwmvmywbgyof2f
2010-10-21 12:38:55 +05:30
P. Christeas aac190d37a account_cash_statement: complain where a new statement has no journal
It wouldn't be able to create in either case, but have a more user-friendly
message.

bzr revid: p_christ@hol.gr-20101019073752-bpswr274h1lzctwm
2010-10-19 10:37:52 +03:00
Mustufa Rangwala 3cfb9ca9cc [REF] account
bzr revid: mra@mra-laptop-20101015073542-pzmc0rz8d0qfcum2
2010-10-15 13:05:42 +05:30
Mustufa Rangwala fc0bf8f9b5 [REF]
bzr revid: mra@mra-laptop-20101011090737-vlzoqec2p2jf1sgq
2010-10-11 14:37:37 +05:30
ARA (OpenERP) d10e1e83af [REF] cleaning code of account
bzr revid: ara@tinyerp.com-20101011060340-v55iqbqk378atwnq
2010-10-11 11:33:40 +05:30
vth 0fb73fae46 [FIX] account: import payment lines on bank statement wizard now taking correct account for move line
bzr revid: vth@tinyerp.com-20101006052059-sujoj1g4n72gofda
2010-10-06 10:50:59 +05:30
vra edf6dbd439 [FIX] account: fixed the cash statement opening balance problem and some improvement at cancel side.
bzr revid: vra@tinyerp.com-20101005055712-rmbveh0l0k678x1t
2010-10-05 11:27:12 +05:30
Mustufa Rangwala 1ebc0a6c07 [REM] Account: Cash statment remove button_Cancel method already available with bank statements
bzr revid: mra@mra-laptop-20100929084919-jjhai4rqjuuldbx5
2010-09-29 14:19:19 +05:30
Mustufa Rangwala d588d72dcd [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20100928124820-qj1wqixgbe8zsq7d
2010-09-28 18:18:20 +05:30
vra 76c476a57d [REF]
bzr revid: vra@tinyerp.com-20100928112204-1het20j3mqbs7t3t
2010-09-28 16:52:04 +05:30
Olivier Dony fe5eaa5379 [REM] account: unused mx import
bzr revid: odo@openerp.com-20100928111800-89a4gc3upjpx2mnf
2010-09-28 13:18:00 +02:00
vra dabbd0dffa [FIX][IMP] account,account_code: fixed the coda import wizard problem and improved the account cash statement code.
bzr revid: vra@tinyerp.com-20100928100311-xo4tl35t747foan3
2010-09-28 15:33:11 +05:30
Mustufa Rangwala 11e6473a9b [IMP] Account_Coda: remove ref of account.bank.st.reconcile object and used voucher instead of it (Still need to fix bug on bank statement and need to test coda with voucher id)
bzr revid: mra@mra-laptop-20100927122801-369dpawmn4fxjcj9
2010-09-27 17:58:01 +05:30
Mustufa Rangwala 3ec65305c6 [REF]
bzr revid: mra@mra-laptop-20100927065821-lrkszwr5z7qhhq48
2010-09-27 12:28:21 +05:30
Mustufa Rangwala 99a2e3c981 [REM] Account: Cash statement => remove journal_id and its default method (will use bank statement)
bzr revid: mra@mra-laptop-20100927065027-3t0mfmqn2nwroqfc
2010-09-27 12:20:27 +05:30
vra a5b8f7058f [FIX] account: fixes default journal_id problem in cash satement view.
bzr revid: vra@tinyerp.com-20100927061538-9hllvim57llb3zz9
2010-09-27 11:45:38 +05:30
qdp-launchpad@tinyerp.com 380ec6ef6c [REF] account: refactoring of button_confirm_* on cash and bank statement
bzr revid: qdp-launchpad@tinyerp.com-20100922154158-ydpoyq1cfwruvlju
2010-09-22 17:41:58 +02:00
Mustufa Rangwala 8da97acf4f [REF]
bzr revid: mra@mra-laptop-20100917110642-ui1u24hu02muqvjf
2010-09-17 16:36:42 +05:30
Mustufa Rangwala fbccb0d6d5 [FIX] Account: Cash statement => creation of analytic lines from cash statement now with creation of account.move.line so removed the code to manually create analytic lines
bzr revid: mra@mra-laptop-20100917090828-yvulxc6lmrci9s57
2010-09-17 14:38:28 +05:30
rpa (Open ERP) ed6d745799 [FIX]: account: Fixed problem in write method of bank statement
bzr revid: rpa@tinyerp.com-20100916124828-38l2o0resjrminsc
2010-09-16 18:18:28 +05:30
qdp-launchpad@tinyerp.com 3d9c59ff01 [IMP] account: automatic sequence on bank statement lines
[FIX] account: multi company on bank/cash statement

bzr revid: qdp-launchpad@tinyerp.com-20100914175307-2g876zrv7vtdnrvl
2010-09-14 19:53:07 +02:00
qdp-launchpad@tinyerp.com ce3e65f4e5 [IMP] account: (usability) changed state of confirmed cash statement from Confirmed to Closed
bzr revid: qdp-launchpad@tinyerp.com-20100913123453-72oas3dzrv5eyo62
2010-09-13 14:34:53 +02:00
qdp-launchpad@tinyerp.com a5df6a53bd [MERGE] merge with same branch
bzr revid: qdp-launchpad@tinyerp.com-20100903174043-7zohe681e2b0ws23
2010-09-03 19:40:43 +02:00
qdp-launchpad@tinyerp.com aa88cbf32a [IMP] account: cash statement, usability changes (required fields)
bzr revid: qdp-launchpad@tinyerp.com-20100903122947-tym18iohoardu9f8
2010-09-03 14:29:47 +02:00
vra 4fd67b69c6 [FIX] account: Fixed the opening balance problem in account_cash_statement.
bzr revid: vra@tinyerp.com-20100903112545-78hgv1gy6gayvvvt
2010-09-03 16:55:45 +05:30
vra 0792c3ec43 [IMP] account: improved account cash statement view and object.
bzr revid: vra@tinyerp.com-20100831114727-c41wxng0n9um7amq
2010-08-31 17:17:27 +05:30
Mustufa Rangwala 2edf982e86 [IMP] Account: Creation of analytic entries on cash statements
bzr revid: mra@mra-laptop-20100831034532-1uq509mcuil21vtl
2010-08-31 09:15:32 +05:30
Mustufa Rangwala 9c92718d63 [IMP] Account: Cash statements
bzr revid: mra@mra-laptop-20100830120840-40m9n2tiofrrncta
2010-08-30 17:38:40 +05:30
Mustufa Rangwala 6610dd5511 [REF]
bzr revid: mra@mra-laptop-20100830104642-xpxbylp5xre0ej6g
2010-08-30 16:16:42 +05:30
Mustufa Rangwala a5f47a15de [IMP] Account: cash statement => Does not consider boolean on journal(posted) while creating move
bzr revid: mra@mra-laptop-20100830103841-toed4biilpkxtixd
2010-08-30 16:08:41 +05:30
qdp-launchpad@tinyerp.com 666510526b [IMP] account: replaced 'Ledger Posting' terms
bzr revid: qdp-launchpad@tinyerp.com-20100824130622-y3tujja6qw489as6
2010-08-24 15:06:22 +02:00
RHA (Open ERP) d5ad0b8ff1 [CLEAN]: Removed commented codes, unnecessary spaces.
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
2010-08-19 17:21:57 +05:30
Mustufa Rangwala 227503e001 [IMP] Account: change the behaviour of bank statement Name field and changes related to it
bzr revid: mra@mra-laptop-20100816070358-p3lecy8cyqci1bmy
2010-08-16 12:33:58 +05:30
Mustufa Rangwala 81aa119fc0 [IMP] Account: Name on bank statement make it readonly=False
bzr revid: mra@mra-laptop-20100816055924-72qs1e0ikog3ljcu
2010-08-16 11:29:24 +05:30
Mantavya Gajjar 700157f459 [FIX]: fix a problme of account move line normal / dynamic view
[FIX]: fix a problem of opening balance for the cash statement
[FIX]: fix a small activity problem of voucher workflow
[FIX]: make appropreate side for journal list 
[FIX]: change the code for cash journal under demo data

bzr revid: mga@tinyerp.com-20100814090508-xkimy8djq0jqdg8j
2010-08-14 14:35:08 +05:30
Mustufa Rangwala 617ceabb3c [REF]
bzr revid: mra@mra-laptop-20100814054809-nv1znki5uc3pn80y
2010-08-14 11:18:09 +05:30
Mantavya Gajjar 17aaa0b746 [IMP]: improve bank statement import invoice wizard
bzr revid: mga@tinyerp.com-20100811135057-w9kocaaawfpo2fle
2010-08-11 19:20:57 +05:30
Mantavya Gajjar e5ee5ce9a4 [FIX]: allow sach statement to be generaed once
bzr revid: mga@tinyerp.com-20100802185744-behoj7gouu82ku0m
2010-08-03 00:27:44 +05:30
Mantavya Gajjar 5ee389f40d [IMP]: improve bank and cash statement
bzr revid: mga@tinyerp.com-20100802185355-vb9v6ezi8uw75hwx
2010-08-03 00:23:55 +05:30
Mantavya Gajjar 73f6400a1f [FIX]: fix a small bugs for the bank and cash statement
bzr revid: mga@tinyerp.com-20100730121656-s63x4acjema3mgyo
2010-07-30 17:46:56 +05:30
Mantavya Gajjar c6ebaa98b1 [FIX]: fix a data format for view and create
bzr revid: mga@tinyerp.com-20100730115758-sgps1xu310u4hxwx
2010-07-30 17:27:58 +05:30
Mantavya Gajjar 99732f4c39 [FIX]: fix a problem for the domain on bank statement
[FIX]: fix a problem for the data format changed for default value for the starting balance and ending balance

bzr revid: mga@tinyerp.com-20100730111206-t0xq1pmuezxhezyl
2010-07-30 16:42:06 +05:30
Vir (Open ERP) 05fe1a6098 [Fix] problem while creating a new cash statement record solved
bzr revid: vir@tinyerp.com-20100727131422-vktxq41c6ib0lcdo
2010-07-27 18:44:22 +05:30
Mantavya Gajjar 3aa3051b4d [IMP]: account module improvements for the bank and cash statements
bzr revid: mga@tinyerp.com-20100726144132-43czgtm069okzshd
2010-07-26 20:11:32 +05:30
qdp-launchpad@tinyerp.com 153d6b75eb [IMP] account: improve as per decimal_precision module
bzr revid: qdp-launchpad@tinyerp.com-20100715130711-3m0akfyrsg1gjp35
2010-07-15 18:37:11 +05:30
Mantavya Gajjar ba8f090d18 [IMP]: improvement in accounting module
bzr revid: mga@tinyerp.com-20100713090130-nprwe7f05iv9w5q6
2010-07-13 14:31:30 +05:30
Mantavya Gajjar ae59b69c36 [FIX]: fix a process of the bank and cash journal confirmation process
bzr revid: mga@tinyerp.com-20100709093938-a4nvjkzzo46qoj5x
2010-07-09 15:09:38 +05:30
Mantavya Gajjar 988067423d [FIX]: fix a problem for the unreconcile of voucher
[IMP]: improve the bank statement and cash statement

bzr revid: mga@tinyerp.com-20100709091212-7unqfc73bs62isrv
2010-07-09 14:42:12 +05:30
Mantavya Gajjar 01fdfb53fb [IMP]: imlement a cheque register, using voucher, also move cheque register to the account_voucher module
bzr revid: mga@tinyerp.com-20100629062906-wjfcof2t50uuh8zx
2010-06-29 11:59:06 +05:30