Commit Graph

244 Commits

Author SHA1 Message Date
Frédéric van der Essen 0fd4888e84 [hw_scanner] implementation of the server side component of the barcode scanner proxy
bzr revid: fva@openerp.com-20140102141519-jaqi8mcqff282c6n
2014-01-02 15:15:19 +01:00
Frédéric van der Essen 173ffb995f [WIP] point_of_sale: making the standalone pos launchable from the pos backend
bzr revid: fva@openerp.com-20131207170014-9pctopzgx5ahtb21
2013-12-07 18:00:14 +01:00
Frédéric van der Essen 28c074dcb2 [MERGE] from trunk
bzr revid: fva@openerp.com-20131126142328-26gdibac45v17djm
2013-11-26 15:23:28 +01:00
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Olivier Dony f08f16cb30 [FIX] point_of_sale: `update` button in POS order form was calling a non-existing method
This dummy button is only meant to save the
order and refresh the view, which is easily
accomplished by sending an non-existing
workflow signal. Setting the button type
to the default `workflow` type (or simply
removing the wrong type) fixes the problem.

bzr revid: odo@openerp.com-20131107110256-zfok0mwkbesrkf81
2013-11-07 12:02:56 +01:00
Frédéric van der Essen 7f0e721cc1 [IMP] point_of_sale: more css adaptations for iPad / android + a few bug correction along the way
bzr revid: fva@openerp.com-20131106161723-vus7amgc6cfw3bzr
2013-11-06 17:17:23 +01:00
Thibault Delavallée a8201c6891 [MERGE] [IMP] point_of_sale
Removed default POS category
Removed 'other' category from data
Fixed pos payment methods not all listed when creating a pos

