Commit Graph

2645 Commits

Author SHA1 Message Date
Simon Lejeune 0d2a0e8109 [FIX] point of sale: payment report bad behaviour when printing multiple documents
bzr revid: sle@openerp.com-20140429122400-s2ey704e8qfifzzj
2014-04-29 14:24:00 +02:00
Simon Lejeune ba6e63d690 [IMP] point of sale: better check before printing a potential invoice from a pos order
bzr revid: sle@openerp.com-20140429121329-lxgwpbuccdy67r4v
2014-04-29 14:13:29 +02:00
Simon Lejeune 8db594758e [REM] point_of_sale: removed closed cashbox report that is nearly the session resume report
bzr revid: sle@openerp.com-20140429114045-kaj86qq00dovj75o
2014-04-29 13:40:45 +02:00
Simon Lejeune 58233749ef [FIX] point of sale session summary report: better display, divide the tables
bzr revid: sle@openerp.com-20140429100738-t5tvsucuu7ss42v8
2014-04-29 12:07:38 +02:00
Simon Lejeune 003b3fd41e [MERGE] trunk
bzr revid: sle@openerp.com-20140428162055-9t72vke2kdkhqcwr
2014-04-28 18:20:55 +02:00
Simon Lejeune 0d6ea88e57 [FIX] pos test reports: typo
bzr revid: sle@openerp.com-20140428162032-9s1s0wwxkboqeo2z
2014-04-28 18:20:32 +02:00
Frédéric van der Essen f210babfc6 [MERGE] from trunk
bzr revid: fva@openerp.com-20140425122510-y60j039e3khbwwd5
2014-04-25 14:25:10 +02:00
Frédéric van der Essen 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
Frédéric van der Essen f3da22c067 [IMP] point_of_sale, hw_scale: first commit for the hw_scale module, which handles scale connections for the POS
bzr revid: fva@openerp.com-20140424171259-hi9ma6w0fkdfrqnv
2014-04-24 19:12:59 +02:00
Simon Lejeune b667f6a292 [MERGE] trunk
bzr revid: sle@openerp.com-20140422124030-gowf9zyx1d36j01g
bzr revid: sle@openerp.com-20140424124655-95ex30m25soiu4wd
2014-04-24 14:46:55 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Simon Lejeune 9f6182b311 [MERGE] trunk
bzr revid: sle@openerp.com-20140417150308-xuhxfxb8d45j3yfq
2014-04-17 17:03:08 +02:00
Cedric Snauwaert d86cc2063e [FIX]tooltip: remove old and not necessary tooltip line from pos start widget
bzr revid: csn@openerp.com-20140417122946-n8pq7ln66yg0n49m
2014-04-17 14:29:46 +02:00
Simon Lejeune 28fa8ebb8c [IMP] point of sale: added a session summary report
bzr revid: sle@openerp.com-20140414144427-ry3yxybx385a4pop
2014-04-14 16:44:27 +02:00
Simon Lejeune 11a0b506d0 [FIX] bad condition on report_payment qweb view resulting in empty report
bzr revid: sle@openerp.com-20140414125522-v4obm4xreljizqje
2014-04-14 14:55:22 +02:00
Simon Lejeune 57fc6c4d55 [FIX] When converting a pos order line to an invoice line, a key 'note' was passed to the 'create' but there is not a 'note' field in the model invoice line.
bzr revid: sle@openerp.com-20140414123529-7k2a0fdsz7fg01xl
2014-04-14 14:35:29 +02:00
Simon Lejeune afd490c984 [REM] removed details_summary, sales_user, sales_user_today, payment_user reports, wizards and rml
[REM] dead code:  pos_box_entries.py/xml, pos_box_out.py/xml, pos_return_view.py/xml
[ADD] lines, invoice, cashbox of the day, payment, receipt, users product reports converted to QWeb. Added YML tests for the bank statement reports.
[FIX] closed cashbox of the day sql using old fields in its queries, yml test not correctly generating an invoice from a pos order

bzr revid: sle@openerp.com-20140414104954-xj10wi640tyr3ufe
2014-04-14 12:49:54 +02:00
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