Commit Graph

151 Commits

Author SHA1 Message Date
Thibault Delavallée 737be08fbf [MERGE] account: cash register view improvements
- now looking like cash control methods from the point of sale module.

point of sale: improved some tooltips + cash control form view improvements

bzr revid: tde@openerp.com-20140102113009-lb1vv2w3g4dz2oqw
2014-01-02 12:30:09 +01:00
Paramjit Singh Sahota 7980ac78ae [IMP] Improved code as per the suggestions on the Merge proposal.
bzr revid: psa@tinyerp.com-20131230072452-zew8ys6lqomzxcsm
2013-12-30 12:54:52 +05:30
Paramjit Singh Sahota 4082e1aa8c [IMP]Removed the unwanted functional fields.
bzr revid: psa@tinyerp.com-20130925082507-oma2ttiy1kas9fsn
2013-09-25 13:55:07 +05:30
Paramjit Singh Sahota e00111a061 [IMP] Improved code.
bzr revid: psa@tinyerp.com-20130918111959-1dzkuxv4acjys8kl
2013-09-18 16:49:59 +05:30
Paramjit Singh Sahota 5327be2208 Removed unwanted code.
bzr revid: psa@tinyerp.com-20130918094719-hj15za1y2nt1x1c8
2013-09-18 15:17:19 +05:30
Paramjit Singh Sahota bfff65d4ac [IMP] if 'cash control' if false in the journal, no need to have the opening and closing cash control tab in cash registers
bzr revid: psa@tinyerp.com-20130918091041-c5zponkbu5uwgb94
2013-09-18 14:40:41 +05:30
Paramjit Singh Sahota 5f06129179 [IMP] Improved code for
In cash registers, it does not work at all 
>>real closing balance is not updated
>>opening balance is not updated
>>and so amount is never good

bzr revid: psa@tinyerp.com-20130917130901-hem0iwy608vkwe02
2013-09-17 18:39:01 +05:30
Foram Katharotiya (OpenERP) dc0c545cd7 [IMP] improve code
bzr revid: fka@tinyerp.com-20130618084755-977k4ulv5c1bbcrk
2013-06-18 14:17:55 +05:30
Foram Katharotiya (OpenERP) 51974205b0 [IMP] improve code
bzr revid: fka@tinyerp.com-20130618073649-roiu4qko1ye380r4
2013-06-18 13:06:49 +05:30
sgo@tinyerp.com 5ee65de025 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130613084838-twjsl8cdi5ajjp4c
2013-06-13 14:18:38 +05:30
ggh-openerp 3b73e2b2a4 [IMP]Removed space before Exclamation marks [!]
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Tejas Tank 6e63c47c64 [FIX] pos,cash-register: corrected word theoritical to theoretical changes.
bzr revid: tta@openerp.com-20130412093807-9bazw36l9khrjm0l
2013-04-12 15:08:07 +05:30
Tejas Tank b062573df4 [IMP] pos,cash-register: Corrected tooltips and layout.
bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
2013-04-09 10:17:24 +05:30
Tejas Tank 76b7a08275 [IMP] pos session and cash register, Improved tooltip and layout.
bzr revid: tta@openerp.com-20130405092419-jpa89isevfq6jw49
2013-04-05 14:54:19 +05:30
Tejas Tank 3f6526d1f0 [IMP] Code corrected and pos.session, Opening Cashbox filled up for currencies.
bzr revid: tta@openerp.com-20130401102512-52tdz9n8zlit4291
2013-04-01 15:55:12 +05:30
Tejas Tank 69b38773d4 [FIX] code corrected, if journal_id not set then return empty details_ids.
bzr revid: tta@openerp.com-20130401070855-i4jbe8qsu9z9b5md
2013-04-01 12:38:55 +05:30
Tejas Tank 52cb6ad46f [FIX] account.cash.statement: code correct, it successful pass the yml test cases.
bzr revid: tta@openerp.com-20130325110836-zfqi4nm0q90zivge
2013-03-25 16:38:36 +05:30
Tejas Tank c9d79bc1ef [IMP] account.cash.statement: onchange of journal_id, cashbox will be reflected as per journal.
bzr revid: tta@openerp.com-20130325063322-57r9edxi0l4mx74j
2013-03-25 12:03:22 +05:30
Tejas Tank 3cc6916ec1 [FIX] Cash Journal: When user change the journal, updated the relavent cash box currency units.
bzr revid: tta@openerp.com-20130322105209-uemdljwl42rql89h
2013-03-22 16:22:09 +05:30
Ajay Chauhan (OpenERP) 9bcf832d71 [IMP] account, pos: added tooltip to field 'balance_end_real' & made other little change
bzr revid: cha@tinyerp.com-20130315100804-9jzt9fgz430gwof9
2013-03-15 15:38:04 +05:30
Ajay Chauhan (OpenERP) 4b58ca9fb7 [IMP] account, pos: change help of fields
bzr revid: cha@tinyerp.com-20130313120703-cfcmasmjuwbqgzug
2013-03-13 17:37:03 +05:30
Quentin (OpenERP) 84c744a13d [FIX] lp:1102612. Cannot delete a journal.
lp bug: https://launchpad.net/bugs/1102612 fixed