bzr revid: tde@openerp.com-20130905103952-kbew55mqxltjdoey
2013-09-05 12:39:52 +02:00
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Atul Patel (OpenERP) 2e20b9a45a [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130813135410-7w9yfc6zl3hxcnwd
2013-08-13 19:24:10 +05:30
Thibault Delavallée d6c74a369c [MERGE] Forward-ported lp:~openerp-dev/openobject-addons/7.0-pos-improvements-fva (using -r 8946..8955).
This branch holds several improvements for the point of sale. However it cannot
be merged into 7.0 because a new column is added. As this branch has proven to
be correct, it is forward-ported into trunk.

bzr revid: tde@openerp.com-20130711084547-wl5q22g8z1aha126
2013-07-11 10:45:47 +02:00
Atul Patel (OpenERP) 4b98b1c689 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130620054125-ai4ozl8pd1hv84sr
2013-06-20 11:11:25 +05:30
ggh-openerp 735a20f320 [REM] Remove the onchange pos available method
bzr revid: ggh@tinyerp.com-20130417052737-4t5ejcwzkkkgfqdj
2013-04-17 10:57:37 +05:30
Frédéric van der Essen ef81f0bd43 [IMP] point_of_sale: add a configuration option to enable invoicing from the Point of Sale (enabled by default)
bzr revid: fva@openerp.com-20130411122250-aju5cl91wduj2bj0
2013-04-11 14:22:50 +02:00
ggh-openerp e582096959 [IMP] Improved code in Pos
bzr revid: ggh@tinyerp.com-20130411102949-lfeakwxskka8hzyy
2013-04-11 15:59:49 +05:30
ggh-openerp 43a9fa81fd [IMP] Name of method changed
bzr revid: ggh@tinyerp.com-20130411051350-0esvxad9a189x8iz
2013-04-11 10:43:50 +05:30
ggh-openerp 07db55efa3 [IMP] POS:Available in pos checkbox not click pos_categ no need to display
bzr revid: ggh@tinyerp.com-20130409132314-2o0uvomvd5afy624
2013-04-09 18:53:14 +05:30
ggh-openerp 054465b3ed [IMP] POS:Change the data code into demo code
bzr revid: ggh@tinyerp.com-20130409100917-pvwkamgwh0trtu4m
2013-04-09 15:39:17 +05:30
ggh-openerp d4a1f8b434 [IMP] POS: All pos payment method show, domain based on Available in the point of sales
bzr revid: ggh@tinyerp.com-20130409051836-g8u2f6ebbc4rlkyn
2013-04-09 10:48:36 +05:30
sgo@tinyerp.com d7bd9743a2 [IMP]improve pos config view
bzr revid: sgo@tinyerp.com-20130207095827-oaya9xo9cjroqcex
2013-02-07 15:28:27 +05:30
sgo@tinyerp.com bc17621cec [IMP]improve pos config form view and add group on warehouse
bzr revid: sgo@tinyerp.com-20130207065126-1liwmg1u3emnra6j
2013-02-07 12:21:26 +05:30
sgo@tinyerp.com 9e99431d1f [IMP]add pricelist field in pos config and set default
bzr revid: sgo@tinyerp.com-20130206123851-4b3lhr5bzf7msla6
2013-02-06 18:08:51 +05:30
sgo@tinyerp.com e4250d1558 [IMP]remove sale.shop from pos and improve code
bzr revid: sgo@tinyerp.com-20130123113306-n7enol5as84sv0g2
2013-01-23 17:03:06 +05:30
Randhir Mayatra (OpenERP) c87ab693a3 [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121127051533-kpy6m65bna2e1ncg
2012-11-27 10:45:33 +05:30
Quentin (OpenERP) 90e268d14c [MERGE] staging branch
bzr revid: qdp-launchpad@openerp.com-20121126162933-a3c1agw0z72auw0e
2012-11-26 17:29:33 +01:00
Quentin (OpenERP) 846b6a0477 [FIX] delivery, warning, point_of_sale: onchange_partner_id now takes context as argument
bzr revid: qdp-launchpad@openerp.com-20121126142142-1i7tm04z85aeozqk
2012-11-26 15:21:42 +01:00
Fabien Pinckaers 9c66d7d2f9 [IMP] PoS Useability
bzr revid: fp@tinyerp.com-20121126121350-1n3v1nqsrjf8b5qf
2012-11-26 13:13:50 +01:00
Randhir Mayatra (OpenERP) 061f894aa1 [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121126084100-gagk2faf833cir4f
2012-11-26 14:11:00 +05:30
Frédéric van der Essen 5e83cce0ca [MERGE] from trunk
bzr revid: fva@openerp.com-20121123141458-h3vo5blt3h9eh9iz
2012-11-23 15:14:58 +01:00
Randhir Mayatra (OpenERP) 0d915a11c4 [IMP] Change the string of the button in pos
bzr revid: rma@tinyerp.com-20121123111706-serad30xiaznzgvo
2012-11-23 16:47:06 +05:30
Frédéric van der Essen 4d90fdd32e [IMP] point_of_sale: you must now use available_in_pos to make product available in pos ... Products without categories will appear at the root category
bzr revid: fva@openerp.com-20121122175254-ippyf1rstggvvwh7
2012-11-22 18:52:54 +01:00
Arnaud Pineux 1d335a7cdb [IMP] Re-set the sequence number for main menus
bzr revid: api@openerp.com-20121121162753-3mi0si4kf3rei42n
2012-11-21 17:27:53 +01:00
Sanjay Gohel (Open ERP) 8f83c2194b [IMP]pos tab in user will show edit button only in edit form and change string of form and help
bzr revid: sgo@tinyerp.com-20121105131121-umf8viq2gy1mf3p9
2012-11-05 18:41:21 +05:30
Amit Patel 0bf0b95d67 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121029051732-hcgpnra148041ews
2012-10-29 10:47:32 +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 57011e3ef5 [MERGE/FIX]:
- If you manually create a session by clicking on "All Sessions" then "Create" and enter a pos, the pos field will dissapear..
 - Should not be possible to select view accounts for profit/losss acount on cash registers tab of payment method

bzr revid: apa@tinyerp.com-20121010104043-gcj3ytsjhua7k8p7
2012-10-10 16:10:43 +05:30
Foram Katharotiya (OpenERP) 0e26c16d0f [IMP] appear the pos fields when create a session
bzr revid: fka@tinyerp.com-20121010070940-vyjatobj08nmpoir
2012-10-10 12:39:40 +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
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 4f74d0aee1 [FIX] point_of_sale: show the cash_register_balance when we are in closing_control
bzr revid: stw@openerp.com-20120927121954-1safkpgurh4nu9kc
2012-09-27 14:19:54 +02:00
Stephane Wirtel 1149fffd9a [MERGE] point_of_sale: Show the opening & closing control
bzr revid: stw@openerp.com-20120926094502-d6qe9mkarfvr8rha
2012-09-26 11:45:02 +02:00
Fabien Pinckaers e3003f56b2 [IMP] point of sale, 10 firsts clicks cleaned
bzr revid: fp@tinyerp.com-20120925075645-9ydq1dh6usmwyknx
2012-09-25 09:56:45 +02:00
Stephane Wirtel 24a4e57171 [FIX] point_of_sale: show the opening cash control
bzr revid: stw@openerp.com-20120924115320-nkbfhfnyab4bhxrc
2012-09-24 13:53:20 +02:00
Stephane Wirtel f0a883e6d6 [FIX] point_of_sale: Show the opening_control & closing_control
bzr revid: stw@openerp.com-20120924102613-twii7ba34wctx6c6
2012-09-24 12:26:13 +02:00
Stephane Wirtel 69d83db1e5 [MERGE] point_of_sale: select the cash journals and hide some elements on the form view.
bzr revid: stw@openerp.com-20120917153714-kelopzdwaysht3pd
2012-09-17 17:37:14 +02:00
Stephane Wirtel 2a4aaeba31 [FIX] point_of_sale: Show/Hide some groups in function of the state and the cash_control flag
bzr revid: stw@openerp.com-20120917140138-sjsnjxv27nd8rnao
2012-09-17 16:01:38 +02:00
Antonin Bourguignon ccb15e76f6 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx
2012-09-17 13:44:55 +02:00
Jigar Amin - OpenERP d7dfc3dc1c [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
Fabien Pinckaers f711f7d9a6 [MERGE] muti-currency group
bzr revid: fp@openerp.com-20120910201408-paf7q0cj22i72k2n
2012-09-10 22:14:08 +02:00
Turkesh Patel (Open ERP) ac75763855 [MRG] merge with lp:openobjec-addons.
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30