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

394 Commits

Author SHA1 Message Date
Christophe Simonis c339fcc603 [MERGE] forward port of branch 7.0 up to d5c7234 2015-01-22 18:42:26 +01:00
Denis Ledoux d5c7234474 [FIX] point_of_sale: share is not a dependence of point_of_sale 
This reverts commit d970cc40f8.

point_of_sale does not depends on share. This domain can therefore not be applied.
It works for new databases as the module share is auto installed.
But as soon as the module share is uninstalled, this domain will lead to a crash
There is no way to "solve" this issue, other than by a view customization
if the issue is critical for the customer.

I did not pay enough attention when I reviewed the PR.
 2015-01-22 15:32:29 +01:00
Denis Ledoux c5775e56d3 [MERGE] forward port of branch 7.0 up to 25f5329 2015-01-22 14:43:06 +01:00
Goffin Simon d970cc40f8 [FIX] point_of_sale: exclude share users from sale details wizard 
opw-621749
 2015-01-21 15:39:31 +01:00
Christophe Simonis 4601d85944 [MERGE] forward port of branch 7.0 up to 6fdb783 2014-06-10 11:49:14 +02:00
Martin Trigaux 25292ef0a5 [FIX] point_of_sale: correct call to default value 
The default value should be called with a lambda otherwise the payment_date is set to the date the server was started (opw 606715)
 2014-06-04 15:19:57 +02: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
Frédéric van der Essen 173ffb995f [WIP] point_of_sale: making the standalone pos launchable from the pos backend 
bzr revid: fva@openerp.com-20131207170014-9pctopzgx5ahtb21
 2013-12-07 18:00:14 +01:00
Frédéric van der Essen 6700ef32bd [IMP] point_of_sale: rename Start Selling to Resume Session when appropriate 
bzr revid: fva@openerp.com-20130919135413-6hwj3b7vxstf8wq1
 2013-09-19 15:54:13 +02:00
Martin Trigaux d2d72d8416 [MERGE] forward port of saas-1 up to revision 8749 (mat@openerp.com-20130702135856-kmg7d8anw17nkbd8) 
bzr revid: mat@openerp.com-20130702144646-y1wqs5mz4rzoh50g
 2013-07-02 16:46:46 +02:00
