Commit Graph

2006 Commits

Author SHA1 Message Date
Stephane Wirtel 24a4e57171 [FIX] point_of_sale: show the opening cash control
bzr revid: stw@openerp.com-20120924115320-nkbfhfnyab4bhxrc
2012-09-24 13:53:20 +02:00
Stephane Wirtel f0a883e6d6 [FIX] point_of_sale: Show the opening_control & closing_control
bzr revid: stw@openerp.com-20120924102613-twii7ba34wctx6c6
2012-09-24 12:26:13 +02:00
Frédéric van der Essen 968325cb39 [WIP] point_of_sale: first test of new TPE API
bzr revid: fva@openerp.com-20120918133732-q7za0r3dcggem8mw
2012-09-18 15:37:32 +02:00
Quentin (OpenERP) 85b16184f8 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120918131350-xx40khn6xsb5j16f
2012-09-18 15:13:50 +02:00
Stephane Wirtel 69d83db1e5 [MERGE] point_of_sale: select the cash journals and hide some elements on the form view.
bzr revid: stw@openerp.com-20120917153714-kelopzdwaysht3pd
2012-09-17 17:37:14 +02:00
Stephane Wirtel 2a4aaeba31 [FIX] point_of_sale: Show/Hide some groups in function of the state and the cash_control flag
bzr revid: stw@openerp.com-20120917140138-sjsnjxv27nd8rnao
2012-09-17 16:01:38 +02:00
Stephane Wirtel 06852d994b [FIX] point_of_sale: Take the 'cash' journals if there is no specific cash journal for the Point Of Sale
bzr revid: stw@openerp.com-20120917120926-h3bzu2k9ds5lnjjr
2012-09-17 14:09:26 +02:00
Antonin Bourguignon ccb15e76f6 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx
2012-09-17 13:44:55 +02:00
Atul Patel (OpenERP) b4d415ff9b [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120917050738-i5730n5sbqvnfsnh
2012-09-17 10:37:38 +05:30
Fabien Pinckaers b9fa71cc59 [MERGE] merge rpa's imprvoements of modules description
bzr revid: fp@openerp.com-20120916212615-jfoghzsady0ektp1
2012-09-16 23:26:15 +02:00
Fabien Pinckaers ab4b7da49f [IMP] cleaned ir.actions.todo to launch newly installed application
bzr revid: fp@openerp.com-20120916114249-5px8shvbm3tzhidh
2012-09-16 13:42:49 +02:00
Gilles Major 59c03591df [MERGE] improvements on module descriptions
bzr revid: gim@openerp.com-20120914140950-drka4c0tnbnkw3fg
2012-09-14 16:09:50 +02:00
Gilles Major 30839863e8 [IMP] improve module descriptions
bzr revid: gim@openerp.com-20120914122827-dhao39ur269mmin8
2012-09-14 14:28:27 +02:00
Atul Patel (OpenERP) 2e65d4319f [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120912051440-raj6egoom3qyfsmm
bzr revid: atp@tinyerp.com-20120913034436-i09g3lujgvy81gr6
bzr revid: atp@tinyerp.com-20120914051314-m5g13izj55f4sxqi
2012-09-14 10:43:14 +05:30
Jigar Amin - OpenERP d7dfc3dc1c [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
Frédéric van der Essen 8920abbb65 [MERGE] from trunk
bzr revid: fva@openerp.com-20120913151434-y30kfigwj20w3y58
2012-09-13 17:14:34 +02:00
Frédéric van der Essen 703cc35a4d [FIX] point_of_sale: demo data ean match the debug window defaults
bzr revid: fva@openerp.com-20120913150913-bq96hvr3cmbgijjg
2012-09-13 17:09:13 +02:00
Frédéric van der Essen 200d33229a [IMP] point_of_sale: scan and search in products packagings
bzr revid: fva@openerp.com-20120913140310-4z9bxo1d0r13ep76
2012-09-13 16:03:10 +02:00
Frédéric van der Essen b7d56a0b04 [IMP] point_of_sale: some improvements to the debug window
bzr revid: fva@openerp.com-20120913104621-zryga82o3d4vq174
2012-09-13 12:46:21 +02:00
Rucha (Open ERP) 10c5a5c02a [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120913053058-unlfdj92o69rnjam
2012-09-13 11:00:58 +05:30
Fabien Pinckaers a5f52bc3e5 [IMP] touchscreen pos, usability improvements
bzr revid: fp@tinyerp.com-20120912182126-7lgskacso9pfh7er
2012-09-12 20:21:26 +02:00
Fabien Pinckaers 168e3244f3 [IMP] start session directly if possible with POS
bzr revid: fp@tinyerp.com-20120912181814-4t3rlicu5s9wqap8
2012-09-12 20:18:14 +02:00
Frédéric van der Essen 9dfca35b19 [IMP] point_of_sale: put debug window code in the right place
bzr revid: fva@openerp.com-20120912162653-fnbvqwg4l51lveal
2012-09-12 18:26:53 +02:00
Frédéric van der Essen a5bed8994c [IMP] point_of_sale: debug window
bzr revid: fva@openerp.com-20120912161229-4lgcgt4xt2cdzceo
2012-09-12 18:12:29 +02:00
Frédéric van der Essen 4db2bc0c43 [FIX] point_of_sale: help wasn't always cancelled when popup closed
bzr revid: fva@openerp.com-20120911101830-dvxi9sg5oan5r5nc
2012-09-11 12:18:30 +02:00
Rucha (Open ERP) 9899e87dd0 [IMP]: point_of_sale: Improved module description for point_of_sale
bzr revid: rpa@tinyerp.com-20120911100941-3r0a3q3ojry8si4h
2012-09-11 15:39:41 +05:30
Atul Patel (OpenERP) 431fae4da5 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120911045411-mivfwqle7pidfr68
2012-09-11 10:24:11 +05:30
Fabien Pinckaers f711f7d9a6 [MERGE] muti-currency group
bzr revid: fp@openerp.com-20120910201408-paf7q0cj22i72k2n
2012-09-10 22:14:08 +02:00
Frédéric van der Essen d71e5b45b6 [MERGE] from trunk
bzr revid: fva@openerp.com-20120910154950-rg1phce0w33gsq8b
2012-09-10 17:49:50 +02:00
Frédéric van der Essen 83fc106eaa [FIX] point_of_sale: coherent image url handling
bzr revid: fva@openerp.com-20120910154828-4k699hi3lu8lgxvu
2012-09-10 17:48:28 +02:00
Stephane Wirtel 7c9b5c8e5b [IMP] point_of_sale: If there is no journals for the pos.config, select the cash journals
bzr revid: stw@openerp.com-20120910091618-nzv26m258xx64na5
2012-09-10 11:16:18 +02:00
Atul Patel (OpenERP) f1cf4c04b9 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
2012-09-09 16:32:14 +05:30
Thibault Delavallée 3982e5ba7a [IMP] mail_group, point of sale, hr: updated image fields help, as small and medium sizes are now 64x64 ans 128x128, to match more closely OpenERP image sizes. product: image_medium are not up-sized when resizing them. This means that images smaller than 128x128 won't be resized in image_medium. The purpose is to avoid having unwanted blank frame around images in POS.
bzr revid: tde@openerp.com-20120907095155-i5hlmidnkq7r2r7b
2012-09-07 11:51:55 +02:00
Thibault Delavallée b086b8a584 [CLEAN] mail_group, product, point_of_sale, hr: cleaned help of image, because it was too technical-related. Added a comment in code instead about PIL and base64. By the way, small cleaning of the white spaces.
bzr revid: tde@openerp.com-20120907092333-9f745210yr3p22ay
2012-09-07 11:23:33 +02:00
Turkesh Patel (Open ERP) ac75763855 [MRG] merge with lp:openobjec-addons.
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30
Antony Lesuisse aac17b11a4 [FIX] remove semantic part1
bzr revid: al@openerp.com-20120906101723-eeieyzhj4racxq14
2012-09-06 12:17:23 +02:00
Frédéric van der Essen b2cb4b841d [FIX] point_of_sale: unrecognized_items error handling
bzr revid: fva@openerp.com-20120905210751-7lbzkypzefy6zb3f
2012-09-05 23:07:51 +02:00
Frédéric van der Essen 998134d464 [FIX] point_of_sale: help popup on welcome screen
bzr revid: fva@openerp.com-20120905203317-34hkv0ouawdp8gxw
2012-09-05 22:33:17 +02:00
Frédéric van der Essen 63df74b8dc [FIX] keyboard layout and numpad input
bzr revid: fva@openerp.com-20120905202058-o5r2ckzhwdkv2xhq
2012-09-05 22:20:58 +02:00
Frédéric van der Essen bff5b81db3 [FIX] fixing some regressions
bzr revid: fva@openerp.com-20120905164221-hcigfd0kxdckgz94
2012-09-05 18:42:21 +02:00
Olivier Dony 41e16c6592 [MERGE] sync with trunk
bzr revid: odo@openerp.com-20120905163135-9f6q0ghri1kq6z75
2012-09-05 18:31:35 +02:00
Stephane Wirtel 97de9d6d3f [FIX] point_of_sale: Set the right account for the internal account.
[REF] point_of_sale: Review the code for the Take Money Out and Push Money In.
[FIX] point_of_sale: Can post a session with an order in the invoiced state.

bzr revid: stw@openerp.com-20120905150538-v9ex7wehyebft7tu
2012-09-05 17:05:38 +02:00
Frédéric van der Essen 49b1605b98 [FIX] point_of_sale: css fixes related to ul/li semantic css changes
bzr revid: fva@openerp.com-20120905115000-dx2exlr3cnn2iszy
2012-09-05 13:50:00 +02:00
Frédéric van der Essen eb53669cb1 [MERGE] from trunk
bzr revid: fva@openerp.com-20120905094101-j20tm78k7sq6dnxd
2012-09-05 11:41:01 +02:00
Frédéric van der Essen f24667b1f9 [FIX] point_of_sale: ean argument was wrongly passed to the proxy
bzr revid: fva@openerp.com-20120905092053-9hj9sbscqrjbg0h0
2012-09-05 11:20:53 +02:00
niv-openerp bc586f2efe merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20120905081314-uu3khdpohgz23j6q
2012-09-05 10:13:14 +02:00
Olivier Dony 2160072508 [MERGE] sync with trunk
bzr revid: odo@openerp.com-20120905073134-v1j98vzvmwe6a72i
2012-09-05 09:31:34 +02:00
Antony Lesuisse 709331f682 [MERGE] remove unneeded demo users
bzr revid: al@openerp.com-20120905001533-fz1htj832djequ6p
2012-09-05 02:15:33 +02:00
niv-openerp 5126f6ff6e wip
bzr revid: nicolas.vanhoren@openerp.com-20120904163725-ptsij09rve8j3txs
2012-09-04 18:37:25 +02:00
Frédéric van der Essen ee07aa224c [IMP] point_of_sale: added console ean input in debug mode
bzr revid: fva@openerp.com-20120904154603-khymfg996jdgn9xr
2012-09-04 17:46:03 +02:00
Jiten (OpenERP) 5930fd069f [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20120904102700-8f94o2dvdt0f33bv
2012-09-04 15:57:00 +05:30
Stephane Wirtel 42ae38116a [MERGE] point_of_sale: Improve the layout of the pos.session.opening wizard.
bzr revid: stw@openerp.com-20120904100711-rp4ca0u9hs0t7vm4
2012-09-04 12:07:11 +02:00
Thibault Delavallée 48c081f271 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
Fabien Pinckaers 74e4fe0f53 [MERGE] USablity improvements: product form/kanban/search, membership, projects
bzr revid: fp@tinyerp.com-20120903175638-lq221k6yjyams8kn
2012-09-03 19:56:38 +02:00
Frédéric van der Essen d66519fda2 [FIX] point_of_sale: I should have tested this more
bzr revid: fva@openerp.com-20120903145958-c7i93lp8q8w8ilop
2012-09-03 16:59:58 +02:00
Frédéric van der Essen e0d5b6ac8b [IMP] point_of_sale: fetch is now a method
bzr revid: fva@openerp.com-20120903144354-8563uwq7x0cvqvrp
2012-09-03 16:43:54 +02:00
Frédéric van der Essen f8212984f3 [IMP] point_of_sale: moved data loading to it's own method for easier extension dev
bzr revid: fva@openerp.com-20120903142527-iv0d97a0tzbjyo6o
2012-09-03 16:25:27 +02:00
Stephane Wirtel b832115057 [FIX] point_of_sale: Return the state of the session in the wizard
bzr revid: stw@openerp.com-20120903134533-lqyay7rv7jkusde8
2012-09-03 15:45:33 +02:00
Frédéric van der Essen 2c3b3a0bd1 [IMP] point_of_sale: adding a description field to the products
bzr revid: fva@openerp.com-20120903133239-hai1o87yrpxvbaic
2012-09-03 15:32:39 +02:00
Stephane Wirtel d5459171bd [FIX] point_of_sale: Show the Opening and Closing balance only if the session is closed
bzr revid: stw@openerp.com-20120903125740-xxl4x298imiyo0y9
2012-09-03 14:57:40 +02:00
Frédéric van der Essen 6040787bb0 [FIX] point_of_sale: forgot to add the nohover css file
bzr revid: fva@openerp.com-20120903124838-gmn4wsjrbqnhbi9m
2012-09-03 14:48:38 +02:00
Frédéric van der Essen 81115666a1 [IMP] point_of_sale: only sell products that can be sold ...
bzr revid: fva@openerp.com-20120903122649-etypfgvdjo3s8p0s
2012-09-03 14:26:49 +02:00
Frédéric van der Essen 716651c27d [IMP] point_of_sale: alternative css without hover effects for resistive screens
bzr revid: fva@openerp.com-20120903115954-t26j8qx54a6o9pta
2012-09-03 13:59:54 +02:00
Tejas Tank f39f799897 Fix: Account configuration : removed currency group.
bzr revid: tta@openerp.com-20120903095908-tswt6gi2zl5w89s2
2012-09-03 15:29:08 +05:30
Frédéric van der Essen a77587e064 [MERGE] from trunk
bzr revid: fva@openerp.com-20120903094840-vd63m4i8vkqxjij2
2012-09-03 11:48:40 +02:00
Thibault Delavallée 6fa349a4eb [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
Jiten (OpenERP) dfb82b2081 [MERGE] Merge from trunk.
bzr revid: jra@tinyerp.com-20120903065444-bcadcpsnadx0vhpx
2012-09-03 12:24:44 +05:30
Launchpad Translations on behalf of openerp e3f1c26e6a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
2012-09-03 05:21:17 +00:00
Fabien Pinckaers 7ebf462e07 [IMP] product view
bzr revid: fp@tinyerp.com-20120831174746-7bfitkd45m73r6oz
2012-08-31 19:47:46 +02:00
Cecile Tonglet 4785fc109e [FIX] Point of Sales Users Demo
bzr revid: cto@openerp.com-20120831170747-iyptvo6iy96d12w4
2012-08-31 19:07:47 +02:00
Fabien Pinckaers 33897328bc [IMP] product view
bzr revid: fp@tinyerp.com-20120831164018-b8m7xhxi2na5eraj
2012-08-31 18:40:18 +02:00
Fabien Pinckaers 349c24a1cd [IMP] usability
bzr revid: fp@tinyerp.com-20120831163517-vqatk8mzl7u2vuym
2012-08-31 18:35:17 +02:00
Fabien Pinckaers 6eb0b6af71 fix
bzr revid: fp@tinyerp.com-20120831162831-qn2ai0258pki7fxp
2012-08-31 18:28:31 +02:00
Frédéric van der Essen 9cfe5665a5 [DONE] point_of_sale: disable validation button when order not fully paid
bzr revid: fva@openerp.com-20120831145606-nrk44gs60lab4k3l
2012-08-31 16:56:06 +02:00
Frédéric van der Essen b3ec8d7647 [MERGE] from trunk
bzr revid: fva@openerp.com-20120831143222-j86sa4w0vuy24z7j
2012-08-31 16:32:22 +02:00
Frédéric van der Essen 846ec67adc [WIP] point_of_sale: disable validation button when order not fully paid
bzr revid: fva@openerp.com-20120831143159-a64527c3a1a8chk0
2012-08-31 16:31:59 +02:00
Stephane Wirtel bf513b5919 [IMP] point_of_sale: Add a description when the session is in progress
bzr revid: stw@openerp.com-20120831102509-yv3bc68gii0sexfk
2012-08-31 12:25:09 +02:00
Jiten (OpenERP) 2e664de4f8 [IMP] Improved code to remove warning(server log) for deprecated type.
bzr revid: jra@tinyerp.com-20120831101659-voh9g3kwmhji2bf1
2012-08-31 15:46:59 +05:30
Thibault Delavallée c14a11482c [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
Olivier Dony 1dce0b1dc4 [FIX] all mail dependencies: replace message_post call by normal record + review misc wording
bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
2012-08-30 16:18:52 +02:00
Stephane Wirtel 54237bc2a2 [MERGE] point_of_sale: Add some improvements and bug fixes
bzr revid: stw@openerp.com-20120830132642-o9ish51w0s7aigzn
2012-08-30 15:26:42 +02:00
Stephane Wirtel 7d120eb1d1 [FIX] point_of_sale: Set the right balance end for a bank statement
[FIX] point_of_sale: Show/Hide some tabs

bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
2012-08-29 17:46:34 +02:00
Frédéric van der Essen 93395ac1ec [MERGE] from trunk
bzr revid: fva@openerp.com-20120829125759-mjulntnmsyjzs0xq
2012-08-29 14:57:59 +02:00
Frédéric van der Essen 1eedcaedad [IMP] point_of_sale: TODO changes
bzr revid: fva@openerp.com-20120829125640-5bml13zupja3w30b
2012-08-29 14:56:40 +02:00
Stephane Wirtel 6aded504b3 [FIX] point_of_sale: redefine the copy function for the pos.config to avoid a copy of the sequence.
[IMP] point_of_sale: Associate a default category for the existing products.

bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
2012-08-29 14:25:01 +02:00
Dharti Ratani (OpenERP) 0e14e8dc20 [MERGE]Merged with latest trunk
bzr revid: dhr@tinyerp.com-20120829102402-3sdf5i8rfgq9dxca
2012-08-29 15:54:02 +05:30
Fabien Pinckaers d3bb4f5ae5 merge
bzr revid: fp@tinyerp.com-20120829094828-b8pxz76tfnigfffw
2012-08-29 11:48:28 +02:00
Thibault Delavallée 8b910c1f1d [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
Dharti Ratani (OpenERP) 6086951935 [MERGE]Merged with trunk
bzr revid: dhr@tinyerp.com-20120829061429-yko2f9xgqsyynvig
2012-08-29 11:44:29 +05:30
Stephane Wirtel 768d9cdb7e [IMP] account: Merge the opening_control and closing_control flags in cash_control
[IMP] account: In the case where the bank statement is a cash register, we can get the coins of the last register.
[IMP] account: Hide the 'Available Coins' if the journal hasn't the cash_control flag.
[FIX] account: Use some default values for the profit/loss and internal account.
[IMP] point_of_sale: Avoid to have two payment methods with the cash_control in a pos.config object.
[REF] point_of_sale: Refactor the computation code of the cash_journal, cash_register and cash_control flags.
[IMP] point_of_sale: Store the difference in the right account if the journal of the statement is a cash_control or nota.
[FIX] point_of_sale: Use the session name instead of the order name for the account.bank.statement.line .
[IMP] point_of_sale: [DEMO] Define the default payment_methods for the pos.config.

bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
2012-08-28 13:21:16 +02:00
Dharti Ratani (OpenERP) 3733972565 [MERGE]merged with trunk
bzr revid: dhr@tinyerp.com-20120828092928-da2a6k1f2e7g9i42
2012-08-28 14:59:28 +05:30
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Dharti Ratani (OpenERP) c2a8adb976 [IMP]pos,product(pricelist) and hr_expense_report : applying multi_currency group to currency field
bzr revid: dhr@tinyerp.com-20120828070841-l318wc2b4jkm99dz
2012-08-28 12:38:41 +05:30
Thibault Delavallée 4b0d1be1c0 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
niv-openerp 65f532e001 [IMP] made a whole-application replace of $element by $el
bzr revid: nicolas.vanhoren@openerp.com-20120824182743-1d9cii7kigc7exer
2012-08-24 20:27:43 +02:00
Stephane Wirtel 45cf233538 [FIX] point_of_sale: Hide the has_XXX_control fields in the session
bzr revid: stw@openerp.com-20120824130730-8dqrjjqr7z1stwl5
2012-08-24 15:07:30 +02:00
Stephane Wirtel ec6bd9c649 [FIX] point_of_sale: Review the buttons for the pos.session object
bzr revid: stw@openerp.com-20120824114300-jdax2175w9mbcb2n
2012-08-24 13:43:00 +02:00
Bhumi Thakkar (Open ERP) de6d26886a [IMP] Remove type field from ir.ui.view model.
bzr revid: bth@tinyerp.com-20120823125311-nx4x46ea3g2ercl8
2012-08-23 18:23:11 +05:30
Dharti Ratani (OpenERP) 00139302a7 [MERGE]merged with trunk
bzr revid: dhr@tinyerp.com-20120823072017-c48q59mif39j55wm
2012-08-23 12:50:17 +05:30
Dharti Ratani (OpenERP) 39ac8404ff [IMP]Tax fix related to stock and pos
bzr revid: dhr@tinyerp.com-20120823071044-aonyui4dq2li8xnj
2012-08-23 12:40:44 +05:30
Dharti Ratani (OpenERP) 73025425f0 [IMP]Tax related changes in mrp and pos
bzr revid: dhr@tinyerp.com-20120823051120-en7wvauuwgop2w26
2012-08-23 10:41:20 +05:30
Antonin Bourguignon 121b351b59 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Quentin (OpenERP) a0679e6e4f [MERGE] demo data branch
bzr revid: qdp-launchpad@openerp.com-20120822160856-k308a270wx2wnsj6
2012-08-22 18:08:56 +02:00
Fabien Pinckaers e30fed20b8 merge_trunk
bzr revid: fp@tinyerp.com-20120822133742-yx81c62bux28wruy
2012-08-22 15:37:42 +02:00
Dharti Ratani (OpenERP) 1dd5177e11 [IMP]
bzr revid: dhr@tinyerp.com-20120822133428-24wti3kz7lh469jh
2012-08-22 19:04:28 +05:30
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
Stephane Wirtel 197e673100 [IMP] point_of_sale: improve the layout of 'your session'
bzr revid: stw@openerp.com-20120821150612-4ikdil8vzmkc0wwz
2012-08-21 17:06:12 +02:00
Dharti Ratani (OpenERP) 3ecb0798a3 [IMP]Fixing inherit id issues related to procurement and location changes
bzr revid: dhr@tinyerp.com-20120821124241-mibvnmuxby5xuzsv
2012-08-21 18:12:41 +05:30
Frédéric van der Essen 0d930ba843 [MERGE] from stw
bzr revid: fva@openerp.com-20120821121123-ingbtoedurmt6h48
2012-08-21 14:11:23 +02:00
Frédéric van der Essen 2e4d656dcb [IMP] point_of_sale: removed useless settings, Wubbit Twarks
bzr revid: fva@openerp.com-20120821104814-wuxk1qptj7xqr1i9
2012-08-21 12:48:14 +02:00
Frédéric van der Essen 23de15d82b [IMP] point_of_sale: simpler way to load models
bzr revid: fva@openerp.com-20120821100452-zop43cmqyxq0del0
2012-08-21 12:04:52 +02:00
Stephane Wirtel bc1f8e6d4b [IMP] point_of_sale: improve the layout of the pos.order
bzr revid: stw@openerp.com-20120821084857-4ieoknwcsivdooa1
2012-08-21 10:48:57 +02:00
Stephane Wirtel 28c036aef0 [FIX] point_of_sale: A manager can create a ir.sequence for the pos.config
bzr revid: stw@openerp.com-20120821083828-as5sqvatvvseaj9d
2012-08-21 10:38:28 +02:00
Stephane Wirtel c803243a38 [FIX] point_of_sale: remove an useless test
bzr revid: stw@openerp.com-20120821082356-dr4vdka5u796ho9w
2012-08-21 10:23:56 +02:00
Stephane Wirtel ca93a52e64 [FIX] point_of_sale: fix a report
bzr revid: stw@openerp.com-20120821082343-mu1p8231c4wa0kjm
2012-08-21 10:23:43 +02:00
Frédéric van der Essen b3cecb2162 [IMP] point_of_sale: renamed the js files
bzr revid: fva@openerp.com-20120821075434-dy4oqwuok39i4eyj
2012-08-21 09:54:34 +02:00
Frédéric van der Essen 8d052c96bc [FIX] point_of_sale: added contact_address to print info, empty order styling
bzr revid: fva@openerp.com-20120820135957-o5exttxak611e624
2012-08-20 15:59:57 +02:00
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
Frédéric van der Essen c447533f7d [FIX] point_of_sale: fix css for receipt printing
bzr revid: fva@openerp.com-20120820124007-fg36abyblxpboiyi
2012-08-20 14:40:07 +02:00
Frédéric van der Essen b29c4a6113 [IMP] point_of_sale: improved receipt screen
bzr revid: fva@openerp.com-20120820102401-t5zkmh2hoamba719
2012-08-20 12:24:01 +02:00
Frédéric van der Essen d0f762ab1f [IMP] point_of_sale: more todos
bzr revid: fva@openerp.com-20120820093010-a2ymlgaa6z5ku53o
2012-08-20 11:30:10 +02:00
Frédéric van der Essen 185c82348c [IMP] point_of_sale: todos
bzr revid: fva@openerp.com-20120820071327-wfbd7g5wbh5zrnaa
2012-08-20 09:13:27 +02:00
Frédéric van der Essen 69578a30c2 [MERGE] from stw
bzr revid: fva@openerp.com-20120817154315-yj19b39s2693apze
2012-08-17 17:43:15 +02:00
Frédéric van der Essen da93d8b440 [IMP] point_of_sale: all images are app-cached now
bzr revid: fva@openerp.com-20120817154248-z86i0a838wd9ul92
2012-08-17 17:42:48 +02:00
Stephane Wirtel 62ffc54bf2 [MERGE] improve the point of sale
bzr revid: stw@openerp.com-20120817151933-ztflsr992l8ixze8
2012-08-17 17:19:33 +02:00
Stephane Wirtel 890371d982 [IMP] point_of_sale: fix some typo
[FIX] point_of_sale: add some groups

bzr revid: stw@openerp.com-20120817151529-1kkm9m5g5ob291ur
2012-08-17 17:15:29 +02:00
Stephane Wirtel 4230baf35a [FIX] point_of_sale: set the 'False' value to opening_control and closing_control
bzr revid: stw@openerp.com-20120817143134-v9vjzvgh5kddeduc
2012-08-17 16:31:34 +02:00
Stephane Wirtel 211a9d0904 [FIX] point_of_sale: Typo
bzr revid: stw@openerp.com-20120817142838-rc2zu2xa57xoty7f
2012-08-17 16:28:38 +02:00
Frédéric van der Essen e47792d9bf [IMP] point_of_sale: category pictures are back and cached
bzr revid: fva@openerp.com-20120817142415-3k9cdc1mc68n8shk
2012-08-17 16:24:15 +02:00
Fabien Pinckaers 6ac583c0f7 [IMP] mail cleaning
bzr revid: fp@tinyerp.com-20120817111936-2d33nlqlbvkjb374
2012-08-17 13:19:36 +02:00
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Fabien Pinckaers 66ece041f0 [IMP] append note
bzr revid: fp@tinyerp.com-20120817102650-1sglq1y2dbb3xqju
2012-08-17 12:26:50 +02:00
Frédéric van der Essen adc76215ef [FIX] point_of_sale: connection is now session. Removed console.log
bzr revid: fva@openerp.com-20120816163251-6nds8dmlcz8mz30v
2012-08-16 18:32:51 +02:00
Frédéric van der Essen 36b8744644 [MERGE] from trunk
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
Frédéric van der Essen 715e52130f [IMP] point_of_sale: removed websql option from backend
bzr revid: fva@openerp.com-20120816160455-25gz0qb7kh0t3nfs
2012-08-16 18:04:55 +02:00
Frédéric van der Essen 15261610fb [IMP] point_of_sale: removed websql option from client
bzr revid: fva@openerp.com-20120816160120-v27xcczg3be31pnz
2012-08-16 18:01:20 +02:00
Frédéric van der Essen b3bcd4eabc [FIX] point_of_sale: fixed some bugs with the scanner
bzr revid: fva@openerp.com-20120816155801-oexzurmsgfiv2xt9
2012-08-16 17:58:01 +02:00
Frédéric van der Essen daba4e4fc2 [IMP] point_of_sale: ImageCache and RegExp search
bzr revid: fva@openerp.com-20120816150213-mdctwsjxiyjh4lxi
2012-08-16 17:02:13 +02:00
Rucha (Open ERP) 7a24bdb1f7 [FIX]: Improved old product names with new
bzr revid: rpa@tinyerp.com-20120816084224-t12wf5vipd8u90a7
2012-08-16 14:12:24 +05:30
Atul Patel (OpenERP) f35c0b3d44 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120814161000-41ai95ixagtqteok
2012-08-14 21:40:00 +05:30
Frédéric van der Essen 0e31e74b40 [FIX] point_of_sale: forgot to remove a ref to the DAO
bzr revid: fva@openerp.com-20120814153905-zlxpitgrhizt68zt
2012-08-14 17:39:05 +02:00
Christophe Simonis c5dc5cef00 [IMP] sed -i '' -e 's/connection/session/g'
bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
2012-08-14 17:30:53 +02:00
Frédéric van der Essen 5a3dc89e7c [IMP] point_of_sale: DAO removed, db used for orders instead. Don't stop sending orders on single failure
bzr revid: fva@openerp.com-20120814152112-vmitvbajx3r2mdeh
2012-08-14 17:21:12 +02:00
Vo Minh Thu 2376fe0add [MERGE] merged view changes: the `type` is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Frédéric van der Essen 36ea689ad9 [MERGE] html5 amnifest
bzr revid: fva@openerp.com-20120814120052-s9avcsbsxl06zewr
2012-08-14 14:00:52 +02:00
Frédéric van der Essen 7559c2e771 [WIP] point_of_sale: moving DAO to db
bzr revid: fva@openerp.com-20120814115630-23cv9s71zh79xcve
2012-08-14 13:56:30 +02:00
Atul Patel (OpenERP) 652300eb89 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120814061700-k4swskeiz9r3ypn5
2012-08-14 11:47:00 +05:30
Antony Lesuisse 643b6cfc36 [FIX] image urls and NETWORK section
bzr revid: al@openerp.com-20120813223032-t6nouzthq43xr841
2012-08-14 00:30:32 +02:00
Antony Lesuisse 8d97d9830d [FIX] remove unused or duplicate files
bzr revid: al@openerp.com-20120813221645-s8n8du7fy2sqhl0g
2012-08-14 00:16:45 +02:00
Antony Lesuisse 8627aa0b28 [IMP] point_of_sale add html5 manifest on /pos/app
bzr revid: al@openerp.com-20120813221601-gfvwiwii6s1b785d
2012-08-14 00:16:01 +02:00