Commit Graph

2628 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Christophe Simonis dfdbf8cdc4 [MERGE] forward port of branch saas-2 up to revid 9162 chs@openerp.com-20140401184913-5hi2h11lnmadbozr
bzr revid: chs@openerp.com-20140401190308-f3f2l9br69qb33ob
2014-04-01 21:03:08 +02:00
Christophe Simonis 822ef4a621 [MERGE] forward port of branch 7.0 up to revid 9943 launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: chs@openerp.com-20140401184913-5hi2h11lnmadbozr
2014-04-01 20:49:13 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Frédéric van der Essen 4745099706 [FIX] hw_escops, point_of_sale: backporting fixes from the pos-restaurant branch
bzr revid: fva@openerp.com-20140328134401-ao85rr8b29nqg626
2014-03-28 14:44:01 +01:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Ravi Gohil (OpenERP) c1ce615891 [FIX] point_of_sale: Replaced the call to undefined search_read(...) with search(...) and read(...) calls. (Maintenance Case: 605684)
bzr revid: rgo@tinyerp.com-20140326112922-x6ac9j157han28kb
2014-03-26 16:59:22 +05:30
Frédéric van der Essen 2378decc04 [MERGE] from trunk
bzr revid: fva@openerp.com-20140326103307-lchlskkdweospgps
2014-03-26 11:33:07 +01:00
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Launchpad Translations on behalf of openerp 6472e4155a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
2014-03-23 06:44:12 +00:00
Denis Ledoux 0e4cfe0add [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9157 revid:dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: chs@openerp.com-20140320134212-9nbuc7uqla4uiyf7
bzr revid: dle@openerp.com-20140320112958-slajf0ho0jtl7u60
bzr revid: dle@openerp.com-20140320161349-olyte7xt35nfj3dg
bzr revid: dle@openerp.com-20140320181737-68q9xh9jhfjynjip
2014-03-20 19:17:37 +01:00
Frédéric van der Essen a4afb910e9 [IMP] hw_escpos / point_of_sale: print receipt with an xml template
bzr revid: fva@openerp.com-20140320164530-odpeuf1igh7wkrms
2014-03-20 17:45:30 +01:00
Denis Ledoux 84eeb79875 [FIX] point_of_sale: add multi-companies rules on pos.config
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
2014-03-20 16:44:36 +01:00
Denis Ledoux cac0c9600a [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
Denis Ledoux 112fe22347 [FIX] point_of_sale: prevent duplicated order posting
bzr revid: dle@openerp.com-20140317164131-eewyqmzz5niebz2a
2014-03-17 17:41:31 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Christophe Simonis d6b93c8b24 [FIX] point_of_sale: use correct method to redirect to login page
bzr revid: chs@openerp.com-20140310153838-svwzew0vuk0khlxz
2014-03-10 16:38:38 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
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
Christophe Simonis cde82643d0 [MERGE] point of sale fixes
bzr revid: chs@openerp.com-20140224172113-gj1t8hi7a8hr60gq
2014-02-24 18:21:13 +01:00
Frédéric van der Essen 3d4f063e51 [FIX] point_of_sale: accept ean13 barcodes with a stripped leading zero
bzr revid: fva@openerp.com-20140224160118-44bnm5kxs53n6siy
2014-02-24 17:01:18 +01:00
Frédéric van der Essen 8d5398d661 [FIX] point_of_sale: if an order fails to mark as PAID, leave it at NEW so that the pos client can process new orders. The error has to be manually corrected by the user before session closing
bzr revid: fva@openerp.com-20140224150830-5uddv7i1djff2aip
2014-02-24 16:08:30 +01:00
Frédéric van der Essen 95f2c5537d [IMP] point_of_sale: make the order flush timeout dependant on the number of orders to be flushed
bzr revid: fva@openerp.com-20140224144143-4fhlswjk2y4skd6j
2014-02-24 15:41:43 +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
ddm@openerp.com 3ea931c486 [IMP] save all orders at once (client)
bzr revid: ddm@openerp.com-20140214144930-5zpn3miys1hwrdoa
2014-02-14 15:49:30 +01:00
ddm@openerp.com e7f238615c [IMP] fetch only relevant fields when checking for dupes
bzr revid: ddm@openerp.com-20140213163849-8v485vq5v4xmeocg
2014-02-13 17:38:49 +01:00
ddm@openerp.com 44ca72e32b merge saas3
bzr revid: ddm@openerp.com-20140213152921-mas1gd10zy9s0nxy
2014-02-13 16:29:21 +01:00
ddm@openerp.com 8bbb206504 [IMP] save new orders only
bzr revid: ddm@openerp.com-20140213152449-tarl15agw9r3teqg
2014-02-13 16:24:49 +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
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 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