odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
88,639 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

597 Commits

Author SHA1 Message Date
Christophe Matthieu 36cdac48b7 [IMP] product: move product packaging field from product.product to product.template 2014-06-03 11:53:41 +02:00
Christophe Matthieu 6e6b5ea15b [FIX] point_of_sale: public category became pos category 2014-05-27 10:36:08 +02:00
Christophe Matthieu 43977deb71 [IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison. 2014-05-27 09:42:52 +02:00
Sylvain LE GAL 5d8927e2b1 [FIX] Issues #167. Remove obsolete shop reference 2014-05-22 22:55:50 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Denis Ledoux cab190b136 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9460 revid:dle@openerp.com-20140519103942-do7uem4in0jfqzo2 2014-05-19 12:46:33 +02:00
Denis Ledoux 87a8e5dc9c [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10054 revid:dle@openerp.com-20140519103020-bcqz4rssbqsvn9m7 2014-05-19 12:39:42 +02:00
Martin Trigaux 0fb14cbe0a [FIX] point_of_sale: add product variant in the displayed name (opw 607456) 2014-05-16 14:06:17 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test 
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
 2014-05-02 15:03:52 +02:00
Frédéric van der Essen 10046d854c [IMP] point_of_sale: use the product unit's precision for rounding the weight 
bzr revid: fva@openerp.com-20140428153326-klgddc93ud9t0uqr
 2014-04-28 17:33:26 +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
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365. 
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
 2014-04-22 11:28:15 +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
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281 
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
 2014-04-03 10:14:27 +02:00
Quentin (OpenERP) 9989113946 [MERGE] merge branch that fixes point of sale accordingly to changes made in stock 
bzr revid: qdp-launchpad@openerp.com-20140328145710-ibzo59dv1p06jbg3
 2014-03-28 15:57:10 +01: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
Josse Colpaert d4eda78813 [IMP] Put company_id on pos config + remove pos config name 
bzr revid: jco@openerp.com-20140324120747-v3mt7pwgqylekshg
 2014-03-24 13:07:47 +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
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
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 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
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
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
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
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
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
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
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
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
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 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
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
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
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
Christophe Simonis eae55df214 [FIX] point_of_sale: let the session generate a session_id itself 
bzr revid: chs@openerp.com-20140115161651-aht37d2ruf1jyzw6
 2014-01-15 17:16:51 +01:00
Frédéric van der Essen edce92293d [FIX] point_of_sale: increased network posbox discovery timeout 
bzr revid: fva@openerp.com-20140115154542-vpl29qoj80ftskuf
 2014-01-15 16:45:42 +01:00
jke-openerp e9e2673044 [REF] Remove unused picture from POS 
bzr revid: jke@openerp.com-20140114135154-4xyk2z4qarx6s59r
 2014-01-14 14:51:54 +01:00
Frédéric van der Essen a97a587fad [IMP] point_of_sale: posbox automatic discovery 
bzr revid: fva@openerp.com-20140110171746-286285ds696d5kby
 2014-01-10 18:17:46 +01:00
Frédéric van der Essen a726bf2d76 [FIX] point_of_sale: removed console.logs, fixed the tests to work with the new ui 
bzr revid: fva@openerp.com-20140106174957-ee323a33j59q1npw
 2014-01-06 18:49:57 +01:00