bzr revid: qdp-launchpad@openerp.com-20130215175042-s5n73brhg7zy294h
2013-02-15 18:50:42 +01:00
Cecile Tonglet a3939acfa5 [FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Fabien Pinckaers 4a15e55895 [FIX] bug pos
bzr revid: fp@openerp.com-20121103171627-7mvvn13494ofbbh0
2012-11-03 18:16:27 +01:00
Fabien Pinckaers 74476c8e22 [FIX] POS close session without cash register
bzr revid: fp@openerp.com-20121103171225-nlp53s0aenamdhcg
2012-11-03 18:12:25 +01: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
Fabien Pinckaers 9dd3e6476f [IMP] PoS backend
bzr revid: fp@tinyerp.com-20120809212311-q2b86eww9ppvdv8s
2012-08-09 23:23:11 +02:00
Antonin Bourguignon b5fdcedbc9 [FIX] remove the weird balance_check method in account (what was it doing there ?)
bzr revid: abo@openerp.com-20120808120856-r5qxpxigaehdbfyt
2012-08-08 14:08:56 +02:00
Antonin Bourguignon 8a64e7580a [IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +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
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Antony Lesuisse 1171a28cc5 [FIX] account invalid rec_names
bzr revid: al@openerp.com-20120731122202-a4qccozmbjudgc8p
2012-07-31 14:22:02 +02:00
pso (OpenERP) 238bbc539a [IMP] Improved warning messages for account module
bzr revid: pso@tinyerp.com-20120725073357-kcdgglpmbxrtbq6d
2012-07-25 13:03:57 +05:30
pso (OpenERP) 1e3535e877 [IMP] Improved warning messages for account module
bzr revid: pso@tinyerp.com-20120725065901-8yz655wmvys729kj
2012-07-25 12:29:01 +05:30
Quentin (OpenERP) 51f5471b83 [FIX] account: fixed untested code (that certainly never worked) when creating a cash register \!\!\!
bzr revid: qdp-launchpad@openerp.com-20120718141254-vy7cinlhy39c4295
2012-07-18 16:12:54 +02:00
Hardik 3fadbdcfc0 [IMP]Account : Changes in Warning Message
bzr revid: hsa@tinyerp.com-20120711084821-4reozitt3vgo9u31
2012-07-11 14:18:21 +05:30
Stephane Wirtel 02f2aee066 [IMP] account: account.journal, add default coins for a cash journal
bzr revid: stw@openerp.com-20120529120029-ttzrsum3ilhyvb1n
2012-05-29 14:00:29 +02:00
Stephane Wirtel c08b3fe9e4 [FIX] account: Fix the last_closing_balance field
bzr revid: stw@openerp.com-20120525122328-c17167sm5yun6q0o
2012-05-25 14:23:28 +02:00
Stephane Wirtel 9160712352 [FIX] account: add a last closing balance on the cash register object
bzr revid: stw@openerp.com-20120524080443-jv4rjvkmjcgs6db5
2012-05-24 10:04:43 +02:00
Fabien Pinckaers 56cfae3a8b [IMP] setting closing cash position on all journals which does not requires control
bzr revid: fp@openerp.com-20120513120812-yabr9ngdxh32xk0n
2012-05-13 14:08:12 +02:00
Fabien Pinckaers 341c6b0843 [IMP] PoS Backend
Improved layout of "PoS orders", "PoS Sessions" and "PoS Config" for useability
	Apply new design layouts for web client v7.0
	Rename PoS by Point of Sale everywhere
	Some typos, improved views
	Reviewed menu structure
"Default Point of Sale" field accessible through users preferences
PoS Config:
	Sequence is readonly
	Removed the "Draft" state --> easier, you do not need to active a PoS Config
	Default values on Shop and Journals
PoS Orders:
	Changed shop_id & journal_id on PoS Orders --> from normal fields to related field, depending on the session
Open Session:
	Fixed the wizard
	Several bugfixes and useability improvements
	Accounting Transactions posted at the close (not at the control)
Cash Registers:
	Lots of cleanups and bugfixes
Pos Sessions:
	Fixes and improved layout
	Better computation of all fields
	removed unused object "pos.config.journal"
PoS Orders:
	Default session_id

bzr revid: fp@openerp.com-20120512223743-b1vvbbybo8xq7e54
2012-05-13 00:37:43 +02:00
Stephane Wirtel 471bb6a67e [IMP] point_of_sale: show the opening and closing details
[FIX] point_of_sale: Use tools.translate library

bzr revid: stw@openerp.com-20120510074804-8jf12enzw3jghrrf
2012-05-10 09:48:04 +02:00
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