Commit Graph

223 Commits

Author SHA1 Message Date
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
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
Ravish Murari (OpenERP) 7488a675b4 [FIX] removed rest of the base_group_extended group from addons
lp bug: https://launchpad.net/bugs/1027875 fixed

bzr revid: rmu@tinyerp.com-20120723112617-h7um6wkj22martms
2012-07-23 16:56:17 +05:30
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
Raphael Collet 7416e2443f [IMP] small form view improvements
bzr revid: rco@openerp.com-20120629093256-np0ver7xyzam2qzm
2012-06-29 11:32:56 +02:00
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
2012-06-28 12:10:05 +05:30
Jigar Amin - OpenERP 43a50a651b [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041934-v1twcjzbjupl369n
2012-06-25 09:49:34 +05:30
Quentin (OpenERP) 4c104ca727 [IMP] search views: made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622130506-pzz8wqo5p5y902qc
2012-06-22 15:05:06 +02:00
Purnendu Singh (OpenERP) 55633a22a2 [REF] search views: removed filterr_domain if only one element was inside
bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
2012-06-22 16:42:51 +05:30
Purnendu Singh (OpenERP) 1c35eb1049 [MERGE] Mearge with main addons
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
Jigar Amin - OpenERP 501721883d [USB] removed useless class defination
bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
2012-06-21 12:39:59 +05:30
Jigar Amin - OpenERP d145817fb8 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +05:30
Randhir Mayatra (OpenERP) e80980330b [USA] replaced red button class oe_form_button_active_flow to oe_highlight
bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
2012-06-20 15:42:05 +05:30
Purnendu Singh (OpenERP) 395c49d811 [MERGE] point_of_sale: Search view updates
bzr revid: psi@tinyerp.com-20120619090512-f5s3zwv2hbl1exkk
2012-06-19 14:35:12 +05:30
Stephane Wirtel f2fba32b56 [REF] Change the CSS classes
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
Jigar Amin - OpenERP 7fc1b0b25e [MERGE] lp:openpbject-addons
bzr revid: jam@tinyerp.com-20120619061856-eok4a7xmyodeapku
2012-06-19 11:48:56 +05:30
Divyesh Makwana (Open ERP) a1ead34ba5 [IMP] point_of_sale : Improved the Search View.
bzr revid: mdi@tinyerp.com-20120619052937-ndi4f77pxnzpb3zi
2012-06-19 10:59:37 +05:30
Purnendu Singh (OpenERP) 2e3728db21 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
Jalpesh Patel (OpenERP) 9e36bd7a07 [IMP]sale crm and pos improve page sheet
bzr revid: pja@tinyerp.com-20120615053028-9xn6vb2fqcaa9h11
2012-06-15 11:00:28 +05:30
Twinkle (OpenERP) 8af4c098f9 [IMP]POS-Backend:Added active and return class flow
bzr revid: tch@tinyerp.com-20120614062427-2o74wqmwil5vnxm8
2012-06-14 11:54:27 +05:30
Quentin (OpenERP) 204ce4380a [MERGE] merged with the trunk
bzr revid: qdp-launchpad@openerp.com-20120611124211-kf741tkd3gdsp3ep
2012-06-11 14:42:11 +02:00
Fabien Pinckaers 5bf16a3142 imp
bzr revid: fp@tinyerp.com-20120610001252-1axqs109qoutqx5h
2012-06-10 02:12:52 +02:00
Fabien Pinckaers d41b456a14 fix
bzr revid: fp@tinyerp.com-20120609234816-9a3domcakn0vbazv
2012-06-10 01:48:16 +02:00
Fabien Pinckaers e110007132 fix
bzr revid: fp@tinyerp.com-20120609234744-cqrvmqkxfrpei6i1
2012-06-10 01:47:44 +02:00
Fabien Pinckaers 83ad98a1a7 [IMP] better form views, new guidelines
bzr revid: fp@tinyerp.com-20120609151920-4sv7qzomhmfpwsy2
2012-06-09 17:19:20 +02:00
Fabien Pinckaers 7c8e38b179 [IMP] improved form views
bzr revid: fp@tinyerp.com-20120608183518-7sllx2v50vsx3ohm
2012-06-08 20:35:18 +02:00
Stephane Wirtel da5d0d890c [IMP] point_of_sale: Add a photo on the pos category object
bzr revid: stw@openerp.com-20120607131930-tmov89slcyucgi15
2012-06-07 15:19:30 +02:00
Stephane Wirtel bee48de20b [FIX] point_of_sale: Add the 'group_by' field in the view
bzr revid: stw@openerp.com-20120607120121-kh653yprb827izma
2012-06-07 14:01:21 +02:00
Purnendu Singh (OpenERP) cfce82898b [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120605122830-r3o25y55lzo0o73n
bzr revid: psi@tinyerp.com-20120606103845-w2jftpw5jw706pgo
2012-06-06 16:08:45 +05:30
Stephane Wirtel fea9d6eae3 [IMP] point_of_sale: Add a 'self_checkout' flag on the journal
bzr revid: stw@openerp.com-20120604162326-ggwjedp5ht8b5wtf
2012-06-04 18:23:26 +02:00
Stephane Wirtel 58ab8e24b8 [IMP] point_of_sale: Hide a lot of fields
bzr revid: stw@openerp.com-20120604132521-u7jvosz7ff2884rh
2012-06-04 15:25:21 +02:00
Fabien Pinckaers 48f8823bad [IMP] replaced all oe_form_topbar with the new <header> style
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
Fabien Pinckaers 623fd428bd [IMP] xml of topbars, removed oe_right, oe_clear
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Stephane Wirtel fa7d30035c [FIX] point_of_sale: Fix the pos.session's workflow
bzr revid: stw@openerp.com-20120530143543-1dkfudbub83ga71c
2012-05-30 16:35:43 +02:00
Stephane Wirtel cd458e7932 [IMP] point_of_sale: Add a report for the printing of the EAN13
bzr revid: stw@openerp.com-20120529133642-td13jd3sxwi0cbj0
2012-05-29 15:36:42 +02:00
Stephane Wirtel e83f930dcb [IMP] point_of_sale: move the 'to_weight' field from the pos.category to the product object
bzr revid: stw@openerp.com-20120529121556-q91gf18qf5a3uf1q
2012-05-29 14:15:56 +02:00
Divyesh Makwana (Open ERP) aa495b790e [IMP] point_of_sale : Removed all filters related to a date field and added the related date field in the search view.
bzr revid: mdi@tinyerp.com-20120528093341-x7dvpnknwez9w1bs
2012-05-28 15:03:41 +05:30
Stephane Wirtel bd78e2ce68 [IMP] point_of_sale: Call the front-end from the back-end
bzr revid: stw@openerp.com-20120525130759-tmkuks2nw9oy91ot
2012-05-25 15:07:59 +02:00
Stephane Wirtel cf46c8653c [FIX] point_of_sale: Fix some bugs
bzr revid: stw@openerp.com-20120525122415-30r3e2phsfdqgz8l
2012-05-25 14:24:15 +02:00
Fabien Pinckaers 5c791531aa [IMP] improved typos
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
Frédéric van der Essen 785100c74c [MERGE] trunk
bzr revid: fva@openerp.com-20120522093137-eqaen4t49ukcmj6f
2012-05-22 11:31:37 +02:00
Fabien Pinckaers b3fa4ccf5c [IMP] removed icons from topbar
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
Fabien Pinckaers ee566d388c [IMP] merged topbar status widgets
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
Amit Patel (OpenERP) 1aefff9733 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
Frédéric van der Essen f2051414f7 [MERGE] trunk
bzr revid: fva@openerp.com-20120514155031-x7h0f12110g2gqhb
2012-05-14 17:50:31 +02:00
Fabien Pinckaers 56cfae3a8b [IMP] setting closing cash position on all journals which does not requires control
bzr revid: fp@openerp.com-20120513120812-yabr9ngdxh32xk0n
2012-05-13 14:08:12 +02:00
Fabien Pinckaers 94c98bab2a [IMP] Removed bad report
bzr revid: fp@openerp.com-20120513103058-n0lusjarb4vxu7nh
2012-05-13 12:30:58 +02:00
Fabien Pinckaers bdac4ab7ad [FIX] pos backend, small bug
bzr revid: fp@openerp.com-20120513101641-7cpbvos3hcgnx91m
2012-05-13 12:16:41 +02:00
Fabien Pinckaers 341c6b0843 [IMP] PoS Backend
Improved layout of "PoS orders", "PoS Sessions" and "PoS Config" for useability
	Apply new design layouts for web client v7.0
	Rename PoS by Point of Sale everywhere
	Some typos, improved views
	Reviewed menu structure
"Default Point of Sale" field accessible through users preferences
PoS Config:
	Sequence is readonly
	Removed the "Draft" state --> easier, you do not need to active a PoS Config
	Default values on Shop and Journals
PoS Orders:
	Changed shop_id & journal_id on PoS Orders --> from normal fields to related field, depending on the session
Open Session:
	Fixed the wizard
	Several bugfixes and useability improvements
	Accounting Transactions posted at the close (not at the control)
Cash Registers:
	Lots of cleanups and bugfixes
Pos Sessions:
	Fixes and improved layout
	Better computation of all fields
	removed unused object "pos.config.journal"
PoS Orders:
	Default session_id

bzr revid: fp@openerp.com-20120512223743-b1vvbbybo8xq7e54
2012-05-13 00:37:43 +02:00
Stephane Wirtel 589b298125 [IMP] point_of_sale
bzr revid: stw@openerp.com-20120511212912-htftara5senojo1w
2012-05-11 23:29:12 +02:00
Stephane Wirtel 740fb5bf05 [FIX] point_of_sale: Hide or show the details of the balance of the
session

bzr revid: stw@openerp.com-20120510110123-ys5b721s45fzt2ek
2012-05-10 13:01:23 +02:00
Stephane Wirtel 2d0a262d4d [IMP] point_of_sale: Add a wizard for the Session Opening
bzr revid: stw@openerp.com-20120510103543-ytwq5brqypnibml5
2012-05-10 12:35:43 +02:00
Stephane Wirtel 471bb6a67e [IMP] point_of_sale: show the opening and closing details
[FIX] point_of_sale: Use tools.translate library

bzr revid: stw@openerp.com-20120510074804-8jf12enzw3jghrrf
2012-05-10 09:48:04 +02:00
Stephane Wirtel 23ca8aaa38 [IMP] point_of_sale: Add the statement line with the right statement"
[IMP] point_of_sale: Add a new iface boolean for the printing

bzr revid: stw@openerp.com-20120509151221-hbkcpxp5vwck7x50
2012-05-09 17:12:21 +02:00
Stephane Wirtel 2ce2c446c8 [FIX] point_of_sale: remove the related actions
bzr revid: stw@openerp.com-20120509144201-831n0f5nihbkqgyu
2012-05-09 16:42:01 +02:00