Launchpad Translations on behalf of openerp
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Christophe Simonis
4b72678bc7
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
...
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Thibault Delavallée
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
Olivier Dony
bbd813e76e
[MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
...
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Denis Ledoux
65257c48b5
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9835 revid:launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
...
bzr revid: dle@openerp.com-20140210160759-oybxhdwgv2q4ma5a
bzr revid: odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: dle@openerp.com-20140212143044-0c94q4evxl4ltwr0
bzr revid: dle@openerp.com-20140213115951-h7c2o65lgg26aosv
2014-02-13 12:59:51 +01:00
Denis Ledoux
64ead8b005
[FIX] point_of_sale: sales summary report displays actual amount of taxes, instead of displaying the amount where the taxe is applied
...
bzr revid: dle@openerp.com-20140212121408-4tv8ca1ukqempx1k
2014-02-12 13:14:08 +01:00
Denis Ledoux
b6e708c1be
[FIX]point_of_sale: Mode of payment displayed browse_record object instead of the name of the method payment
...
bzr revid: dle@openerp.com-20140212113004-d9eammlp5gtm2m2v
2014-02-12 12:30:04 +01:00
Frédéric van der Essen
bcc6a6aeda
[IMP] point_of_sale: allow negative product quantities, and negatives totals
...
bzr revid: fva@openerp.com-20140211164541-nt2xu5rhdv0tm7pk
2014-02-11 17:45:41 +01:00
Denis Ledoux
8092693eec
[FIX] point_of_sale: distraction error from revision 9814 revid:dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp, missing .id in order to compare company for taxes
...
bzr revid: dle@openerp.com-20140210160645-ww7af7sbkpjf6oss
2014-02-10 17:06:45 +01:00
Frédéric van der Essen
04a6074b1a
[MERGE] forward porting fixes from saas-3
...
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
2014-02-10 16:56:28 +01:00
Frédéric van der Essen
356010c357
[FIX] point_of_sale: totals were not rendrered on firefox due to use of nonstandard innerText dom property
...
bzr revid: fva@openerp.com-20140207161647-rgeymwt4ksei2cod
2014-02-07 17:16:47 +01:00
Denis Ledoux
041f1db4a6
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9814 revid:dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp
...
bzr revid: dle@openerp.com-20140206164522-fi05cb4mpg22rkv2
2014-02-06 17:45:22 +01:00
Denis Ledoux
4818a83f26
[FIX] point_of_sale: validate and closing pos sessoin handle multi company
...
When the user who validated and closed the pos session was not the same user who created the session, and if this user was not in the same company, it wasnt possible to validate and close the pos session.
This explanation if also valid if the user who created the pos session changed of company in his preferences between the creation and the validation.
bzr revid: dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp
2014-02-06 17:34:44 +01:00
Frédéric van der Essen
008e3c1ab0
[FIX] point_of_sale: receipt header & footer could overflow outside of ticket
...
bzr revid: fva@openerp.com-20140206143648-z1bsknelzznf0jqj
2014-02-06 15:36:48 +01:00
Frédéric van der Essen
ec4dd7389b
[IMP] point_of_sale: try harder to connect to proxy when the ip is already known
...
bzr revid: fva@openerp.com-20140206140645-uo82x3tf60wlhytj
2014-02-06 15:06:45 +01:00
Christophe Simonis
1e4d99eede
[MERGE] backport trunk revisions
...
* 9094 fva@openerp.com-20140203144847-21cv7pt7lnlxdsve
* 9095 fva@openerp.com-20140203153233-zj12w2o1uxyz5hoq
bzr revid: chs@openerp.com-20140206132039-y1whtc8qqqs8ey92
2014-02-06 14:20:39 +01:00
Launchpad Translations on behalf of openerp
ffabcd257c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
Launchpad Translations on behalf of openerp
2bebb9cd4d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00:00
Frédéric van der Essen
73569da5e8
[IMP] point_of_sale: open cashbox on payment validation and not on payment method selection
...
bzr revid: fva@openerp.com-20140203153102-kfdaoaoo50mbudpk
2014-02-03 16:31:02 +01:00
Launchpad Translations on behalf of openerp
4208281471
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201060213-5gub5wavdno2vcu4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202053135-qolj2vd2n4tjwbp3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203051828-wflc11kw2q8wc0aq
2014-02-03 05:18:28 +00:00
Frédéric van der Essen
8342a7c51d
[FIX] point_of_sale: update redirection system with the website-al changes
...
bzr revid: fva@openerp.com-20140131114542-09hnjju5sdcen20q
2014-01-31 12:45:42 +01:00
Frédéric van der Essen
a45ae1384c
[IMP] point_of_sale: increased size of logo on receipt
...
bzr revid: fva@openerp.com-20140131102245-hhshe83xuanllhyt
2014-01-31 11:22:45 +01:00
Launchpad Translations on behalf of openerp
ff8f5104b1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140131062421-oq9ywafamdrwjbtj
2014-01-31 06:24:21 +00:00
Antony Lesuisse
4b30f1fcbd
[MERGE] trunk-website-al
...
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
2014-01-31 01:51:57 +01:00
Frédéric van der Essen
ba2d4c9030
[IMP] point_of_sale, hw_escpos: hopefully much faster printing on the posbox by caching logo conversion
...
bzr revid: fva@openerp.com-20140130182109-11njt0khmylp0r7p
2014-01-30 19:21:09 +01:00
Frédéric van der Essen
bc39772f0a
[FIX] point_of_sale: add port and protocol to forced proxy ip if necessary
...
bzr revid: fva@openerp.com-20140130154352-z2ulesl1wliodwja
2014-01-30 16:43:52 +01:00
Fabien Meghazi
3a8291d8ed
[IMP] Use cors in pos devices.js
...
bzr revid: fme@openerp.com-20140130151235-0kewmjr5g2w6aiij
2014-01-30 16:12:35 +01:00
Gery Debongnie
9cdcf812a6
[MERGE] merge from trunk into local branch
...
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
2014-01-30 14:52:51 +01:00
Fabien Meghazi
dac3796177
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140130125458-rnhvcsgpafcaqftt
2014-01-30 13:54:58 +01:00
Frédéric van der Essen
8cf2adf5e3
[IMP] point_of_sale: hold receipts until the printer is back online
...
bzr revid: fva@openerp.com-20140130103051-htsx7ts111axhhub
2014-01-30 11:30:51 +01:00
Gery Debongnie
e58efb7361
[IMP] replace the Order Analysis tree view by a graph view to use the new Pivot table. Also, removes the Day/Month/Year attributes of the postgres view (addon point_of_sale)
...
bzr revid: ged@openerp.com-20140130094455-cai7dvvozwhojaff
2014-01-30 10:44:55 +01:00
Fabien Meghazi
f31ddba8b3
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140129153718-b86vsyogxkr8lk19
2014-01-29 16:37:18 +01:00
Frédéric van der Essen
4e73dce8d3
[FIX] point_of_sale: loading screen was not waiting until posbox connection
...
bzr revid: fva@openerp.com-20140129135710-vobqzjyq12d7io3v
2014-01-29 14:57:10 +01:00
Antony Lesuisse
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Frédéric van der Essen
c36fb2b016
[IMP] point_of_sale: moving demo data image from xml to file system
...
bzr revid: fva@openerp.com-20140127172121-kjpf2b4cpr608e4d
2014-01-27 18:21:21 +01:00
Frédéric van der Essen
e2f2381fc2
[FIX] point_of_sale: fixing pos incompatibilities with the model changes in trunk-website-al
...
bzr revid: fva@openerp.com-20140127161005-2tntipu1x50kuhpz
2014-01-27 17:10:05 +01:00
Frédéric van der Essen
5585a38ecc
[MERGE] from trunk, need point_of_sale updates
...
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
Frédéric van der Essen
85daaccb61
[FIX] point_of_sale: prevent barcode scanner connection loss
...
bzr revid: fva@openerp.com-20140127123614-vjrcwgh7s8rs2y2u
2014-01-27 13:36:14 +01:00
Launchpad Translations on behalf of openerp
d9cdc8564c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00:00
Frédéric van der Essen
c9879fcd1e
[IMP] point_of_sale: refactor proxy to use event based status notifications
...
bzr revid: fva@openerp.com-20140127002203-y2qnhwf0z708gbrx
2014-01-27 01:22:03 +01:00
Frédéric van der Essen
1e09d3b3f5
[IMP] point_of_sale: Realtime printer & scanner online status
...
bzr revid: fva@openerp.com-20140126215528-q32v2q8keh6m0ufo
2014-01-26 22:55:28 +01:00
Launchpad Translations on behalf of openerp
805d3757e9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00:00
Antony Lesuisse
3ad6be4466
point_of_sale restore pristine files
...
bzr revid: al@openerp.com-20140120140333-sxg3gh4lgh20teal
2014-01-20 15:03:33 +01:00
Launchpad Translations on behalf of openerp
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00:00
Frédéric van der Essen
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
Frédéric van der Essen
1353e44bb3
[IMP] point_of_sale: less confusing synchronisation indicator
...
bzr revid: fva@openerp.com-20140116172846-7lyz50jr69crbxsn
2014-01-16 18:28:46 +01:00
Frédéric van der Essen
ff9e9e7c88
[IMP] point_of_sale: adding the icon fonts 'font-awesome'
...
bzr revid: fva@openerp.com-20140116112322-n538un8zobptg2cy
2014-01-16 12:23:22 +01:00
Thibault Delavallée
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
Frédéric van der Essen
2131aaa48f
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140115171732-2uh1mgmseaag34qy
2014-01-15 18:17:32 +01:00