Christophe Simonis bf29a2ebc7 [MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc 
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
 2013-07-18 13:59:28 +02:00
Martin Trigaux 10f170d975 [MERGE] [FIX] pos: prevent two users opening the same session 
lp bug: https://launchpad.net/bugs/1098226 fixed

bzr revid: mat@openerp.com-20130620154608-7u8pci09muxedvje
 2013-06-20 17:46:08 +02:00
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4 
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
 2013-06-13 20:15:03 +02:00
Christophe Matthieu 9d9e3d2ef8 [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos) 
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
 2013-06-07 13:38:29 +02:00
sgo@tinyerp.com 2bda4f7b3c [MERGE]sync with trunk 
bzr revid: sgo@tinyerp.com-20130607113500-jzhet9cr98c0ss4s
 2013-06-07 17:05:00 +05:30
sgo@tinyerp.com 45d760773e [MERGE]sync with trunk 
bzr revid: sgo@tinyerp.com-20130603131453-t3m0b9emuyp2tmsx
 2013-06-03 18:44:53 +05:30
Amit Bhavsar (Open ERP) 24848a8dcc [MERGE] merge with latest trunk 
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
 2013-05-28 14:49:41 +05:30
Thibault Delavallée 0d01d958fa [MERGE] [FORWARD] Forward port of saas-1 branch until revision 8711 (that includes forward-port of 7.0 until 9143) 
Revision ID: tde@openerp.com-20130521152657-v48pj2m0692rw9b5

bzr revid: tde@openerp.com-20130522102605-bbc5vrfhfro4ab90
 2013-05-22 12:26:05 +02:00
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143. 
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
 2013-05-21 14:23:59 +02:00
Martin Trigaux c8c298c83c [IMP] clean permissions and shebang in files 
bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea
 2013-05-14 12:31:13 +02:00
ggh-openerp 3b73e2b2a4 [IMP]Removed space before Exclamation marks [!] 
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
 2013-04-29 12:45:57 +05:30
Turkesh Patel (Open ERP) 9ea1b238bf [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20130417062640-0b8at1f087grtiu3
 2013-04-17 11:56:40 +05:30
sgo@tinyerp.com d1e17fbde0 [MERGE]sync with trunk 
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
 2013-04-17 11:44:34 +05:30
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations. 
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
 2013-04-15 12:23:49 +02:00
Raphael Collet 96ad608854 [IMP] general: use registry[X] instead registry.get(X) when X is dynamic 
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
 2013-03-29 15:37:20 +01:00
Turkesh Patel (Open ERP) 34a4255885 [FIX] fix some usability issues 
bzr revid: tpa@tinyerp.com-20130326085212-05wtuqzf8g8t98p2
 2013-03-26 14:22:12 +05:30
Thibault Delavallée 40a5dda617 [MERGE] Forward port of addons until 8903 
bzr revid: tde@openerp.com-20130321093716-3nt7h2xunl8lusqh
 2013-03-21 10:37:16 +01:00
sgo@tinyerp.com a21b4b9b56 [MERGE]sync with trunk 
bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
 2013-03-11 10:26:38 +05:30
Chris Biersbach 68fbf7cf44 [FIX] PoS: Fixes a small, context=None related bug in the pos box wizard 
bzr revid: cbi@openerp.com-20130305131455-5jsn089777xy5dnx
 2013-03-05 14:14:55 +01:00
Ajay Chauhan (OpenERP) 85f6cb8239 [IMP] POS: made some changes in code 
bzr revid: cha@tinyerp.com-20130204064142-xivaomscssibwsb8
 2013-02-04 12:11:42 +05:30
Ajay Chauhan (OpenERP) 3589c008ad [IMP] POS: use the new signal_xxx methods instead of trg_validate. 
bzr revid: cha@tinyerp.com-20130201062421-luknla6wp3yqxhqm
 2013-02-01 11:54:21 +05:30
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
Bhumi Thakkar (Open ERP) 8d47d83bbf [FIX] config_id problem with pos session.--fixes:lp1098226 
bzr revid: bth@tinyerp.com-20130117115814-kf2365ydkq5fwu5i
 2013-01-17 17:28:14 +05:30
Olivier Dony 2eb26fb107 [MERGE] account: cleanup refund creation + ease inheritance, courtesy of Benoit Guillot, Akretion 
bzr revid: odo@openerp.com-20121218174225-vheaos3zxh2q578l
 2012-12-18 18:42:25 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace. 
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
 2012-12-06 15:56:32 +01:00
Fabien Pinckaers eef0d61bb9 [MERGE] fix partial payment wizard 
bzr revid: fp@tinyerp.com-20121113073428-aa2g1vnensxfcgn4
 2012-11-13 08:34:28 +01:00
Fabien Pinckaers ce874db95a [FIX] POS 
bzr revid: fp@openerp.com-20121103152504-f3o6ce0e833hdibj
 2012-11-03 16:25:04 +01:00
Vijaykumar Baladaniya ae95cab533 [FIX] point_of_sale: Add a context on launch_payment() method. 
bzr revid: vba@tinyerp.com-20121023052715-78d4sykmrrpzult0
 2012-10-23 10:57:15 +05:30
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status 
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
 2012-10-12 17:12: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
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
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
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
Benoit Guillot 4b614305d4 [IMP] add context on the call of the method refund 
bzr revid: benoit.guillot@akretion.com.br-20120829084032-9ow83wx3kcmrvep7
 2012-08-29 10:40:32 +02:00
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 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
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
Vo Minh Thu 9822629548 [MERGE] merged trunk. 
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
 2012-08-13 18:06:57 +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