Commit Graph

69 Commits

Author SHA1 Message Date
Denis Ledoux 87dd06c941 [MERGE] forward port of branch saas-3 up to 8c150c6 2015-01-15 14:43:32 +01:00
Denis Ledoux a692c6e934 [MERGE] forward port of branch 7.0 up to f406847 2015-01-15 11:49:28 +01:00
Denis Ledoux e261c44a10 [FIX] point_of_sale: ACLs for pos users
POS users should not be able to create nor modify payment methods (account.journal)
POS users should not be able to create nor modify point of sales (pos.config)

At first opened session, if no payment methods was set, this is possible that the pos user should temporary have accesses granted to mark a payment method as pos payment method. This is done by the openerp.SUPERUSER_ID added by this rev.

opw-625489
2015-01-13 18:15:30 +01:00
Denis Ledoux d9e48bae42 [MERGE] forward port of branch saas-3 up to 7ab4137 2014-11-14 16:58:24 +01:00
Denis Ledoux 7ab413724a [MERGE] forward port of branch 7.0 up to da15c9d 2014-11-14 15:59:33 +01:00
Denis Ledoux 3613b74df3 [FIX] point_of_sale: missing multi-company rule 2014-11-14 14:15:21 +01: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
Quentin (OpenERP) 7a3da62754 [FIX] point_of_sale: removed old reference to warehouse_id in rml file + removed unused pos_return wizard
bzr revid: qdp-launchpad@openerp.com-20140401124712-uz97vqfuyi8kn1un
2014-04-01 14:47:12 +02:00
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01: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
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
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
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Christophe Matthieu 2fab26a2d2 [IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
Quentin (OpenERP) dee5ace29b [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20130624095319-sqkrnk4r1mst8nvk
2013-06-24 11:53:19 +02:00
Quentin (OpenERP) 9c8d2f1ea9 [REM] point_of_sale: removed by margin analysis that doesn't sound interestigng at all for a point of sale and that is not compliant with the new type of standard price (fields.property)
bzr revid: qdp-launchpad@openerp.com-20130528095822-xxnubsv1mkgg78vu
2013-05-28 11:58:22 +02:00
sgo@tinyerp.com e4250d1558 [IMP]remove sale.shop from pos and improve code
bzr revid: sgo@tinyerp.com-20130123113306-n7enol5as84sv0g2
2013-01-23 17:03:06 +05:30
Olivier Dony 3fe6987ce7 [MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)
ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary

bzr revid: odo@openerp.com-20121218232001-t425t4hi7qbmsip2
2012-12-19 00:20:01 +01:00
Denis Ledoux dle@openerp.com 7e1ffaf613 [REM]Remove all account.journal.view and account.journal.column references
bzr revid: dle@openerp.com-20121122104504-ezgj2666zkhgybpj
2012-11-22 11:45:04 +01: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 9df99e1ca5 [IMP] point_of_sale: Add a new rule for the pos.order object
bzr revid: stw@openerp.com-20120801125234-x85l39sx5ibdmuba
2012-08-01 14:52:34 +02:00
Alexis de Lattre 5101771cd9 Harmonize the noupdate flag on security XML files :
- ir.rule objects are noupdate="1"
- all other objects are noupdate="0"

bzr revid: alexis@via.ecp.fr-20120713170838-pjsysliyt6twazrc
2012-07-13 19:08:38 +02:00
Frédéric van der Essen 313496382a [FIX] Forgot to add pos_basewidget.js
bzr revid: fva@openerp.com-20120516130142-5u23uerr5s8y7ydq
2012-05-16 15:01:42 +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 72c89a2028 [FIX] point_of_sale: Begin the connection between the frontend and the backend
bzr revid: stw@openerp.com-20120508152805-874rbq1jv8mpvwo6
2012-05-08 17:28:05 +02:00
Raphael Collet ba1454149c [IMP] groups: remove auto-inclusion of admin in groups, and make the inclusion explicit in groups
bzr revid: rco@openerp.com-20120404090830-nteimn2kvz8nkk7h
2012-04-04 11:08:30 +02:00
Raphael Collet 0c1021806d [MERGE] trunk-user-groups-rco: add category_id to groups
bzr revid: rco@openerp.com-20111213141949-ohvn0c9iq6tcl7jj
2011-12-13 15:19:49 +01:00
Fabien Pinckaers f27318c8af [IMP] Security Rule: removed duplicates due to inheritancies of groups
bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
2011-12-12 19:11:13 +01:00
Raphael Collet 85b3757a60 [IMP] marketing, mrp, point_of_sale, portal: add group categories
bzr revid: rco@openerp.com-20111212135731-gdccm6nwt7ic00t4
2011-12-12 14:57:31 +01:00
Fabien Pinckaers ca16eaf1b1 [FIX] PoS misc access rights
bzr revid: fp@tinyerp.com-20111211091442-c61pssjexf0jog5c
2011-12-11 10:14:42 +01:00
Fabien Pinckaers 75fb009dae [IMP] fix on PoS module
bzr revid: fp@tinyerp.com-20111208120111-skr3af91uiqot1ie
2011-12-08 13:01:11 +01:00
Vo Minh Thu a07264a62d [FIX] point_of_sale: typo.
bzr revid: vmt@openerp.com-20111202162739-9nd3h9h83s633lyj
2011-12-02 17:27:39 +01:00
Naresh (OpenERP) 6a29d79e9e [FIX]:WARNING:Model pos.category (Product Category) has no access rules
bzr revid: nch@tinyerp.com-20111124112800-9acn6j610yi1fspz
2011-11-24 16:58:00 +05:30
Raphael Collet ba6342174e add group implications
bzr revid: rco@openerp.com-20110802130811-pkdmw43ufifz0tpj
2011-08-02 15:08:11 +02:00
Harry (OpenERP) 764b9f251e [FIX] correct regression on intalling module without demo data
bzr revid: hmo@tinyerp.com-20101114134821-7djwpr6nmmxu584q
2010-11-14 19:18:21 +05:30
vth 448fc93683 [IMP] account,hr,sale,point_of_sale,event: give user role to the demo user
bzr revid: vth@tinyerp.com-20101101124606-ia3nqngu19u8b7oa
2010-11-01 18:16:06 +05:30
Fabien Pinckaers 37680303df [IMP] ir.rule reviewed
bzr revid: fp@tinyerp.com-20101018092840-7a6wv2vw2s6a1a2s
2010-10-18 11:28:40 +02:00
Fabien Pinckaers fe9500c14e [IMP] access rights cleaning
bzr revid: fp@tinyerp.com-20101016164709-8w551aaosqx0dufu
2010-10-16 18:47:09 +02:00
uco (Open ERP) bd32a92f91 [REF] point_of_sale: Record rule corrected for Registers.
bzr revid: uco@tinyerp.com-20101006053208-eacftxqj3wud2ffm
2010-10-06 11:02:08 +05:30
uco (Open ERP) ead307653d [IMP, ADD] point_of_sale: Added access rules needed to complete pos order. Improved some rights for Close registers.
bzr revid: uco@tinyerp.com-20101005134228-1vdavxepj9oq8veq
2010-10-05 19:12:28 +05:30
uco (Open ERP) e6a7836977 [IMP] point_of_sale: Improvements in access rules.
bzr revid: uco@tinyerp.com-20101005102305-d59h5o83g5btb034
2010-10-05 15:53:05 +05:30
uco (Open ERP) 01bda9b4b4 [REM] point_of_sale: Removed unused object 'pos.payment' as Payment is now done with 'account.bank.statement' object from account.
bzr revid: uco@tinyerp.com-20101005063026-eew1c2snhawv1not
2010-10-05 12:00:26 +05:30
uco (Open ERP) 34936a00cb [IMP] point_of_sale: Point of Sale Manager could have an access to Journal to configure register.
bzr revid: uco@tinyerp.com-20100929070304-un0xeh9qbi6glds9
2010-09-29 12:33:04 +05:30
VIR(OpenERP) 5fc9262ee5 [IMP] point_of_sale: Improved access rights.
bzr revid: uco@tinyerp.com-20100917060831-2czv77y6r6rer033
2010-09-17 11:38:31 +05:30
DBR (OpenERP) 87da764cd1 [MOD]Accessright changes in marketing_*
bzr revid: dbr@tinyerp.com-20100809104933-gca2o504ewa0vy72
2010-08-09 16:19:33 +05:30
Vir (Open ERP) 28eb625cb7 [REMOVE] point_of_sale : removed not required access rights, cleaned csv file
bzr revid: vir@tinyerp.com-20100809092756-59wqtxz7mjdod74w
2010-08-09 14:57:56 +05:30
AMP (OpenERP) 156b0369b1 [MOD] point_of_sale: usability improvement in access rights
bzr revid: amp@tinyerp.com-20100809055206-6lu790jhr5ub7f86
2010-08-09 11:22:06 +05:30
Vir (Open ERP) 2e2183e9f0 [MOD] point_of_sale : Modification in access rights
bzr revid: vir@tinyerp.com-20100807081859-tk0hqywl4me7gwtf
2010-08-07 13:48:59 +05:30
AMP (OpenERP) 086f180c80 [MOD] usability improvement in access rights
bzr revid: amp@tinyerp.com-20100726051551-i1udiuboxtn4vfve
2010-07-26 10:45:51 +05:30
AMP (OpenERP) 6eb86abda3 [MOD] usability improvement in access rights
bzr revid: amp@tinyerp.com-20100723072243-kpex4cdgckhga46d
2010-07-23 12:52:43 +05:30