5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
3f0a8e8931
[IMP] point_of_sale, hw_scale: various small fixes and improvements for the scale module
...
bzr revid: fva@openerp.com-20140425122220-q7rw1dve8bgs25as
2014-04-25 14:22:20 +02:00
e0d45c418a
[IMP] improves the put money in/take money out stat button in point of sale form views
...
bzr revid: ged@openerp.com-20140415115349-360ydoz85069bgyb
2014-04-15 13:53:49 +02:00
77ff3a69b8
[IMP] improve icons and views
...
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
457a62dee6
[IMP] add stat button for point of sale, email template
...
bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
2014-03-27 17:07:20 +05:30
ef6cdbf0f2
[MERGE] [IMP] point of sale: usability: label typos + help in menus
...
bzr revid: tde@openerp.com-20140218083412-k1jajrze3nc51xyh
2014-02-18 09:34:12 +01:00
5585a38ecc
[MERGE] from trunk, need point_of_sale updates
...
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
b0abc338d2
[IMP] point_of_sale: better feedback on network and proxy connectivity + removed pos settings for obsolete features + improved proxy settings
...
bzr revid: fva@openerp.com-20140117175830-himux7xmaopw9yia
2014-01-17 18:58:30 +01:00
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
a97a587fad
[IMP] point_of_sale: posbox automatic discovery
...
bzr revid: fva@openerp.com-20140110171746-286285ds696d5kby
2014-01-10 18:17:46 +01:00
7ab7cf2149
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140109101313-cle2m2axh6vjj8yy
2014-01-09 11:13:13 +01:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
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
0bcd78116f
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131227153517-j278y3hrjj2nzw79
2013-12-27 16:35:17 +01:00
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
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
28c074dcb2
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131126142328-26gdibac45v17djm
2013-11-26 15:23:28 +01:00
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
55864d01e1
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20131111124249-18c9hwxcw4c8276o
2013-11-11 18:12:49 +05:30
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
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
dd18cff878
[IMP] Added attrs for closing balance in pos.
...
bzr revid: psa@tinyerp.com-20131015073857-b3izcxgn51q25jd0
2013-10-15 13:08:57 +05:30
607de396ba
[MERGE] Sync with trunk, until revision 8927
...
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
daa7594cbb
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130913112155-jll3rlzcgsjrtzv4
2013-09-13 16:51:55 +05:30
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
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
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
606431f0ee
[MERGE]merge with parent
...
bzr revid: rma@tinyerp.com-20130830053621-briu78l6scvuleu4
2013-08-30 11:06:21 +05:30
ad7732a4c2
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20130829051125-jmxg4bi8ban5buij
2013-08-29 10:41:25 +05:30
2fab26a2d2
[IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
...
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
2e20b9a45a
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130813135410-7w9yfc6zl3hxcnwd
2013-08-13 19:24:10 +05:30
edf9d5ef8e
[IMP] Improved code for following
...
1/. Onchange on Cash Control was not working in POS
2/. Added new css for cash control
3/. Fixed the issue for the space between the Real Closing Balance and Differences.
bzr revid: psa@tinyerp.com-20130711105900-zzxnzky2nr6ms4c9
2013-07-11 16:29:00 +05:30
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
98d388bcf1
[FIX] pos: remove outer div tag of statusbar
...
bzr revid: hmo@tinyerp.com-20130710101216-23633pfhokwl9bag
2013-07-10 15:42:16 +05:30
9598f4c0be
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20130620060637-s4x59zxv02sna643
2013-06-20 11:36:37 +05:30
4b98b1c689
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130620054125-ai4ozl8pd1hv84sr
2013-06-20 11:11:25 +05:30
ae664b1a86
[IMP] add currency_id because i had removed currency_id in merge conflict
...
bzr revid: fka@tinyerp.com-20130617071413-mie2x70lz4tzs48i
2013-06-17 12:44:13 +05:30
5a761f9752
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130617065636-t6kjnfe6vyz6m8av
2013-06-17 12:26:36 +05:30
de149b50f9
[IMP] Improve code
...
bzr revid: rma@tinyerp.com-20130417113838-kit0g1g2iybvj2t9
2013-04-17 17:08:38 +05:30
1f930d3c4c
[IMP] improve the code
...
bzr revid: rma@tinyerp.com-20130417100806-ti12zqg8cl1tfrit
2013-04-17 15:38:06 +05:30
507cd402b7
[IMP] changes the labels string as per suggestion
...
bzr revid: rma@tinyerp.com-20130417095544-wl04gd57vuv4k2c4
2013-04-17 15:25:44 +05:30
735a20f320
[REM] Remove the onchange pos available method
...
bzr revid: ggh@tinyerp.com-20130417052737-4t5ejcwzkkkgfqdj
2013-04-17 10:57:37 +05:30
6e63c47c64
[FIX] pos,cash-register: corrected word theoritical to theoretical changes.
...
bzr revid: tta@openerp.com-20130412093807-9bazw36l9khrjm0l
2013-04-12 15:08:07 +05:30
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
e582096959
[IMP] Improved code in Pos
...
bzr revid: ggh@tinyerp.com-20130411102949-lfeakwxskka8hzyy
2013-04-11 15:59:49 +05:30
43a9fa81fd
[IMP] Name of method changed
...
bzr revid: ggh@tinyerp.com-20130411051350-0esvxad9a189x8iz
2013-04-11 10:43:50 +05:30
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
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
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
b062573df4
[IMP] pos,cash-register: Corrected tooltips and layout.
...
bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
2013-04-09 10:17:24 +05:30
Gery Debongnie
Frédéric van der Essen
Randhir Mayatra rma-openerp
Thibault Delavallée
Christophe Matthieu
Olivier Dony
Paramjit Singh Sahota
Atul Patel (OpenERP)
Harry (OpenERP)
Foram Katharotiya (OpenERP)
ggh-openerp
Tejas Tank