471037495c
[IMP]Apply css class flow on wizards buttons
...
bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
2012-06-26 12:01:19 +05:30
a973485bc9
[MERGE] lp:~openerp-dev/openobject-addons/trunk-wizard-remove-cancel-editable-tch
...
bzr revid: jam@tinyerp.com-20120625111519-j8rpvnhb804tl1o1
2012-06-25 16:45:19 +05:30
0e97cefe9e
[IMP]Improve wizard button
...
bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
2012-06-25 15:39:01 +05:30
1f0d6e4cb0
[IMP] point_of_sale: merged start() with renderElement() where possible
...
bzr revid: fva@openerp.com-20120625100155-3ec0rk2bq61oy0lo
2012-06-25 12:01:55 +02:00
2c17177d7e
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120625071016-acetvlch37mbjqd6
2012-06-25 12:40:16 +05:30
622abf69b3
[MERGE] remove wizard cancel button and make action button red
...
bzr revid: jam@tinyerp.com-20120625051048-y6mydqljdpysabn1
2012-06-25 10:40:48 +05:30
43a50a651b
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120625041934-v1twcjzbjupl369n
2012-06-25 09:49:34 +05:30
dfdbf8cf17
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120625041316-rwtc4zf2pska9t5c
2012-06-25 09:43:16 +05:30
40405d11eb
[IMP] point_of_sale: new order widget
...
bzr revid: fva@openerp.com-20120622165355-jmex9f0vupidambm
2012-06-22 18:53:55 +02:00
4c104ca727
[IMP] search views: made some small usability changes
...
bzr revid: qdp-launchpad@openerp.com-20120622130506-pzz8wqo5p5y902qc
2012-06-22 15:05:06 +02:00
55633a22a2
[REF] search views: removed filterr_domain if only one element was inside
...
bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
2012-06-22 16:42:51 +05:30
1c35eb1049
[MERGE] Mearge with main addons
...
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
f68c7f936f
[IMP] point_of_sale: scrollbar
...
bzr revid: fva@openerp.com-20120621162352-v8msrulvti2hxjem
2012-06-21 18:23:52 +02:00
0b86a7375e
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120621110022-oracs89f3clotupp
2012-06-21 16:30:22 +05:30
501721883d
[USB] removed useless class defination
...
bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
2012-06-21 12:39:59 +05:30
f7db2ab215
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120621044348-3r8ur7izhjriing4
2012-06-21 10:13:48 +05:30
d145817fb8
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +05:30
ae34954e1d
[MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-highlight-tch
...
bzr revid: jam@tinyerp.com-20120620123242-tvm11xx0s3olkdif
2012-06-20 18:02:42 +05:30
93ea547e35
[IMP]Make changes in reminging wizards for highlight flow
...
bzr revid: tch@tinyerp.com-20120620120032-0qky5obfmv8b6vi7
2012-06-20 17:30:32 +05:30
660cc67256
[IMP]Added highlight button on wizard
...
bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
2012-06-20 16:19:23 +05:30
e80980330b
[USA] replaced red button class oe_form_button_active_flow to oe_highlight
...
bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
2012-06-20 15:42:05 +05:30
1c4476e8b6
[IMP]Improve wizard usability
...
bzr revid: tch@tinyerp.com-20120620073712-xql1mgekjyb7ufwv
2012-06-20 13:07:12 +05:30
21650f9790
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120619093157-ay1hdzmp8yh8bfgz
2012-06-19 15:01:57 +05:30
395c49d811
[MERGE] point_of_sale: Search view updates
...
bzr revid: psi@tinyerp.com-20120619090512-f5s3zwv2hbl1exkk
2012-06-19 14:35:12 +05:30
f2fba32b56
[REF] Change the CSS classes
...
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
7d20aaa7e2
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120619071914-jwcofv563wr6wmru
2012-06-19 12:49:14 +05:30
189fd8e390
[IMP]: (Work in progress)* Changed demo references according to changes in server, Aim is to add more common names and easy demo.
...
* Improved xml_id of demo like res_partner_1 instead of specific record name like res_partner_asus so in future we can change that record value easily avoiding confusions in names
bzr revid: rpa@tinyerp.com-20120619071624-3d9mcl9m76gp2s0c
2012-06-19 12:46:24 +05:30
7fc1b0b25e
[MERGE] lp:openpbject-addons
...
bzr revid: jam@tinyerp.com-20120619061856-eok4a7xmyodeapku
2012-06-19 11:48:56 +05:30
a1ead34ba5
[IMP] point_of_sale : Improved the Search View.
...
bzr revid: mdi@tinyerp.com-20120619052937-ndi4f77pxnzpb3zi
2012-06-19 10:59:37 +05:30
2e3728db21
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
564c8e0580
[REM]: Remove cancel button on wizard
...
bzr revid: aja@tinyerp.com-20120618095828-2j3l2ygehu6j3nlo
2012-06-18 15:28:28 +05:30
9e36bd7a07
[IMP]sale crm and pos improve page sheet
...
bzr revid: pja@tinyerp.com-20120615053028-9xn6vb2fqcaa9h11
2012-06-15 11:00:28 +05:30
8af4c098f9
[IMP]POS-Backend:Added active and return class flow
...
bzr revid: tch@tinyerp.com-20120614062427-2o74wqmwil5vnxm8
2012-06-14 11:54:27 +05:30
53d870aea0
[IMP] point_of_sale: some code simplifications
...
bzr revid: fva@openerp.com-20120611152929-t7jsnqfeg5y63knl
2012-06-11 17:29:29 +02:00
0fcaa4edc7
[IMP] point_of_sale: screens refactor continued
...
bzr revid: fva@openerp.com-20120611152022-26a91puoehxealqi
2012-06-11 17:20:22 +02:00
d8d9b8349d
[IMP] point_of_sale: refactoring screens to make it more extensible
...
bzr revid: fva@openerp.com-20120611140441-13tksy80lrr9ndgh
2012-06-11 16:04:41 +02:00
204ce4380a
[MERGE] merged with the trunk
...
bzr revid: qdp-launchpad@openerp.com-20120611124211-kf741tkd3gdsp3ep
2012-06-11 14:42:11 +02:00
2047df4e4f
[merge] trunk
...
bzr revid: fp@tinyerp.com-20120610083515-itgsn211254zp1b9
2012-06-10 10:35:15 +02:00
c95b6d26ab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120609053947-vtt4bvvka4m7ss08
bzr revid: launchpad_translations_on_behalf_of_openerp-20120610043726-y2hq6n49adbitr1p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120611044647-txtguaozavg1ipp2
2012-06-11 04:46:47 +00:00
5bf16a3142
imp
...
bzr revid: fp@tinyerp.com-20120610001252-1axqs109qoutqx5h
2012-06-10 02:12:52 +02:00
d41b456a14
fix
...
bzr revid: fp@tinyerp.com-20120609234816-9a3domcakn0vbazv
2012-06-10 01:48:16 +02:00
e110007132
fix
...
bzr revid: fp@tinyerp.com-20120609234744-cqrvmqkxfrpei6i1
2012-06-10 01:47:44 +02:00
83ad98a1a7
[IMP] better form views, new guidelines
...
bzr revid: fp@tinyerp.com-20120609151920-4sv7qzomhmfpwsy2
2012-06-09 17:19:20 +02:00
7c8e38b179
[IMP] improved form views
...
bzr revid: fp@tinyerp.com-20120608183518-7sllx2v50vsx3ohm
2012-06-08 20:35:18 +02:00
eaf472e20c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120608044033-1ezh3mkueoizzas0
2012-06-08 04:40:33 +00:00
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
bee48de20b
[FIX] point_of_sale: Add the 'group_by' field in the view
...
bzr revid: stw@openerp.com-20120607120121-kh653yprb827izma
2012-06-07 14:01:21 +02:00
f0c7f6a50c
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120607053303-kquj5skd1i8kj006
2012-06-07 11:03:03 +05:30
0a2146ebb3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120607044127-1ghjhkfi6701k3ok
2012-06-07 04:41:27 +00:00
cfce82898b
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120605122830-r3o25y55lzo0o73n
bzr revid: psi@tinyerp.com-20120606103845-w2jftpw5jw706pgo
2012-06-06 16:08:45 +05:30
37ac236cc5
[IMP]:point_of_sale
...
bzr revid: apa@tinyerp.com-20120605132812-mblxngyk7qi6si3d
2012-06-05 18:58:12 +05:30
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
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
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
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
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
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
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
616bb7430e
[WIP] point_of_sale: debug log tbrl
...
bzr revid: fva@openerp.com-20120604152555-o175256oxe2ywl3x
2012-06-04 17:25:55 +02:00
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
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
357c91c4d4
[REF] point_of_sale: remove print statements
...
bzr revid: stw@openerp.com-20120604132637-ne679fbry13pvowr
2012-06-04 15:26:37 +02:00
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
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
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
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
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
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
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
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
dff4b2f2a0
[Merge] Merge with main branch.
...
bzr revid: mdi@tinyerp.com-20120604063834-jbfyvot5fjvc4pz7
2012-06-04 12:08:34 +05:30
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
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
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
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
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
f4b585bf71
[FIX] point_of_sale: missing file : loader.gif
...
bzr revid: fva@openerp.com-20120601051419-9sp6j1vos6kqa5bn
2012-06-01 07:14:19 +02:00
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
a9058af8f7
[MERGE] point_of_sale: from stw
...
bzr revid: fva@openerp.com-20120530222324-j991jd764i5of03r
2012-05-31 00:23:24 +02:00
4096fff322
[REF] point_of_sale: Remove unused code
...
bzr revid: stw@openerp.com-20120530144208-qh8898k2qaokbc9u
2012-05-30 16:42:08 +02:00
3fc019e343
[REF] point_of_sale: remove unused code
...
bzr revid: stw@openerp.com-20120530143624-83qsq5m41qikpen9
2012-05-30 16:36:24 +02:00
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
fd2d1a940b
[WIP] point_of_sale: emergency merge
...
bzr revid: fva@openerp.com-20120530110624-4caalfhlfmj9rpo4
2012-05-30 13:06:24 +02:00
26a722c910
[MERGE] point_of_sale: from stw
...
bzr revid: fva@openerp.com-20120529164050-py5socstpho8i5b3
2012-05-29 18:40:50 +02:00
a81a9177f1
[IMP] point_of_sale: new category system
...
bzr revid: fva@openerp.com-20120529163944-crk8dblg7t6b2ove
2012-05-29 18:39:44 +02:00
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
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
a6f263b323
[MERGE] point_of_sale: from stw
...
bzr revid: fva@openerp.com-20120529133230-5532hn68a4sa3yim
2012-05-29 15:32:30 +02:00
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
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
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
0c2acefc6c
[IMP] point_of_sale : fix the eeror.
...
bzr revid: mdi@tinyerp.com-20120528071918-sdthomsohyev6lrt
2012-05-28 12:49:18 +05:30
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
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
cf46c8653c
[FIX] point_of_sale: Fix some bugs
...
bzr revid: stw@openerp.com-20120525122415-30r3e2phsfdqgz8l
2012-05-25 14:24:15 +02:00
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
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
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
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
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
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
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
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
c316dad6d6
[IMP] proxy upgraded to new JsonRPC API
...
bzr revid: fva@openerp.com-20120523130011-mhso33xqk9aau5kc
2012-05-23 15:00:11 +02:00
7bd09320ce
[IMP] point_of_sale: orderlines are correctly merged
...
bzr revid: fva@openerp.com-20120523124754-lxzbqmzx2r9tn11p
2012-05-23 14:47:54 +02:00
5c791531aa
[IMP] improved typos
...
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
c4861d05ad
[IMP] point_of_sale: orderlines are correctly merged
...
bzr revid: fva@openerp.com-20120522145956-t0d3xnzx8f8mz15s
2012-05-22 16:59:56 +02:00
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
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
785100c74c
[MERGE] trunk
...
bzr revid: fva@openerp.com-20120522093137-eqaen4t49ukcmj6f
2012-05-22 11:31:37 +02:00
b3fa4ccf5c
[IMP] removed icons from topbar
...
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
ee566d388c
[IMP] merged topbar status widgets
...
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
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
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
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
1aefff9733
[MERGE]:merged from trunk
...
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
313496382a
[FIX] Forgot to add pos_basewidget.js
...
bzr revid: fva@openerp.com-20120516130142-5u23uerr5s8y7ydq
2012-05-16 15:01:42 +02:00
f2051414f7
[MERGE] trunk
...
bzr revid: fva@openerp.com-20120514155031-x7h0f12110g2gqhb
2012-05-14 17:50:31 +02:00
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
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
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
c48ae3cf5b
Removed qweb_template and OldWidget
...
bzr revid: fva@openerp.com-20120514140340-5cjkget2wjfsnuva
2012-05-14 16:03:40 +02:00
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
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
8607b4eb8a
[IMP] tooltips on PoS
...
bzr revid: fp@openerp.com-20120513113937-v7e5bcvaqa87d0ku
2012-05-13 13:39:37 +02:00
478f949df9
[IMP] useability, name get on sessions
...
bzr revid: fp@openerp.com-20120513110417-hv20fk3janm6h52f
2012-05-13 13:04:17 +02:00
a45072238e
IMP
...
bzr revid: fp@openerp.com-20120513103351-pjymo4jf4grh8pjw
2012-05-13 12:33:51 +02:00
94c98bab2a
[IMP] Removed bad report
...
bzr revid: fp@openerp.com-20120513103058-n0lusjarb4vxu7nh
2012-05-13 12:30:58 +02:00
bdac4ab7ad
[FIX] pos backend, small bug
...
bzr revid: fp@openerp.com-20120513101641-7cpbvos3hcgnx91m
2012-05-13 12:16:41 +02:00
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
589b298125
[IMP] point_of_sale
...
bzr revid: stw@openerp.com-20120511212912-htftara5senojo1w
2012-05-11 23:29:12 +02:00
aff86833ff
Starting to completely remove template_fct and OldWidget
...
bzr revid: fva@openerp.com-20120511160223-uplh5mohr19skv02
2012-05-11 18:02:23 +02:00
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
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
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
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
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
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
2ce2c446c8
[FIX] point_of_sale: remove the related actions
...
bzr revid: stw@openerp.com-20120509144201-831n0f5nihbkqgyu
2012-05-09 16:42:01 +02:00
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
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
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
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
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
c2bb090836
merge from stw
...
bzr revid: fva@openerp.com-20120509094636-kqlmd9gf6y33ehn1
2012-05-09 11:46:36 +02:00
8a09bcf83e
removed debug logs, fixed product barcode scanning
...
bzr revid: fva@openerp.com-20120509094438-0vibc269r3ayb6ta
2012-05-09 11:44:38 +02:00
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
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
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
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
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
d70107e5d4
Merge backend integration from stw
...
bzr revid: fva@openerp.com-20120508154217-2n31oip0fb9i654z
2012-05-08 17:42:17 +02:00
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
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
d4cbce0ce7
barcode scanning fixes
...
bzr revid: fva@openerp.com-20120508123701-pb641zlrwd183pf1
2012-05-08 14:37:01 +02:00
713b475010
merge from stw
...
bzr revid: fva@openerp.com-20120507141953-z4eppa58y25q5tz5
2012-05-07 16:19:53 +02:00
2227cfc68d
debug logs
...
bzr revid: fva@openerp.com-20120507141857-1t3fv90kw9v4b7bn
2012-05-07 16:18:57 +02:00
9fe2a57c11
[REF] Remove the pdb call
...
bzr revid: stw@openerp.com-20120507141409-kfhugzui4z1d9pox
2012-05-07 16:14:09 +02:00
c1ab0111f3
Merge from stw
...
bzr revid: fva@openerp.com-20120507133956-ktp7u5t7q1qcsu72
2012-05-07 15:39:56 +02:00
5516784233
barcode reader simulation
...
bzr revid: fva@openerp.com-20120507131414-svwk1fbvc25rztza
2012-05-07 15:14:14 +02:00
6cefb2c802
[FIX] point_of_sale: Fix some bugs
...
bzr revid: stw@openerp.com-20120507130946-13i3yq82oi69zjjt
2012-05-07 15:09:46 +02:00
b0e1d063f7
merge fix from antony
...
bzr revid: fva@openerp.com-20120507124110-5t71dhfyulak5k9e
2012-05-07 14:41:10 +02:00
2c6acfab41
More Popups, total is updated
...
bzr revid: fva@openerp.com-20120507123932-mm38346wbz3ynt3k
2012-05-07 14:39:32 +02:00
b8427b9a85
Further progress : Help Popup, Weighting
...
bzr revid: fva@openerp.com-20120506213439-0met6jzt93r5thry
2012-05-06 23:34:39 +02:00
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
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
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
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
e56de26bcc
removed custom help buttons
...
bzr revid: fva@openerp.com-20120504123033-mffgt1x9swahq5oe
2012-05-04 14:30:33 +02:00
5fafeb4c89
New action bar draft
...
bzr revid: fva@openerp.com-20120504122448-bhs06j1lgoauss58
2012-05-04 14:24:48 +02:00
8ad4e455b0
[IMP]:improved title Salesmen by Salespeople everywhere
...
bzr revid: ssu@tinyerp.com-20120504122206-aiu8lt0suh9xp230
2012-05-04 17:52:06 +05:30
2ad3b32160
[IMP]:improved title Minimum Salesman by Salesperson everywhere
...
bzr revid: ssu@tinyerp.com-20120504121326-nqpx2eyqc1qrp04w
2012-05-04 17:43:26 +05:30
a2a05cfc19
[IMP]:improved titles State by Status everywhere
...
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
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
22c0ae2d8b
Client and cashier mode
...
bzr revid: fva@openerp.com-20120504094825-fb0ku12w3kq1ubcf
2012-05-04 11:48:25 +02:00
fa4b14487d
Forgot to add pos_screens.js
...
bzr revid: fva@openerp.com-20120503171523-rmew4wbblrw3hpyk
2012-05-03 19:15:23 +02:00
5c5d4450af
[Merge] from trunk
...
bzr revid: fva@openerp.com-20120503165929-yyffn0oi03y90ub6
2012-05-03 18:59:29 +02:00
850ed87082
Draft of the product scale screen
...
bzr revid: fva@openerp.com-20120503164032-zoe5rini8lj7kw1i
2012-05-03 18:40:32 +02:00
05535cf4e9
Added a few more screens
...
bzr revid: fva@openerp.com-20120503162746-lo7m3qno48jcanyz
2012-05-03 18:27:46 +02:00
54152c805d
Proxy Interface, Made barcode scanner generic
...
bzr revid: fva@openerp.com-20120503121441-wrmku0twt2414kho
2012-05-03 14:14:41 +02:00
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
70c7252b2c
[IMP]
...
bzr revid: apa@tinyerp.com-20120502055006-yhsd5qwpc0asfn7b
2012-05-02 11:20:06 +05:30
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
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
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
f7b3ba8bf5
[MERGE] lp:openobject-addons
...
bzr revid: stw@openerp.com-20120430142521-t6vl6f3csab038k8
2012-04-30 16:25:21 +02:00
afa3cf71e8
[REF] Remove unused file
...
bzr revid: stw@openerp.com-20120430092719-st813fyhkkqstbcf
2012-04-30 11:27:19 +02:00
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
a2a24f2cd4
Draft of Screen API for Screen widgets
...
bzr revid: fva@openerp.com-20120426144701-s392ynlxdetnwtvk
2012-04-26 16:47:01 +02:00
9fe0bbc472
[COMMIT] Don't want to lose my work
...
bzr revid: stw@openerp.com-20120426123017-joglkawvmn0f3pe0
2012-04-26 14:30:17 +02:00
67341a8cef
Add test button
...
bzr revid: fva@openerp.com-20120426112655-s6j7qt098ptecwwf
2012-04-26 13:26:55 +02:00
2416f64ca2
Merged POSWidget and ShopWidget
...
bzr revid: fva@openerp.com-20120426100548-chrc9sdozi8hhjq6
2012-04-26 12:05:48 +02:00
c71446957f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
ba08369045
[IMP] point_of_sale: improved view.
...
bzr revid: tpa@tinyerp.com-20120426085111-0ewm61gmf34wab2d
2012-04-26 14:21:11 +05:30
4a488a32bb
Merged App and POSWidget
...
bzr revid: fva@openerp.com-20120425145555-hk48b24efi6f3nti
2012-04-25 16:55:55 +02:00
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
0f5be3184d
[MERGE]
...
bzr revid: stw@openerp.com-20120425142459-48afvhj8obflfive
2012-04-25 16:24:59 +02:00
2ae6854f17
extracted the Barcode reader into a new submodule
...
bzr revid: fva@openerp.com-20120425113802-3o5qty2auy50ne8r
2012-04-25 13:38:02 +02:00
e8e7304723
[PoS] Merged the PosModel and Shop classes
...
bzr revid: fva@openerp.com-20120424172047-1wz31qi2hih3decs
2012-04-24 19:20:47 +02:00
bbbf338436
[PoS] Removed old pos.js file
...
bzr revid: fva@openerp.com-20120424162802-o2diexi57p02fjr8
2012-04-24 18:28:02 +02:00
Twinkle (OpenERP)
Jigar Amin - OpenERP
Frédéric van der Essen
Rucha (Open ERP)
Quentin (OpenERP)
Purnendu Singh (OpenERP)
Randhir Mayatra (OpenERP)
Stephane Wirtel
Divyesh Makwana (Open ERP)
ajay javiya (OpenERP)
Jalpesh Patel (OpenERP)
Fabien Pinckaers
Launchpad Translations on behalf of openerp
Amit Patel (OpenERP)
Fabien Pinckaers
Raphael Collet
Antony Lesuisse
Saurang Suthar (OpenERP)
Mayur Maheshwari (OpenERP)
Turkesh Patel (Open ERP)