Commit Graph

146 Commits

Author SHA1 Message Date
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
Frédéric van der Essen 2e4d656dcb [IMP] point_of_sale: removed useless settings, Wubbit Twarks
bzr revid: fva@openerp.com-20120821104814-wuxk1qptj7xqr1i9
2012-08-21 12:48:14 +02:00
Stephane Wirtel 890371d982 [IMP] point_of_sale: fix some typo
[FIX] point_of_sale: add some groups

bzr revid: stw@openerp.com-20120817151529-1kkm9m5g5ob291ur
2012-08-17 17:15:29 +02:00
Frédéric van der Essen 715e52130f [IMP] point_of_sale: removed websql option from backend
bzr revid: fva@openerp.com-20120816160455-25gz0qb7kh0t3nfs
2012-08-16 18:04:55 +02:00
Frédéric van der Essen 01cb3ebb99 [MERGE] from trunk
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
Frédéric van der Essen 4c3e048d40 [MERGE WIP] merging from trunk. Still some issues with the thumbnails
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
Fabien Pinckaers 9bc2064028 [FIX] PoS import order from UI, return money
bzr revid: fp@openerp.com-20120811143309-pd44zfw6l67j7x7l
2012-08-11 16:33:09 +02:00
Fabien Pinckaers c17b2443e7 [IMP] improved UI for PoS - mainly forms version=7.0
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
Fabien Pinckaers cf57a87d41 [IMP] point of sale backend, useability improvements
bzr revid: fp@tinyerp.com-20120810134517-tenqseu6otf0rdin
2012-08-10 15:45:17 +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 4388ace499 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
2012-08-08 11:10:48 +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
Thibault Delavallée 023262e519 [IMP] product, hr, point of sale, mail_group: propagated function name change (now prefixed with image_) in image module.
bzr revid: tde@openerp.com-20120807111039-57cykhxurm2wj79k
2012-08-07 13:10:39 +02:00
Thibault Delavallée c8c95d46f9 [IMP] product, hr, pos, mail_group: removed the onchange_image, updated used images and classes in views.
bzr revid: tde@openerp.com-20120806155354-sjkrmrffgb2ik4ba
2012-08-06 17:53:54 +02:00
Thibault Delavallée 81f6d43ee4 [CLEAN] images: cleaned typos.
bzr revid: tde@openerp.com-20120730133343-f1jofji7bl9u09zp
2012-07-30 15:33:43 +02:00
Thibault Delavallée 82f4612f53 [REF] pos.category: category_image removed and replaced by image, image_medium and image_small, to standardize through OpenERP.
bzr revid: tde@openerp.com-20120730103301-rw0s7077m3ed7vj3
2012-07-30 12:33:01 +02:00
Thibault Delavallée 238598c041 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120730081600-y92rgh002zhpp4tw
2012-07-30 10:16:00 +02:00
Frédéric van der Essen 4201c58f36 [IMP] point_of_sale: edit ean wizards for users and products
bzr revid: fva@openerp.com-20120725142608-tsvrxvvxg42sx1yr
2012-07-25 16:26:08 +02:00
Frédéric van der Essen 26001a9b3c [wip] point_of_sale: ean template last fixes
bzr revid: fva@openerp.com-20120725125115-dnvslwyo6m6q0xw7
2012-07-25 14:51:15 +02:00
Saurang Suthar(OpenERP) b7a5a1d928 [IMP] Improved warning messages for POS module
bzr revid: pso@tinyerp.com-20120725104932-1awd9eerplzglhui
2012-07-25 16:19:32 +05:30
Saurang Suthar(OpenERP) e9f73afd66 [IMP] Improved warning messages for POS module
bzr revid: pso@tinyerp.com-20120725103449-iyhg19xu0m8ev0sk
2012-07-25 16:04:49 +05:30
Frédéric van der Essen f1fbf44b5c [WIP] point_of_sale: barcode validation wizard (wip)
bzr revid: fva@openerp.com-20120720170012-eqp81clbpbfsr3hl
2012-07-20 19:00:12 +02:00
Frédéric van der Essen cb22fd24d9 [MERGE+IMP] point_of_sale: merge from trunk aaaand (my bad) smaller category buttons when no icon
bzr revid: fva@openerp.com-20120717132048-dlezdn2late82ix1
2012-07-17 15:20:48 +02:00
Fabien Pinckaers 40fe783301 [IMP] remove print statement
bzr revid: fp@tinyerp.com-20120716164856-j7gicxtuhnnkap4h
2012-07-16 18:48:56 +02:00
Fabien Pinckaers 5e0cce7d55 [FIX] point of sale addons fixes + YAML test improve
bzr revid: fp@tinyerp.com-20120716164129-6u8ejw0h6rw3fstq
2012-07-16 18:41:29 +02:00
Frédéric van der Essen 7fa6ccb47e [FIX] point_of_sale: missing default images
bzr revid: fva@openerp.com-20120713143647-ys3jrymkb58ukygl
2012-07-13 16:36:47 +02:00
Frédéric van der Essen f8d32d3304 [MERGE] point_of_sale
bzr revid: fva@openerp.com-20120710142447-s0z5ca89bofh0n2c
2012-07-10 16:24:47 +02:00
Frédéric van der Essen 0a2c340f92 [IMP] point_of_sale: new weighting workflow
bzr revid: fva@openerp.com-20120709155351-u8cgp4ft14ytwfdw
2012-07-09 17:53:51 +02:00
Thibault Delavallée 3650c035f5 [IMP] product: images modified accordign to new spec. Propagated changes to stock/product and point of sale, and also to demo data.
bzr revid: tde@openerp.com-20120628090133-zmdbmjeiajhtmo3m
2012-06-28 11:01:33 +02:00
Stephane Wirtel da5d0d890c [IMP] point_of_sale: Add a photo on the pos category object
bzr revid: stw@openerp.com-20120607131930-tmov89slcyucgi15
2012-06-07 15:19:30 +02:00
Stephane Wirtel ed1ceca6f9 [FIX] point_of_sale: fix a bug in the create_from_ui function
bzr revid: stw@openerp.com-20120604160833-1ma8uim5usqgsfrc
2012-06-04 18:08:33 +02:00
Stephane Wirtel 357c91c4d4 [REF] point_of_sale: remove print statements
bzr revid: stw@openerp.com-20120604132637-ne679fbry13pvowr
2012-06-04 15:26:37 +02:00
Stephane Wirtel 98206ad425 [IMP] point_of_sale: Change the text of a field
bzr revid: stw@openerp.com-20120604132239-7t9px9qvhmsvqbxp
2012-06-04 15:22:39 +02:00
Stephane Wirtel 33354e8bc0 [FIX] point_of_sale: the create_from_ui function works fine now :-)
bzr revid: stw@openerp.com-20120604111550-196pwq62clodezq7
2012-06-04 13:15:50 +02:00
Stephane Wirtel 88e2b3f401 [FIX] point_of_sale: fix the group_by algo
bzr revid: stw@openerp.com-20120604105610-cvdaz2w2j6f81cwz
2012-06-04 12:56:10 +02:00
Stephane Wirtel 0b03d97146 [IMP] point_of_sale: group by product/tax in the account_move_line: to fix
bzr revid: stw@openerp.com-20120601154429-wtxf7ylo1jpe22ga
2012-06-01 17:44:29 +02:00
Stephane Wirtel 5e8e7f461c [IMP] point_of_sale: Create one account_move for the pos.session object
bzr revid: stw@openerp.com-20120601095356-89tygdydofcdogzg
2012-06-01 11:53:56 +02:00
Stephane Wirtel 1f99a8f8de [FIX] point_of_sale: remove unused 'get_current_session' method from the pos.session object
bzr revid: stw@openerp.com-20120531074713-3za9x5krv1fs41mj
2012-05-31 09:47:13 +02:00
Stephane Wirtel 4096fff322 [REF] point_of_sale: Remove unused code
bzr revid: stw@openerp.com-20120530144208-qh8898k2qaokbc9u
2012-05-30 16:42:08 +02:00
Stephane Wirtel fa7d30035c [FIX] point_of_sale: Fix the pos.session's workflow
bzr revid: stw@openerp.com-20120530143543-1dkfudbub83ga71c
2012-05-30 16:35:43 +02:00
Stephane Wirtel e83f930dcb [IMP] point_of_sale: move the 'to_weight' field from the pos.category to the product object
bzr revid: stw@openerp.com-20120529121556-q91gf18qf5a3uf1q
2012-05-29 14:15:56 +02:00
Stephane Wirtel bd78e2ce68 [IMP] point_of_sale: Call the front-end from the back-end
bzr revid: stw@openerp.com-20120525130759-tmkuks2nw9oy91ot
2012-05-25 15:07:59 +02:00
Stephane Wirtel cf46c8653c [FIX] point_of_sale: Fix some bugs
bzr revid: stw@openerp.com-20120525122415-30r3e2phsfdqgz8l
2012-05-25 14:24:15 +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 8607b4eb8a [IMP] tooltips on PoS
bzr revid: fp@openerp.com-20120513113937-v7e5bcvaqa87d0ku
2012-05-13 13:39:37 +02:00
Fabien Pinckaers 478f949df9 [IMP] useability, name get on sessions
bzr revid: fp@openerp.com-20120513110417-hv20fk3janm6h52f
2012-05-13 13:04:17 +02:00
Fabien Pinckaers bdac4ab7ad [FIX] pos backend, small bug
bzr revid: fp@openerp.com-20120513101641-7cpbvos3hcgnx91m
2012-05-13 12:16:41 +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 589b298125 [IMP] point_of_sale
bzr revid: stw@openerp.com-20120511212912-htftara5senojo1w
2012-05-11 23:29:12 +02:00
Stephane Wirtel 0df2c9e559 [IMP] point_of_sale: Add two constraints on the pos.session object.
1. We can't create twice sessions of the same user
2. We can't create twice sessions of the same config

[IMP] point_of_sale: In the PoS Session wizard, if the journal ask to check the opening control,
    we don't by pass the code

bzr revid: stw@openerp.com-20120510112533-hn6r6abyg1jxepj7
2012-05-10 13:25:33 +02:00