Commit Graph

174 Commits

Author SHA1 Message Date
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
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
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
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 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 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 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
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Frédéric van der Essen 01cb3ebb99 [MERGE] from trunk
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
Frédéric van der Essen 4c3e048d40 [MERGE WIP] merging from trunk. Still some issues with the thumbnails
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
Fabien Pinckaers c17b2443e7 [IMP] improved UI for PoS - mainly forms version=7.0
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
Antonin Bourguignon 72fdeea2d8 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120810153957-asszi74t9dxrzhx7
2012-08-10 17:39:57 +02:00
Olivier Dony 1f32ebdc7c [FIX] pos: Fix runbot breakage: use new XML id for unreference_product + move to pos_data file
bzr revid: odo@openerp.com-20120810151204-t6c0wmiusf9un7gq
2012-08-10 17:12:04 +02:00
Frédéric van der Essen 8759e49b83 [FIX] point_of_sale: reverting changes on the pos's views
bzr revid: fva@openerp.com-20120810141930-3xkh9ny0splzrs75
2012-08-10 16:19:30 +02:00
Antonin Bourguignon f2fd44d85b [MERGE] latust trunk
bzr revid: abo@openerp.com-20120810140856-xl6sj3xu9t4bee6c
2012-08-10 16:08:56 +02:00
Fabien Pinckaers 01dc1b218b [IMP] help menutips for PoS
bzr revid: fp@tinyerp.com-20120810135548-w2cgv11ynu6l8n5l
2012-08-10 15:55:48 +02:00
Fabien Pinckaers cf57a87d41 [IMP] point of sale backend, useability improvements
bzr revid: fp@tinyerp.com-20120810134517-tenqseu6otf0rdin
2012-08-10 15:45:17 +02:00
Fabien Pinckaers 9dd3e6476f [IMP] PoS backend
bzr revid: fp@tinyerp.com-20120809212311-q2b86eww9ppvdv8s
2012-08-09 23:23:11 +02:00
Antonin Bourguignon ee4fd16e94 [FIX] remove the option from the user_id fields
we want users to be openable !
also improve indentation and remove some useless whitespaces

bzr revid: abo@openerp.com-20120809163529-8adlpszt3n6lhszi
2012-08-09 18:35:29 +02:00
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Mayur Maheshwari (OpenERP) ff612f9d02 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120808094005-o7v0l6u15ide75za
2012-08-08 15:10:05 +05:30
Frédéric van der Essen dc8f543d17 [WIP] point_of_sale: indexeddb : compatible localstorage backend. + anthony's modifications to the views...
bzr revid: fva@openerp.com-20120807161844-hd7ioxipnc6794jf
2012-08-07 18:18:44 +02:00
Thibault Delavallée a814343ab7 [MERGE] Mergede with addons/trunk.
bzr revid: tde@openerp.com-20120806124445-hym9imdiqgeot8fu
2012-08-06 14:44:45 +02:00
Mayur Maheshwari (OpenERP) 7c51b1811d [FIX]all :set a no_open widget in this filed(country_id,state_id,title,context_id,timebox_id,user_id)
bzr revid: mma@tinyerp.com-20120806110307-nj7qipixr14puhub
2012-08-06 16:33:07 +05:30
Fabien Pinckaers ea52cfae17 [IMP] introducing new file type: html
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers b363b1f622 fix
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers 4e69bdd6fc [IMP] improved menu tips - 10 firsts clicks
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Thibault Delavallée 8a408f2ff3 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120803071454-ictuwjq0y3gri4f8
2012-08-03 09:14:54 +02:00
Frédéric van der Essen 7cf6da22cc [MERGE] from trunk
bzr revid: fva@openerp.com-20120802141841-83t16vuslxyj13h8
2012-08-02 16:18:41 +02:00
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
Thibault Delavallée 97d48ebf51 [REF] pos.category: propagated change of category_image.
bzr revid: tde@openerp.com-20120730103451-bce6bqone6e9f690
2012-07-30 12:34:51 +02:00
Frédéric van der Essen b3f6c148c5 [FIX] point_of_sale: the pos session view was broken
bzr revid: fva@openerp.com-20120727153951-pby5mpquxjixcrj8
2012-07-27 17:39:51 +02:00
Frédéric van der Essen 4201c58f36 [IMP] point_of_sale: edit ean wizards for users and products
bzr revid: fva@openerp.com-20120725142608-tsvrxvvxg42sx1yr
2012-07-25 16:26:08 +02:00
Frédéric van der Essen ff4f70f120 [MERGE] from trunk
bzr revid: fva@openerp.com-20120725125407-fp7fasquds5oy0xv
2012-07-25 14:54:07 +02:00
Frédéric van der Essen 26001a9b3c [wip] point_of_sale: ean template last fixes
bzr revid: fva@openerp.com-20120725125115-dnvslwyo6m6q0xw7
2012-07-25 14:51:15 +02:00
Frédéric van der Essen eded464697 [WIP] wip
bzr revid: fva@openerp.com-20120725101043-43oxlvi4ugg038c1
2012-07-25 12:10:43 +02:00
Frédéric van der Essen f1fbf44b5c [WIP] point_of_sale: barcode validation wizard (wip)
bzr revid: fva@openerp.com-20120720170012-eqp81clbpbfsr3hl
2012-07-20 19:00:12 +02:00
Turkesh Patel (Open ERP) 6e178d51ec [IMP] point_of_sale: improved search views.
bzr revid: tpa@tinyerp.com-20120720124629-4eau5t3r09x7b5y2
2012-07-20 18:16:29 +05:30
Antonin Bourguignon 391a35389c [IMP] remove deprecated attributes 'icon', 'web_icon' and 'web_icon_hover' from top menu items
bzr revid: abo@openerp.com-20120718131403-6pzpzhhqbxhtub9b
2012-07-18 15:14:03 +02:00
Antonin Bourguignon 6a2f418bfd [FIX] some wrong ordering sequences in top menus
bzr revid: abo@openerp.com-20120718101112-0i0oc550pd86oepu
2012-07-18 12:11:12 +02:00
Antonin Bourguignon 2b59d63699 [IMP] give higher sequence numbers (with wider gaps) to top menu items
it should now be easier to insert new elements wherever we want in the main menu

bzr revid: abo@openerp.com-20120717162528-0kkk32mjeoyda9c4
2012-07-17 18:25:28 +02:00
Frédéric van der Essen 7d36e8b669 [FIX] point_of_sale: removed useless default category image in view data
bzr revid: fva@openerp.com-20120716140355-yleho36c0mstknvj
2012-07-16 16:03:55 +02:00
Frédéric van der Essen 7fa6ccb47e [FIX] point_of_sale: missing default images
bzr revid: fva@openerp.com-20120713143647-ys3jrymkb58ukygl
2012-07-13 16:36:47 +02:00
Frédéric van der Essen f5e0ad32f2 [MERGE] trunk into point_of_sale, WIP
bzr revid: fva@openerp.com-20120711160325-vmzhxwl74j2u7v8g
2012-07-11 18:03:25 +02:00
Frédéric van der Essen f8d32d3304 [MERGE] point_of_sale
bzr revid: fva@openerp.com-20120710142447-s0z5ca89bofh0n2c
2012-07-10 16:24:47 +02:00
Frédéric van der Essen 0a2c340f92 [IMP] point_of_sale: new weighting workflow
bzr revid: fva@openerp.com-20120709155351-u8cgp4ft14ytwfdw
2012-07-09 17:53:51 +02:00
Quentin (OpenERP) 6fe94bd4bc [MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00