Amit Patel (OpenERP)
37ac236cc5
[IMP]:point_of_sale
...
bzr revid: apa@tinyerp.com-20120605132812-mblxngyk7qi6si3d
2012-06-05 18:58:12 +05:30
Stephane Wirtel
d251e07d88
[IMP] point_of_sale: add a guardian for the account.bank.statement
...
bzr revid: stw@openerp.com-20120605122314-byw2uq6hjlas0052
2012-06-05 14:23:14 +02:00
Stephane Wirtel
668b82d0a9
[FIX] point_of_sale: remove the call of the report in the pos.payment wizard
...
bzr revid: stw@openerp.com-20120605113839-c7pb1czizw38epau
2012-06-05 13:38:39 +02:00
Frédéric van der Essen
7c5324ead0
[IMP] point_of_sale: shut down button and correct cashregister in selfCheckout
...
bzr revid: fva@openerp.com-20120605094503-mh5wi096w704le5k
2012-06-05 11:45:03 +02:00
Frédéric van der Essen
5702fe9301
[MERGE] point_of_sale: from stw: also draft of client integration
...
bzr revid: fva@openerp.com-20120604162722-e8vf0w3z1xpeafcc
2012-06-04 18:27:22 +02:00
Frédéric van der Essen
ac91821836
[MERGE] point_of_sale: from stw, also draft of client payment integration
...
bzr revid: fva@openerp.com-20120604162607-hvk3kmjwzhbfwo11
2012-06-04 18:26:07 +02:00
Stephane Wirtel
fea9d6eae3
[IMP] point_of_sale: Add a 'self_checkout' flag on the journal
...
bzr revid: stw@openerp.com-20120604162326-ggwjedp5ht8b5wtf
2012-06-04 18:23:26 +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
Frédéric van der Essen
616bb7430e
[WIP] point_of_sale: debug log tbrl
...
bzr revid: fva@openerp.com-20120604152555-o175256oxe2ywl3x
2012-06-04 17:25:55 +02:00
Frédéric van der Essen
54ecdba716
[FIX] point_of_sale: scale button removed when no scale, range check on discount & prices, skip receipt if printer
...
bzr revid: fva@openerp.com-20120604150459-96z5e1h0kv02d4uo
2012-06-04 17:04:59 +02:00
Stephane Wirtel
2bad8fa3e9
[IMP] point_of_sale: Add some photos for some products
...
bzr revid: stw@openerp.com-20120604140135-pi050phmf3njj3nn
2012-06-04 16:01:35 +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
58ab8e24b8
[IMP] point_of_sale: Hide a lot of fields
...
bzr revid: stw@openerp.com-20120604132521-u7jvosz7ff2884rh
2012-06-04 15:25:21 +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
Fabien Pinckaers
48f8823bad
[IMP] replaced all oe_form_topbar with the new <header> style
...
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
Frédéric van der Essen
6b8be91a6a
[MERGE] point_of_sale: order posting fixes from stw
...
bzr revid: fva@openerp.com-20120604120613-qvwwkyo200kowu0q
2012-06-04 14:06:13 +02:00
Frédéric van der Essen
123365d569
[IMP] point_of_sale: weighted categories, removed scan button, reinstated debug_devices
...
bzr revid: fva@openerp.com-20120604115244-mbhybtte8y2md4nh
2012-06-04 13:52:44 +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
Fabien Pinckaers
623fd428bd
[IMP] xml of topbars, removed oe_right, oe_clear
...
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Divyesh Makwana (Open ERP)
dff4b2f2a0
[Merge] Merge with main branch.
...
bzr revid: mdi@tinyerp.com-20120604063834-jbfyvot5fjvc4pz7
2012-06-04 12:08:34 +05:30
Launchpad Translations on behalf of openerp
37e59e65b3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120602053534-4xf38jpw24x0ygoy
bzr revid: launchpad_translations_on_behalf_of_openerp-20120603044716-ry3q2wjfq5d1j3cd
2012-06-03 04:47:16 +00: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
Divyesh Makwana (Open ERP)
e98eb11510
[Merge] Merge with main branch.
...
bzr revid: mdi@tinyerp.com-20120601094937-575f84vxwljlgkpv
bzr revid: mdi@tinyerp.com-20120601123900-0ozu8nlq02upa8xb
bzr revid: mdi@tinyerp.com-20120601124121-oz0cr3gv4acejs7b
2012-06-01 18:11:21 +05:30
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
Launchpad Translations on behalf of openerp
35962e14c7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120530052141-q5f1v0sy78otub9z
bzr revid: launchpad_translations_on_behalf_of_openerp-20120531045446-04uliakw3b3goo8z
bzr revid: launchpad_translations_on_behalf_of_openerp-20120601053333-oz6dl9s9bsla52ld
2012-06-01 05:33:33 +00:00
Frédéric van der Essen
f4b585bf71
[FIX] point_of_sale: missing file : loader.gif
...
bzr revid: fva@openerp.com-20120601051419-9sp6j1vos6kqa5bn
2012-06-01 07:14:19 +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
Frédéric van der Essen
a9058af8f7
[MERGE] point_of_sale: from stw
...
bzr revid: fva@openerp.com-20120530222324-j991jd764i5of03r
2012-05-31 00:23:24 +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
3fc019e343
[REF] point_of_sale: remove unused code
...
bzr revid: stw@openerp.com-20120530143624-83qsq5m41qikpen9
2012-05-30 16:36:24 +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
Frédéric van der Essen
fd2d1a940b
[WIP] point_of_sale: emergency merge
...
bzr revid: fva@openerp.com-20120530110624-4caalfhlfmj9rpo4
2012-05-30 13:06:24 +02:00
Frédéric van der Essen
26a722c910
[MERGE] point_of_sale: from stw
...
bzr revid: fva@openerp.com-20120529164050-py5socstpho8i5b3
2012-05-29 18:40:50 +02:00
Frédéric van der Essen
a81a9177f1
[IMP] point_of_sale: new category system
...
bzr revid: fva@openerp.com-20120529163944-crk8dblg7t6b2ove
2012-05-29 18:39:44 +02:00
Frédéric van der Essen
33c4a6177e
[FIX] point_of_sale: related bankstatements are correctly associated, Also wip category system
...
bzr revid: fva@openerp.com-20120529140008-w5ofj50a20e5251d
2012-05-29 16:00:08 +02:00
Stephane Wirtel
cd458e7932
[IMP] point_of_sale: Add a report for the printing of the EAN13
...
bzr revid: stw@openerp.com-20120529133642-td13jd3sxwi0cbj0
2012-05-29 15:36:42 +02:00
Frédéric van der Essen
a6f263b323
[MERGE] point_of_sale: from stw
...
bzr revid: fva@openerp.com-20120529133230-5532hn68a4sa3yim
2012-05-29 15:32:30 +02:00
Frédéric van der Essen
df65b651e5
[FIX] point_of_sale: crash when adding product. Also draft of new categories system
...
bzr revid: fva@openerp.com-20120529133141-wz1op0ep6a1l18e0
2012-05-29 15:31:41 +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
Divyesh Makwana (Open ERP)
aa495b790e
[IMP] point_of_sale : Removed all filters related to a date field and added the related date field in the search view.
...
bzr revid: mdi@tinyerp.com-20120528093341-x7dvpnknwez9w1bs
2012-05-28 15:03:41 +05:30
Divyesh Makwana (Open ERP)
0c2acefc6c
[IMP] point_of_sale : fix the eeror.
...
bzr revid: mdi@tinyerp.com-20120528071918-sdthomsohyev6lrt
2012-05-28 12:49:18 +05:30
Divyesh Makwana (Open ERP)
ce6d03c66a
[IMP] point_of_sale : Removed all filters related to a date field and added the related date field in the search view.
...
bzr revid: mdi@tinyerp.com-20120528064241-imvko29lik159xal
2012-05-28 12:12:41 +05:30
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
Frédéric van der Essen
00b7fefcc4
[IMP] point_of_sale: adding a session opening popup if no session
...
bzr revid: fva@openerp.com-20120525121539-qaywet30fcst1lvv
2012-05-25 14:15:39 +02:00
Frédéric van der Essen
d82f9f6c9d
[FIX] point_of_sale: only show weightable products in scale screens
...
bzr revid: fva@openerp.com-20120524153315-wa67qcyldrui8nrf
2012-05-24 17:33:15 +02:00
Frédéric van der Essen
f5679b7b8d
[IMP] point_of_sale: put the receipt screen buttons in the action bar
...
bzr revid: fva@openerp.com-20120524141408-10ru52eqcjbew2rw
2012-05-24 16:14:08 +02:00
Frédéric van der Essen
68a5af5711
[IMP] point_of_sale: put the payment screen controls in the action bar
...
bzr revid: fva@openerp.com-20120524133930-z3pwpinc6rdj86l3
2012-05-24 15:39:30 +02:00
Frédéric van der Essen
8ef967a392
[FIX] point_of_sale: paypad buttons now show the journal name
...
bzr revid: fva@openerp.com-20120524102257-wek9mozgvk9ww3p3
2012-05-24 12:22:57 +02:00
Frédéric van der Essen
c12dddf7a7
[FIX] point_of_sale: removed debug_devices. now uses real devices
...
bzr revid: fva@openerp.com-20120523160255-fkoosqnpvcms3ro2
2012-05-23 18:02:55 +02:00
Frédéric van der Essen
dbba492cb9
[FIX] point_of_sale: payment_screen remained visible after first order
...
bzr revid: fva@openerp.com-20120523152535-o89hee21ztrn7e55
2012-05-23 17:25:35 +02:00
Frédéric van der Essen
a4b9500758
[IMP] point_of_sale: draft of open_cashbox() and print_receipt() proxy calls
...
bzr revid: fva@openerp.com-20120523140153-gkf998rszs7t0ddr
2012-05-23 16:01:53 +02:00
Frédéric van der Essen
c316dad6d6
[IMP] proxy upgraded to new JsonRPC API
...
bzr revid: fva@openerp.com-20120523130011-mhso33xqk9aau5kc
2012-05-23 15:00:11 +02:00
Frédéric van der Essen
7bd09320ce
[IMP] point_of_sale: orderlines are correctly merged
...
bzr revid: fva@openerp.com-20120523124754-lxzbqmzx2r9tn11p
2012-05-23 14:47:54 +02:00
Fabien Pinckaers
5c791531aa
[IMP] improved typos
...
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
Frédéric van der Essen
c4861d05ad
[IMP] point_of_sale: orderlines are correctly merged
...
bzr revid: fva@openerp.com-20120522145956-t0d3xnzx8f8mz15s
2012-05-22 16:59:56 +02:00
Frédéric van der Essen
5ee1007bf2
[FIX] point_of_sale: retrieve bank_statements associated to current session only
...
bzr revid: fva@openerp.com-20120522125332-t6epspfeqxknjypo
2012-05-22 14:53:32 +02:00
Frédéric van der Essen
a06edf236d
[FIX] point_of_sale: payment screen widget now works ok
...
bzr revid: fva@openerp.com-20120522103225-n4r03smsocyv0rrn
2012-05-22 12:32:25 +02:00
Frédéric van der Essen
785100c74c
[MERGE] trunk
...
bzr revid: fva@openerp.com-20120522093137-eqaen4t49ukcmj6f
2012-05-22 11:31:37 +02:00
Fabien Pinckaers
b3fa4ccf5c
[IMP] removed icons from topbar
...
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
Fabien Pinckaers
ee566d388c
[IMP] merged topbar status widgets
...
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
Frédéric van der Essen
95112359b4
[IMP] point_of_sale: cleaned paypad, put pos_widget in all PosWidget childrens
...
bzr revid: fva@openerp.com-20120521165721-vi81vnj0fpu30rrj
2012-05-21 18:57:21 +02:00
Frédéric van der Essen
ef2c6d95f8
[IMP] point_of_sale: some cleaning in pos_models.js
...
bzr revid: fva@openerp.com-20120521140901-q5ofbhar04qqnrsq
2012-05-21 16:09:01 +02:00
Frédéric van der Essen
959c3a82ac
[FIX] point_of_sale: starting to revert cashregister removal
...
bzr revid: fva@openerp.com-20120521091442-m7nizf0dv60ehy9k
2012-05-21 11:14:42 +02:00
Amit Patel (OpenERP)
1aefff9733
[MERGE]:merged from trunk
...
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
Frédéric van der Essen
313496382a
[FIX] Forgot to add pos_basewidget.js
...
bzr revid: fva@openerp.com-20120516130142-5u23uerr5s8y7ydq
2012-05-16 15:01:42 +02:00
Frédéric van der Essen
f2051414f7
[MERGE] trunk
...
bzr revid: fva@openerp.com-20120514155031-x7h0f12110g2gqhb
2012-05-14 17:50:31 +02:00
Frédéric van der Essen
bce82f1800
[REF] point_of_sale: removing obsolete file 'pos2.js'
...
bzr revid: fva@openerp.com-20120514154103-9mn4313q2kuylzvv
2012-05-14 17:41:03 +02:00
Frédéric van der Essen
3a52dbb43a
[IMP] point_of_sale: Added a Session Error popup
...
bzr revid: fva@openerp.com-20120514143121-m5tmqhwanf8tube9
2012-05-14 16:31:21 +02:00
Frédéric van der Essen
e4b1260ace
[MERGE] point_of_sale: merging pos backend updates from fp
...
bzr revid: fva@openerp.com-20120514140751-mqmhjf9oejyub3x5
2012-05-14 16:07:51 +02:00
Frédéric van der Essen
c48ae3cf5b
Removed qweb_template and OldWidget
...
bzr revid: fva@openerp.com-20120514140340-5cjkget2wjfsnuva
2012-05-14 16:03:40 +02:00
Launchpad Translations on behalf of openerp
420e45e139
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120511051518-305vmplvaiu2zncy
bzr revid: launchpad_translations_on_behalf_of_openerp-20120512054219-7jxlr0c1whe4vrob
bzr revid: launchpad_translations_on_behalf_of_openerp-20120513044345-ujj9bgbnd64gpfnz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120514044358-vu4410a564766u5f
2012-05-14 04:43:58 +00: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
a45072238e
IMP
...
bzr revid: fp@openerp.com-20120513103351-pjymo4jf4grh8pjw
2012-05-13 12:33:51 +02:00
Fabien Pinckaers
94c98bab2a
[IMP] Removed bad report
...
bzr revid: fp@openerp.com-20120513103058-n0lusjarb4vxu7nh
2012-05-13 12:30:58 +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
Frédéric van der Essen
aff86833ff
Starting to completely remove template_fct and OldWidget
...
bzr revid: fva@openerp.com-20120511160223-uplh5mohr19skv02
2012-05-11 18:02:23 +02:00
Raphael Collet
275a534aee
[IMP] adapt po files to label changes, to ease translations
...
bzr revid: rco@openerp.com-20120510134119-pqsaa0r683f2rn25
2012-05-10 15:41:19 +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
Stephane Wirtel
740fb5bf05
[FIX] point_of_sale: Hide or show the details of the balance of the
...
session
bzr revid: stw@openerp.com-20120510110123-ys5b721s45fzt2ek
2012-05-10 13:01:23 +02:00
Stephane Wirtel
2d0a262d4d
[IMP] point_of_sale: Add a wizard for the Session Opening
...
bzr revid: stw@openerp.com-20120510103543-ytwq5brqypnibml5
2012-05-10 12:35: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
23ca8aaa38
[IMP] point_of_sale: Add the statement line with the right statement"
...
[IMP] point_of_sale: Add a new iface boolean for the printing
bzr revid: stw@openerp.com-20120509151221-hbkcpxp5vwck7x50
2012-05-09 17:12:21 +02:00
Stephane Wirtel
2ce2c446c8
[FIX] point_of_sale: remove the related actions
...
bzr revid: stw@openerp.com-20120509144201-831n0f5nihbkqgyu
2012-05-09 16:42:01 +02:00
Stephane Wirtel
c57cc2a2b6
[FIX] point_of_sale: Confirm the bank statements for the pos session
...
[FIX] account_bank_statement_extensions: fix
bzr revid: stw@openerp.com-20120509144108-n5ol7twovy639s7s
2012-05-09 16:41:08 +02:00
Stephane Wirtel
b4d61d8de9
[IMP] point_of_sale: Add a list of bank statement in the PoS Session
...
bzr revid: stw@openerp.com-20120509142211-z1x3c24tya2rcvyb
2012-05-09 16:22:11 +02:00
Stephane Wirtel
a4dd08a340
[IMP] point_of_sale: review the session workflow
...
[REF] point_of_sale: move the 'to_weight' field into the pos.category
bzr revid: stw@openerp.com-20120509133018-mu06479yu2yahvu4
2012-05-09 15:30:18 +02:00
Stephane Wirtel
cd171effd5
[FIX] point_of_sale: Use the right values for the state and fix the closing button
...
bzr revid: stw@openerp.com-20120509103959-dgb2qzd7v1afh2hp
2012-05-09 12:39:59 +02:00
Stephane Wirtel
1050ef628c
[IMP] point_of_sale: Show a popup when there is no pos session
...
bzr revid: stw@openerp.com-20120509095555-sw6h3acxl9pn1537
2012-05-09 11:55:55 +02:00
Frédéric van der Essen
c2bb090836
merge from stw
...
bzr revid: fva@openerp.com-20120509094636-kqlmd9gf6y33ehn1
2012-05-09 11:46:36 +02:00
Frédéric van der Essen
8a09bcf83e
removed debug logs, fixed product barcode scanning
...
bzr revid: fva@openerp.com-20120509094438-0vibc269r3ayb6ta
2012-05-09 11:44:38 +02:00
Stephane Wirtel
ca2db3740e
[IMP] point_of_sale: Add the EAN13 field on the user with validation
...
bzr revid: stw@openerp.com-20120509093517-24lw0pbiqum0wpw1
2012-05-09 11:35:17 +02:00
Stephane Wirtel
f638ce36cf
[IMP] point_of_sale: Add the 'to_weight' field on the category for the weight
...
bzr revid: stw@openerp.com-20120509083940-akzpgtwkre87rczr
2012-05-09 10:39:40 +02:00
Stephane Wirtel
2def801d80
[IMP] point_of_sale: Add some fields in readonly mode
...
bzr revid: stw@openerp.com-20120509081942-oo65eepvzi0whz03
2012-05-09 10:19:42 +02:00
Stephane Wirtel
8f4c7e161d
[FIX] point_of_sale: Check if there is at least one record
...
bzr revid: stw@openerp.com-20120508164226-1vn2ub22ioo5gtly
2012-05-08 18:42:26 +02:00
Stephane Wirtel
b00b7a6434
[FIX] point_of_sale: Add the ean13 field in the frontend
...
bzr revid: stw@openerp.com-20120508154942-sou5eycvhxd8st5w
2012-05-08 17:49:42 +02:00
Frédéric van der Essen
d70107e5d4
Merge backend integration from stw
...
bzr revid: fva@openerp.com-20120508154217-2n31oip0fb9i654z
2012-05-08 17:42:17 +02:00
Frédéric van der Essen
7e38590ac3
Forgot to add pictures, handling of codebar scanning in popups, client mode payment fixes
...
bzr revid: fva@openerp.com-20120508154030-f62eahx7c801lxnz
2012-05-08 17:40:30 +02:00
Stephane Wirtel
72c89a2028
[FIX] point_of_sale: Begin the connection between the frontend and the backend
...
bzr revid: stw@openerp.com-20120508152805-874rbq1jv8mpvwo6
2012-05-08 17:28:05 +02:00
Frédéric van der Essen
d4cbce0ce7
barcode scanning fixes
...
bzr revid: fva@openerp.com-20120508123701-pb641zlrwd183pf1
2012-05-08 14:37:01 +02:00
Frédéric van der Essen
713b475010
merge from stw
...
bzr revid: fva@openerp.com-20120507141953-z4eppa58y25q5tz5
2012-05-07 16:19:53 +02:00
Frédéric van der Essen
2227cfc68d
debug logs
...
bzr revid: fva@openerp.com-20120507141857-1t3fv90kw9v4b7bn
2012-05-07 16:18:57 +02:00
Stephane Wirtel
9fe2a57c11
[REF] Remove the pdb call
...
bzr revid: stw@openerp.com-20120507141409-kfhugzui4z1d9pox
2012-05-07 16:14:09 +02:00
Frédéric van der Essen
c1ab0111f3
Merge from stw
...
bzr revid: fva@openerp.com-20120507133956-ktp7u5t7q1qcsu72
2012-05-07 15:39:56 +02:00
Frédéric van der Essen
5516784233
barcode reader simulation
...
bzr revid: fva@openerp.com-20120507131414-svwk1fbvc25rztza
2012-05-07 15:14:14 +02:00
Stephane Wirtel
6cefb2c802
[FIX] point_of_sale: Fix some bugs
...
bzr revid: stw@openerp.com-20120507130946-13i3yq82oi69zjjt
2012-05-07 15:09:46 +02:00
Frédéric van der Essen
b0e1d063f7
merge fix from antony
...
bzr revid: fva@openerp.com-20120507124110-5t71dhfyulak5k9e
2012-05-07 14:41:10 +02:00
Frédéric van der Essen
2c6acfab41
More Popups, total is updated
...
bzr revid: fva@openerp.com-20120507123932-mm38346wbz3ynt3k
2012-05-07 14:39:32 +02:00
Frédéric van der Essen
b8427b9a85
Further progress : Help Popup, Weighting
...
bzr revid: fva@openerp.com-20120506213439-0met6jzt93r5thry
2012-05-06 23:34:39 +02:00
Antony Lesuisse
d9948b6bad
[FIX] point_of_sale typo only load pos enabled products
...
bzr revid: al@openerp.com-20120505161252-ozwb5ekestuthee4
2012-05-05 18:12:52 +02:00
Stephane Wirtel
d7b5e5a6ef
[IMP] point_of_sale: create a session if there is not session for the connected user
...
bzr revid: stw@openerp.com-20120504152720-nqfhr5aclihpfiis
2012-05-04 17:27:20 +02:00
Stephane Wirtel
0f8529cb36
[MERGE] lp:~openerp-dev/openobject-addons/trunk-pos-fva
...
bzr revid: stw@openerp.com-20120504131853-rip17dks4fjxzwbp
2012-05-04 15:18:53 +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
Frédéric van der Essen
e56de26bcc
removed custom help buttons
...
bzr revid: fva@openerp.com-20120504123033-mffgt1x9swahq5oe
2012-05-04 14:30:33 +02:00
Frédéric van der Essen
5fafeb4c89
New action bar draft
...
bzr revid: fva@openerp.com-20120504122448-bhs06j1lgoauss58
2012-05-04 14:24:48 +02:00
Saurang Suthar (OpenERP)
8ad4e455b0
[IMP]:improved title Salesmen by Salespeople everywhere
...
bzr revid: ssu@tinyerp.com-20120504122206-aiu8lt0suh9xp230
2012-05-04 17:52:06 +05:30
Saurang Suthar (OpenERP)
2ad3b32160
[IMP]:improved title Minimum Salesman by Salesperson everywhere
...
bzr revid: ssu@tinyerp.com-20120504121326-nqpx2eyqc1qrp04w
2012-05-04 17:43:26 +05:30
Saurang Suthar (OpenERP)
a2a05cfc19
[IMP]:improved titles State by Status everywhere
...
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Frédéric van der Essen
bf9fc9b13c
Showing and hiding widgets in different screens and modes
...
bzr revid: fva@openerp.com-20120504102737-gfi4kggapocpnxrk
2012-05-04 12:27:37 +02:00
Frédéric van der Essen
22c0ae2d8b
Client and cashier mode
...
bzr revid: fva@openerp.com-20120504094825-fb0ku12w3kq1ubcf
2012-05-04 11:48:25 +02:00
Frédéric van der Essen
fa4b14487d
Forgot to add pos_screens.js
...
bzr revid: fva@openerp.com-20120503171523-rmew4wbblrw3hpyk
2012-05-03 19:15:23 +02:00
Frédéric van der Essen
5c5d4450af
[Merge] from trunk
...
bzr revid: fva@openerp.com-20120503165929-yyffn0oi03y90ub6
2012-05-03 18:59:29 +02:00
Frédéric van der Essen
850ed87082
Draft of the product scale screen
...
bzr revid: fva@openerp.com-20120503164032-zoe5rini8lj7kw1i
2012-05-03 18:40:32 +02:00
Frédéric van der Essen
05535cf4e9
Added a few more screens
...
bzr revid: fva@openerp.com-20120503162746-lo7m3qno48jcanyz
2012-05-03 18:27:46 +02:00
Frédéric van der Essen
54152c805d
Proxy Interface, Made barcode scanner generic
...
bzr revid: fva@openerp.com-20120503121441-wrmku0twt2414kho
2012-05-03 14:14:41 +02:00
Frédéric van der Essen
a7d742082b
Refactored Steps into Screens, with a different widget for each screen
...
bzr revid: fva@openerp.com-20120502153000-5hnh3zv122xdav47
2012-05-02 17:30:00 +02:00
Amit Patel (OpenERP)
70c7252b2c
[IMP]
...
bzr revid: apa@tinyerp.com-20120502055006-yhsd5qwpc0asfn7b
2012-05-02 11:20:06 +05:30
Stephane Wirtel
b9f8c8dec1
[FIX] fix some bugs in the point of sale
...
bzr revid: stw@openerp.com-20120430150557-5hw97hbcze4ngw3b
2012-04-30 17:05:57 +02:00
Stephane Wirtel
979db6e965
[FIX] point_of_sale: add the callbacks for the workflow of the pos.session object
...
bzr revid: stw@openerp.com-20120430150526-ktdp7lag0jfrjxkw
2012-04-30 17:05:26 +02:00
Stephane Wirtel
04e7d4123e
[FIX] point_of_sale: Use the right object for the Take Money Out
...
bzr revid: stw@openerp.com-20120430150458-hsv8gk4773pmots1
2012-04-30 17:04:58 +02:00
Stephane Wirtel
f7b3ba8bf5
[MERGE] lp:openobject-addons
...
bzr revid: stw@openerp.com-20120430142521-t6vl6f3csab038k8
2012-04-30 16:25:21 +02:00
Stephane Wirtel
afa3cf71e8
[REF] Remove unused file
...
bzr revid: stw@openerp.com-20120430092719-st813fyhkkqstbcf
2012-04-30 11:27:19 +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
Frédéric van der Essen
a2a24f2cd4
Draft of Screen API for Screen widgets
...
bzr revid: fva@openerp.com-20120426144701-s392ynlxdetnwtvk
2012-04-26 16:47:01 +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
Frédéric van der Essen
67341a8cef
Add test button
...
bzr revid: fva@openerp.com-20120426112655-s6j7qt098ptecwwf
2012-04-26 13:26:55 +02:00
Frédéric van der Essen
2416f64ca2
Merged POSWidget and ShopWidget
...
bzr revid: fva@openerp.com-20120426100548-chrc9sdozi8hhjq6
2012-04-26 12:05:48 +02:00
Mayur Maheshwari (OpenERP)
c71446957f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
Turkesh Patel (Open ERP)
ba08369045
[IMP] point_of_sale: improved view.
...
bzr revid: tpa@tinyerp.com-20120426085111-0ewm61gmf34wab2d
2012-04-26 14:21:11 +05:30
Frédéric van der Essen
4a488a32bb
Merged App and POSWidget
...
bzr revid: fva@openerp.com-20120425145555-hk48b24efi6f3nti
2012-04-25 16:55:55 +02:00
Raphael Collet
72a685bc8e
[IMP] multi_company, point_of_sale: remove group_extended
...
bzr revid: rco@openerp.com-20120425144611-hk2y9euk5kigqx46
2012-04-25 16:46:11 +02:00
Stephane Wirtel
0f5be3184d
[MERGE]
...
bzr revid: stw@openerp.com-20120425142459-48afvhj8obflfive
2012-04-25 16:24:59 +02:00
Frédéric van der Essen
2ae6854f17
extracted the Barcode reader into a new submodule
...
bzr revid: fva@openerp.com-20120425113802-3o5qty2auy50ne8r
2012-04-25 13:38:02 +02:00
Frédéric van der Essen
e8e7304723
[PoS] Merged the PosModel and Shop classes
...
bzr revid: fva@openerp.com-20120424172047-1wz31qi2hih3decs
2012-04-24 19:20:47 +02:00
Frédéric van der Essen
bbbf338436
[PoS] Removed old pos.js file
...
bzr revid: fva@openerp.com-20120424162802-o2diexi57p02fjr8
2012-04-24 18:28:02 +02:00
Frédéric van der Essen
4efe726fdf
[POS] Split the pos code into files
...
bzr revid: fva@openerp.com-20120424162546-3w604gxmfb0ezt47
2012-04-24 18:25:46 +02:00
Frédéric van der Essen
8a9ce7b98e
[PoS] Removed pos global variable
...
bzr revid: fva@openerp.com-20120424140257-jn0fadimt6o62qhc
2012-04-24 16:02:57 +02:00
Mayur Maheshwari (OpenERP)
9e59ce8812
[IMP]all: Improve all typos
...
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
Stephane Wirtel
9abe987baa
[REF] point_of_sale: indent the view
...
bzr revid: stw@openerp.com-20120423112737-0dyprjg0e3uxa80x
2012-04-23 13:27:37 +02:00
Stephane Wirtel
a13523d422
[IMP] point_of_sale: add some functions in the skeleton of the proxy
...
bzr revid: stw@openerp.com-20120423110403-v3leyy5pki6l1xdw
2012-04-23 13:04:03 +02:00
Divyesh Makwana (Open ERP)
491641a31c
[IMP] all : Improved the typos.
...
bzr revid: mdi@tinyerp.com-20120423102003-ze3x042iee031530
2012-04-23 15:50:03 +05:30
Frédéric van der Essen
82ce9a94d3
[AARGH] First deglobalization of the pos variable, renamed to posmodel
...
bzr revid: fva@openerp.com-20120420144611-5v0yod3bxo7odwaf
2012-04-20 16:46:11 +02:00
Frédéric van der Essen
dd42fc4a03
[IMP] Images for the action bar
...
bzr revid: fva@openerp.com-20120418155314-s9i15jzid5xuv9j1
2012-04-18 17:53:14 +02:00
Frédéric van der Essen
3a10debd1f
[IMP] action bar
...
bzr revid: fva@openerp.com-20120418141144-g2653zv5vn33xfm5
2012-04-18 16:11:44 +02:00
niv-openerp
b12d4bce8d
[imp] implemented dao interface
...
bzr revid: nicolas.vanhoren@openerp.com-20120417091836-ej2g238h7x7firnp
2012-04-17 11:18:36 +02:00
niv-openerp
43358fe249
[imp] renammed products to product_list for lisibility
...
bzr revid: nicolas.vanhoren@openerp.com-20120416171042-304swvgac38mrmkm
2012-04-16 19:10:42 +02:00
niv-openerp
2b2a203a04
[imp] completely removed store class
...
bzr revid: nicolas.vanhoren@openerp.com-20120416170721-swgsf8pyeg7y8uf8
2012-04-16 19:07:21 +02:00
niv-openerp
88eeba0864
[imp] removed all references to model names
...
bzr revid: nicolas.vanhoren@openerp.com-20120416170407-l1jv5i6j06rh6dus
2012-04-16 19:04:07 +02:00
niv-openerp
5f69244e75
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20120416165630-sk808rmb31ztjqsf
2012-04-16 18:56:30 +02:00
niv-openerp
81148c0b09
[imp] extracted fetch to make it less generic
...
bzr revid: nicolas.vanhoren@openerp.com-20120416162049-9mjgz6ul0zq1lzag
2012-04-16 18:20:49 +02:00
Frédéric van der Essen
e81d9fd69e
Dummy asynchronous storage as a preparation for a proper db
...
bzr revid: fva@openerp.com-20120416161203-3dd0oc9ywe5pvard
2012-04-16 18:12:03 +02:00
Frédéric van der Essen
c9a57f0921
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120416142215-vz4d1cthpplh1hk8
2012-04-16 16:22:15 +02:00
Frédéric van der Essen
e90e598dff
Renamed db to session, draft of the SqlStore
...
bzr revid: fva@openerp.com-20120416104144-ijzqhul3m7r0b62g
2012-04-16 12:41:44 +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
Stephane Wirtel
71f6177e3c
[MERGE] Upstream
...
bzr revid: stw@openerp.com-20120416090011-bnijlgpndgb5wiyq
2012-04-16 11:00:11 +02:00
Roberto López López (OpenERP)
0d3cd92c1b
[fix] substitute this by self, this.shop is out of scope
...
bzr revid: rlo@openerp.com-20120413140421-w2ff0cryr96l5djk
2012-04-13 16:04:21 +02:00
Stephane Wirtel
ece5700585
[FIX] point_of_sale: Add the missing declaration in the MANIFEST files
...
bzr revid: stw@openerp.com-20120413134735-q1dwonvauebcooht
2012-04-13 15:47:35 +02:00
Stephane Wirtel
f7dbac942a
[IMP] point_of_sale: Add the proxy skeleton
...
bzr revid: stw@openerp.com-20120413041759-kkizmoau2ns6xi82
2012-04-13 06:17:59 +02:00
Stephane Wirtel
cd7d047cf8
[IMP] point_of_sales: Add the POS Session
...
bzr revid: stw@openerp.com-20120410112429-dckcpq3hfemlnr5n
2012-04-10 13:24:29 +02:00
Frédéric van der Essen
bd12aebe28
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120410104356-3yp2i199xk3wei7e
2012-04-10 12:43:56 +02:00
Frédéric van der Essen
a6526301f9
[IMP] some refactoring of the pos
...
bzr revid: fva@openerp.com-20120410104247-bfk6031bn861091v
2012-04-10 12:42:47 +02:00
Frédéric van der Essen
7a54f94ac0
[IMP] First working draft of the OnScreen Keyboard
...
bzr revid: fva@openerp.com-20120405125843-axg3m7h10g5sg6mx
2012-04-05 14:58:43 +02:00
Stephane Wirtel
bc05498416
[IMP] point_of_sale: Add the POS Config object
...
bzr revid: stw@openerp.com-20120404123114-e557auyszvy4uy3a
2012-04-04 14:31:14 +02:00
Raphael Collet
ba1454149c
[IMP] groups: remove auto-inclusion of admin in groups, and make the inclusion explicit in groups
...
bzr revid: rco@openerp.com-20120404090830-nteimn2kvz8nkk7h
2012-04-04 11:08:30 +02:00
Antony Lesuisse
5faa8d6ece
[MERGE] trunk
...
bzr revid: al@openerp.com-20120403131828-ld6asopdwy98t0dt
2012-04-03 15:18:28 +02:00
Frédéric van der Essen
ef10d28de9
[FIX] Comment in the wrong place
...
bzr revid: fva@openerp.com-20120403084658-j19s285vjd307ag7
2012-04-03 10:46:58 +02:00
Roberto López López (OpenERP)
34610c1e61
[fix] modify according to review: split functionalities into different functions
...
bzr revid: rlo@openerp.com-20120403082803-hvvd65cl64qmzvms
2012-04-03 10:28:03 +02:00
Raphael Collet
017c5f8290
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120403082756-egpot17iztniu8tr
2012-04-03 10:27:56 +02:00
Frédéric van der Essen
a7bdd4e172
[FIX] Remove debug console.log
...
bzr revid: fva@openerp.com-20120402161754-dmhty19ag58aow2q
2012-04-02 18:17:54 +02:00
Frédéric van der Essen
d7d7500588
[IMP]Cleaned more syntax, added comments, removed __extends()
...
bzr revid: fva@openerp.com-20120402155005-6rpin43aho26h1yz
2012-04-02 17:50:05 +02:00
Frédéric van der Essen
c407affde9
[IMP]Cleaned syntax of the Backbone models
...
bzr revid: fva@openerp.com-20120402142513-funzsxkit810c3q2
2012-04-02 16:25:13 +02:00
Roberto López López (OpenERP)
c053aab30e
[fix] remove unused code
...
bzr revid: rlo@openerp.com-20120402091343-8dltnmyld7yk2yo2
2012-04-02 11:13:43 +02:00
Roberto López López (OpenERP)
2d672a4089
[fix] remove some useless changes after review
...
bzr revid: rlo@openerp.com-20120330132304-6kyfsir5efcp9kig
2012-03-30 15:23:04 +02:00
Roberto López López (OpenERP)
e3a0621112
[fix] fix search field 'clear' button
...
bzr revid: rlo@openerp.com-20120330124207-5c4lb61al2c1q8s2
2012-03-30 14:42:07 +02:00
Roberto López López (OpenERP)
caba6de06e
[imp] working weight barcodes
...
bzr revid: rlo@openerp.com-20120330114225-iouhxmyv3hb3xbcd
2012-03-30 13:42:25 +02:00
Roberto López López (OpenERP)
de6a900972
[imp] working price barcodes
...
bzr revid: rlo@openerp.com-20120330111617-fnc85bpk26eevicc
2012-03-30 13:16:17 +02:00
Roberto López López (OpenERP)
09506d254a
[imp] partially working price/weight barcodes
...
bzr revid: rlo@openerp.com-20120330100221-tjzbpqfp1wzv9n6w
2012-03-30 12:02:21 +02:00
Quentin (OpenERP)
ffd0c86ec2
[FIX] a lot of fixes in several modules, as the result of the code review of the merge of the objects res.partner and res.partner.address
...
bzr revid: qdp-launchpad@openerp.com-20120330090837-s87z2qzsvynhlbwr
2012-03-30 11:08:37 +02:00
Sbh (Openerp)
0a28fafb75
[IMP] : rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330082751-3dsfrym5vr1sv2r0
2012-03-30 13:57:51 +05:30
Roberto López López (OpenERP)
0a77d53dea
[imp] currency conversion (partial)
...
bzr revid: rlo@openerp.com-20120329121223-gb0d9sbpdjijaf0t
2012-03-29 14:12:23 +02:00
Roberto López López (OpenERP)
646e0334c8
[fix] fix 'in' expression when reading a price or weight barcode
...
bzr revid: rlo@openerp.com-20120329102548-gnffz8am3m755agq
2012-03-29 12:25:48 +02:00
Roberto López López (OpenERP)
c67aea4ed7
[imp] improved dc check
...
bzr revid: rlo@openerp.com-20120329100427-r5pk59e5dnne99ou
2012-03-29 12:04:27 +02:00
Roberto López López (OpenERP)
6178afe4be
[imp] unit barcode
...
bzr revid: rlo@openerp.com-20120328134656-zxxdpa861q2qk3r5
2012-03-28 15:46:56 +02:00
Roberto López López (OpenERP)
ce55e113ed
[imp] control digit check + more demo data
...
bzr revid: rlo@openerp.com-20120328100337-aypdlk8o9revqpm6
2012-03-28 12:03:37 +02:00
Roberto López López (OpenERP)
e515089023
[imp] currency conversion - yet incomplete
...
bzr revid: rlo@openerp.com-20120327141422-9grv8dw70q89ayx5
2012-03-27 16:14:22 +02:00
Roberto López López (OpenERP)
b6fa154cbc
[imp] add control digit
...
bzr revid: rlo@openerp.com-20120327082545-y3fzc2rysefx0k2q
2012-03-27 10:25:45 +02:00
Roberto López López (OpenERP)
e70087c874
[imp] add control digit
...
bzr revid: rlo@openerp.com-20120327065322-a7gegbmtrtjexn41
2012-03-27 08:53:22 +02:00
Roberto López López (OpenERP)
d849defd2a
[imp] dialog height
...
bzr revid: rlo@openerp.com-20120326143900-qb6g01z9wsdzuyac
2012-03-26 16:39:00 +02:00
Roberto López López (OpenERP)
08e30b83bf
[imp] warning product not recognized
...
bzr revid: rlo@openerp.com-20120326122743-3m6c24j0dnb9c1yq
2012-03-26 14:27:43 +02:00
Roberto López López (OpenERP)
e398d3aa12
[fix] correct js syntax
...
bzr revid: rlo@openerp.com-20120326093605-72k4ewcnw4xzmnid
2012-03-26 11:36:05 +02:00
Roberto López López (OpenERP)
7fc89ff1d8
[imp] modified code after Stéphane instructions
...
bzr revid: rlo@openerp.com-20120323143136-0qhzjnttnxei7xpi
2012-03-23 15:31:36 +01:00
Sbh (Openerp)
e17dee3a5e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120323052530-l9fsd06fbma1l3gz
2012-03-23 10:55:30 +05:30
Quentin (OpenERP)
343158f39f
[MERGE] merged the branch with menu modifications
...
bzr revid: qdp-launchpad@openerp.com-20120322172305-ko3l5j363lhdozkw
2012-03-22 18:23:05 +01: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
Roberto López López (OpenERP)
337fe0c8ee
[fix]
...
bzr revid: rlo@openerp.com-20120322140814-mvo7e1qh4svom3tw
2012-03-22 15:08:14 +01:00
Roberto López López (OpenERP)
36e5619bf3
[fix] clean debug output and improve digits detection
...
bzr revid: rlo@openerp.com-20120322130519-0zxr8wif2sl3nr47
2012-03-22 14:05:19 +01:00
Roberto López López (OpenERP)
cc3e6d9b17
[fix] remove unused js import
...
bzr revid: rlo@openerp.com-20120322122029-5sy4luezyaf8c57m
2012-03-22 13:20:29 +01:00
Sbh (Openerp)
3a91d778f0
[IMP]survey : remove the loop for address
...
bzr revid: sbh@tinyerp.com-20120322111118-reol0je703syzwyu
2012-03-22 16:41:18 +05:30
Roberto López López (OpenERP)
9e5f88c243
[imp] add demo data
...
bzr revid: rlo@openerp.com-20120322105720-o9ygtir59x3lokv7
2012-03-22 11:57:20 +01:00
Roberto López López (OpenERP)
315a75679b
[imp] working integration barcode reader - point of sale order
...
bzr revid: rlo@openerp.com-20120322102724-nfakdy4ug5pnm6he
2012-03-22 11:27:24 +01:00
Roberto López López (OpenERP)
3b81d145b4
[imp] get the barcode of each product during the init method of the point of sale. Thus, the product can be detected using its barcode. Insertion into the current order still pending
...
bzr revid: rlo@openerp.com-20120322092558-sw7pll78qim6v51q
2012-03-22 10:25:58 +01:00
Roberto López López (OpenERP)
1677026b0b
[imp] unbind barcode reader events when closing point of sale
...
bzr revid: rlo@openerp.com-20120321100414-h5qsu1qumbil8uks
2012-03-21 11:04:14 +01:00
Raphael Collet
ff05f5dd8f
[IMP] product: rename xml ids of new usability groups
...
bzr revid: rco@openerp.com-20120321100144-h5f6jjuz45p2qi6r
2012-03-21 11:01:44 +01:00
Roberto López López (OpenERP)
2f0d87381b
[imp] barcode reader events are successfully delegated
...
bzr revid: rlo@openerp.com-20120321094311-bb12qnp46ch29pt1
2012-03-21 10:43:11 +01:00
Jagdish Panchal (Open ERP)
a4a2696fb3
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: jap@tinyerp.com-20120321065621-rr4ehnehog9aq4d2
2012-03-21 12:26:21 +05:30
Roberto López López (OpenERP)
0f0ecfd90f
[imp]
...
bzr revid: rlo@openerp.com-20120320154620-c5f5o2og5dmai7je
2012-03-20 16:46:20 +01:00
Roberto López López (OpenERP)
d122787e45
[fix] move jquery.barcodelistener
...
bzr revid: rlo@openerp.com-20120320085111-s9i0l92u9vkushrh
2012-03-20 09:51:11 +01:00
Roberto López López (OpenERP)
b66aa99a85
[fix] move jquery.barcodelistener
...
bzr revid: rlo@openerp.com-20120320084729-x2zo7n01jamsfkt5
2012-03-20 09:47:29 +01:00
Roberto López López (OpenERP)
42a97a3a9d
[fix] move jquery.barcodelistener
...
bzr revid: rlo@openerp.com-20120320084705-2s7lewxb8x2hkg0z
2012-03-20 09:47:05 +01:00
Bhumika (OpenERP)
2e402d5c3e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120320052258-4g8zcpd248do6tw9
2012-03-20 10:52:58 +05:30
Roberto López López (OpenERP)
befafc71d5
[imp] add required jquery plugin
...
bzr revid: rlo@openerp.com-20120319112015-788gds4aioshyvco
2012-03-19 12:20:15 +01:00
Ujjvala Collins (OpenERP)
1cf06865d2
[MERGE]: Merged with trunk addons.
...
bzr revid: uco@tinyerp.com-20120316112842-dcepzqm0mnkvjaab
2012-03-16 16:58:42 +05:30
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)
e5728537ce
[FIX] point_of_sale: fixed error in yaml test
...
bzr revid: qdp-launchpad@openerp.com-20120313133956-gwfzj2ns33ou3nph
2012-03-13 14:39:56 +01:00
Meera Trambadia (OpenERP)
440037d7bc
[MERGE] branch merged with openobject-addons
...
bzr revid: mtr@tinyerp.com-20120313051730-3rmlg1z493owjtzo
2012-03-13 10:47:30 +05:30
Ujjvala Collins (OpenERP)
9e475bc8f4
[MERGE]: Add common changes for product UoM.
...
bzr revid: uco@tinyerp.com-20120312110750-3h8yx4z046qagvn4
2012-03-12 16:37:50 +05:30
Launchpad Translations on behalf of openerp
5ebc07237a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052625-78n2341gtv2zrgwg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050634-9ftgr94cy2tvp9y5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120312051214-q1f14seqal4j8rn5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052733-s24jj1qyoxy2j8lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050659-0ky4089nbil85weg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120312051227-90mlbjgzqjyj8a8a
2012-03-12 05:12:27 +00:00
niv-openerp
df1cfd1e8f
[imp] changed the way the point of sale switch to fullscreen
...
bzr revid: nicolas.vanhoren@openerp.com-20120307150549-rzkjz0j79l6mpjqs
2012-03-07 16:05:49 +01:00
Bharat Devnani (OpenERP)
64caa91eea
[REM] removed references of res.partner.address from pos module
...
bzr revid: bde@tinyerp.com-20120307131248-y1aoff857h3ecmru
2012-03-07 18:42:48 +05:30
Turkesh Patel (Open ERP)
87a70fbc2b
[IMP] apply pricelist group on fields
...
bzr revid: tpa@tinyerp.com-20120307121411-01snwca7u4kwylll
2012-03-07 17:44:11 +05:30
Jagdish Panchal (Open ERP)
b4e6775929
[IMP] point_of_sale: add new menu reporting and Sale Details
...
bzr revid: jap@tinyerp.com-20120306054238-rs8l9ne8mt128k82
2012-03-06 11:12:38 +05:30
Launchpad Translations on behalf of openerp
6468fc876a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120301051917-fmqwoejs3938qms6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120302052441-nwqd0nqf2gjd8ucn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120303055455-mns5t3fuy78a9r66
bzr revid: launchpad_translations_on_behalf_of_openerp-20120304052145-yqor18r71d7fqmar
bzr revid: launchpad_translations_on_behalf_of_openerp-20120305051123-0j4vr09l95yo2fj5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120229053027-ifd6ef34ebmox67l
bzr revid: launchpad_translations_on_behalf_of_openerp-20120305051129-fcwena1g6pvrc9y5
2012-03-05 05:11:29 +00:00
Meera Trambadia (OpenERP)
b7096817c1
[MERGE] branch merged with trunk-reorganise-menus-reporting-mtr
...
bzr revid: mtr@tinyerp.com-20120301104032-4xdtnao4lqxqu8le
2012-03-01 16:10:32 +05:30
niv-openerp
e543b9a8fb
[imp] adaptation to .js due to changes in web
...
bzr revid: nicolas.vanhoren@openerp.com-20120229123450-mn8zpku48uqlryeh
2012-02-29 13:34:50 +01:00
Olivier Dony
318d99d029
[MERGE] Latest bugfixes from 6.1
...
bzr revid: odo@openerp.com-20120229094502-sp0xrg4yf5uvq5k9
2012-02-29 10:45:02 +01:00
Launchpad Translations on behalf of openerp
fefba7d11e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120229052746-lhfn0qjqmzuqz1js
2012-02-29 05:27:46 +00:00
Meera Trambadia (OpenERP)
77d579560e
[IMP] mrp,pos,purchase,stock:-changed menu sequence for reporting
...
bzr revid: mtr@tinyerp.com-20120228094741-hnj7eces0fwquu7c
2012-02-28 15:17:41 +05:30
Meera Trambadia (OpenERP)
355e9b09d4
[IMP] point_of_sale:- changed reporting menu name and parent
...
bzr revid: mtr@tinyerp.com-20120228064021-vwgm9430c1i1aj9m
2012-02-28 12:10:21 +05:30
Launchpad Translations on behalf of openerp
f210e73f21
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120225055251-o6ajm1k0ya17sd2j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120226052201-liykx2ue4jufkcwc
bzr revid: launchpad_translations_on_behalf_of_openerp-20120227055617-7bb3evbppqedlx8p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120228063037-0nhyn4iid36dorfs
2012-02-28 06:30:37 +00:00
Christophe Simonis
f37ea622cb
[FIX] point_of_sale: works when used in embed mode
...
bzr revid: chs@openerp.com-20120224144939-550wsvj448fk3yfb
2012-02-24 15:49:39 +01:00
Quentin (OpenERP)
980e27e099
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20120223094804-0cm66x44ddvllelj
2012-02-23 10:48:04 +01:00
niv-openerp
109385bbe6
[merge] refactoring in web client
...
bzr revid: nicolas.vanhoren@openerp.com-20120223093613-gstbznc0adwjkstm
2012-02-23 10:36:13 +01:00
niv-openerp
2ecdb960d0
[imp] refactoring of ParentedMixin
...
bzr revid: nicolas.vanhoren@openerp.com-20120221164536-zajw6gixwu4n4xgh
2012-02-21 17:45:36 +01:00
Launchpad Translations on behalf of openerp
a3ac698fe8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218071328-fl3yjw2gawigfooh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219063344-7w5y8nkweukg0f88
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220061321-0z254064e8vsx286
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063558-wc526qfv4ko5s6q0
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063603-medp0cjt2z5vy70x
2012-02-21 06:36:03 +00:00
Launchpad Translations on behalf of openerp
88c25488a5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00