Commit Graph

170 Commits

Author SHA1 Message Date
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
Fabien Pinckaers ce874db95a [FIX] POS
bzr revid: fp@openerp.com-20121103152504-f3o6ce0e833hdibj
2012-11-03 16:25:04 +01:00
Fabien Pinckaers cd68364301 [MERGE] English typos
bzr revid: fp@openerp.com-20121102173407-umicel4287htim14
2012-11-02 18:34:07 +01:00
Vijaykumar Baladaniya 1fc8b2e611 [IMP]Improve tool tip.
bzr revid: vba@tinyerp.com-20121031072758-niyxbgdzih79mln1
2012-10-31 12:57:58 +05:30
Vijaykumar Baladaniya 510be6595c Improve tooltip.
bzr revid: vba@tinyerp.com-20121030131401-hf7oonmt0nkwfi1y
2012-10-30 18:44:01 +05:30
Vijaykumar Baladaniya de55e6d736 [MERGE]merge with trunk-terminology_batch2.
bzr revid: vba@tinyerp.com-20121029055922-pmwrqgxq8yo3qb20
2012-10-29 11:29:22 +05:30
Amit Patel 0bf0b95d67 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121029051732-hcgpnra148041ews
2012-10-29 10:47:32 +05:30
Vijaykumar Baladaniya 7850a91339 [IMP]Improve a tooltip.
bzr revid: vba@tinyerp.com-20121023130242-pu2o7e9x7lpr7g36
2012-10-23 18:32:42 +05:30
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Amit Patel 2762e94eb3 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121011052218-dx74aeg04h6azdmz
bzr revid: apa@tinyerp.com-20121012050113-w3b9fijrbxfyndxj
2012-10-12 10:31:13 +05:30
Sanjay Gohel (Open ERP) a014d89ab6 [IMP]add receipt ref for receipt in pos and pos order
bzr revid: sgo@tinyerp.com-20121005133315-qjwl6nx360em8u43
2012-10-05 19:03:15 +05:30
Randhir Mayatra (OpenERP) fbd443a66e [MERGE] merge with addons
bzr revid: rma@tinyerp.com-20121003103503-5rdpwbp2cecfmna0
2012-10-03 16:05:03 +05:30
Stephane Wirtel 3bd0b43e81 [FIX] point_of_sale: We use a callback for the 'Validate & Open
Session' button, because we want to open the PoS UI.
[FIX] point_of_sale: Hide/Show the opening/closing cash control

bzr revid: stw@openerp.com-20121001095254-bcteq9amp0eurn3g
2012-10-01 11:52:54 +02:00
Stephane Wirtel ff211c375a [FIX] point_of_sale: return the session id in the context for the call of the pos.ui
bzr revid: stw@openerp.com-20120927122022-fy2gx1z1xtkk14xt
2012-09-27 14:20:22 +02:00
Randhir Mayatra (OpenERP) 7146bf55aa [IMP] correct the string mistake in point of sale module
bzr revid: rma@tinyerp.com-20120926132702-einbzxd11utfn6qf
2012-09-26 18:57:02 +05:30
Stephane Wirtel 06852d994b [FIX] point_of_sale: Take the 'cash' journals if there is no specific cash journal for the Point Of Sale
bzr revid: stw@openerp.com-20120917120926-h3bzu2k9ds5lnjjr
2012-09-17 14:09:26 +02:00
Stephane Wirtel 7c9b5c8e5b [IMP] point_of_sale: If there is no journals for the pos.config, select the cash journals
bzr revid: stw@openerp.com-20120910091618-nzv26m258xx64na5
2012-09-10 11:16:18 +02:00
Thibault Delavallée 3982e5ba7a [IMP] mail_group, point of sale, hr: updated image fields help, as small and medium sizes are now 64x64 ans 128x128, to match more closely OpenERP image sizes. product: image_medium are not up-sized when resizing them. This means that images smaller than 128x128 won't be resized in image_medium. The purpose is to avoid having unwanted blank frame around images in POS.
bzr revid: tde@openerp.com-20120907095155-i5hlmidnkq7r2r7b
2012-09-07 11:51:55 +02:00
Thibault Delavallée b086b8a584 [CLEAN] mail_group, product, point_of_sale, hr: cleaned help of image, because it was too technical-related. Added a comment in code instead about PIL and base64. By the way, small cleaning of the white spaces.
bzr revid: tde@openerp.com-20120907092333-9f745210yr3p22ay
2012-09-07 11:23:33 +02:00
Stephane Wirtel 97de9d6d3f [FIX] point_of_sale: Set the right account for the internal account.
[REF] point_of_sale: Review the code for the Take Money Out and Push Money In.
[FIX] point_of_sale: Can post a session with an order in the invoiced state.

bzr revid: stw@openerp.com-20120905150538-v9ex7wehyebft7tu
2012-09-05 17:05:38 +02:00
Fabien Pinckaers 33897328bc [IMP] product view
bzr revid: fp@tinyerp.com-20120831164018-b8m7xhxi2na5eraj
2012-08-31 18:40:18 +02:00
Fabien Pinckaers 349c24a1cd [IMP] usability
bzr revid: fp@tinyerp.com-20120831163517-vqatk8mzl7u2vuym
2012-08-31 18:35:17 +02:00
Stephane Wirtel 7d120eb1d1 [FIX] point_of_sale: Set the right balance end for a bank statement
[FIX] point_of_sale: Show/Hide some tabs

bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
2012-08-29 17:46:34 +02:00
Stephane Wirtel 6aded504b3 [FIX] point_of_sale: redefine the copy function for the pos.config to avoid a copy of the sequence.
[IMP] point_of_sale: Associate a default category for the existing products.

bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
2012-08-29 14:25:01 +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
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