Denis Ledoux
65257c48b5
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9835 revid:launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
...
bzr revid: dle@openerp.com-20140210160759-oybxhdwgv2q4ma5a
bzr revid: odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: dle@openerp.com-20140212143044-0c94q4evxl4ltwr0
bzr revid: dle@openerp.com-20140213115951-h7c2o65lgg26aosv
2014-02-13 12:59:51 +01:00
Denis Ledoux
8092693eec
[FIX] point_of_sale: distraction error from revision 9814 revid:dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp, missing .id in order to compare company for taxes
...
bzr revid: dle@openerp.com-20140210160645-ww7af7sbkpjf6oss
2014-02-10 17:06:45 +01:00
Denis Ledoux
041f1db4a6
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9814 revid:dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp
...
bzr revid: dle@openerp.com-20140206164522-fi05cb4mpg22rkv2
2014-02-06 17:45:22 +01:00
Denis Ledoux
4818a83f26
[FIX] point_of_sale: validate and closing pos sessoin handle multi company
...
When the user who validated and closed the pos session was not the same user who created the session, and if this user was not in the same company, it wasnt possible to validate and close the pos session.
This explanation if also valid if the user who created the pos session changed of company in his preferences between the creation and the validation.
bzr revid: dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp
2014-02-06 17:34:44 +01:00
Denis Ledoux
7f00274384
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
...
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
Denis Ledoux
34c6eb963a
[FIX] point_of_sale: fix default destination(or source, for returns) location for pos order moves
...
For instance, the source location of moves of returned products was output instead of partners locations / customers
bzr revid: dle@openerp.com-20131210181733-2rjw6cas8bjypp2p
2013-12-10 19:17:33 +01:00
Christophe Simonis
6f67143908
[FIX] *: do not call deprecated method LocalService()
...
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
2013-11-21 13:06:11 +01:00
Olivier Dony
44664076da
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
...
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Olivier Dony
f378aaa0a7
[FIX] point_of_sale: POS delivery orders were incorrectly using the internal picking sequence
...
bzr revid: odo@openerp.com-20131107105121-qg06v8dcvlouebon
2013-11-07 11:51:21 +01:00
Denis Ledoux
a7e05f1af4
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8793 rev-id: dle@openerp.com-20131018124037-v3501acvv4fh1077
...
bzr revid: dle@openerp.com-20131018125818-1k168nlo2ferj25w
2013-10-18 14:58:18 +02:00
Denis Ledoux
1a555475cc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp.com-20131018120428-2vdmdm2th8rz57zr
...
bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp
2013-10-18 14:12:36 +02:00
Martin Trigaux
bb47a9b3bc
[FIX] pos: check constraint on session instead of uid (eg: runbot import demo data with uid=1 but other user_id
...
bzr revid: mat@openerp.com-20131014121959-fp4gs26xh8cdte1w
2013-10-14 14:19:59 +02:00
Denis Ledoux
546a191f0a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
...
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Christophe Simonis
3fa90321e1
[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
...
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Thibault Delavallée
a8201c6891
[MERGE] [IMP] point_of_sale
...
Removed default POS category
Removed 'other' category from data
Fixed pos payment methods not all listed when creating a pos
bzr revid: tde@openerp.com-20130905103952-kbew55mqxltjdoey
2013-09-05 12:39:52 +02:00
Martin Trigaux
d60c0be37c
[FIX] point_of_sale: pass reference of customer from pos to order
...
bzr revid: mat@openerp.com-20130904140628-4p9xnedoh3p2xgcw
2013-09-04 16:06:28 +02:00
Martin Trigaux
3b549486e9
[FIX] pos: correctly link refund order to a current session and set to today's date (opw 589810)
...
lp bug: https://launchpad.net/bugs/1123575 fixed
bzr revid: mat@openerp.com-20130828123940-ik9gvx7flywia0oe
2013-08-28 14:39:40 +02:00
Martin Trigaux
3b88ba87c1
[FIX] pos: avoid a user to use another user's session (opw 595033)
...
bzr revid: mat@openerp.com-20130828073030-mmgcd0atfm7qjq1b
2013-08-28 09:30:30 +02:00
Christophe Simonis
5343c48c5f
[MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
...
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
Christophe Simonis
58868227f9
[MERGE] forward port of branch 7.0 up to revid 9382 chs@openerp.com-20130823131214-ipouwtnz8r16mlvv
...
bzr revid: chs@openerp.com-20130823143114-83tdjhbsdes0kydr
2013-08-23 16:31:14 +02:00
Amit Vora (OpenERP Trainee)
32143e8935
[MERGE] merge with addons
...
bzr revid: voraamitr@gmail.com-20130822124057-rv6oqd0n22mf53c8
2013-08-22 18:10:57 +05:30
Amit Vora (OpenERP Trainee)
68711bb1c5
[IMP] remove unused space
...
bzr revid: voraamitr@gmail.com-20130822123156-dv80muri4r9ivx5a
2013-08-22 18:01:56 +05:30
Amit Vora (OpenERP Trainee)
4d0ad501b7
[IMP] remove _default_payment_methods from point_of_sale.py file
...
bzr revid: voraamitr@gmail.com-20130822121849-hns960rom7p22920
2013-08-22 17:48:49 +05:30
Martin Trigaux
50975a1159
[FIX] point_of_sale: avoid traceback if deleted property
...
bzr revid: mat@openerp.com-20130821125429-uzaqw4yx2ve63wja
2013-08-21 14:54:29 +02:00
Thibault Delavallée
5f5610b7d1
[MERGE] [IMP] crm_phonecall, membership, point_of_sale, purchase, purchase_requisitions: minor usability improvements: improved some help tooltips
...
bzr revid: tde@openerp.com-20130821122501-7hemnjrbm1oob7v3
2013-08-21 14:25:01 +02:00
Atul Patel (OpenERP)
0671ecff9f
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130821051503-hmhnoeelta1jc15p
2013-08-21 10:45:03 +05:30
Olivier Dony
c02afb45fa
[MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
...
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
Olivier Dony
788eb29237
[MERGE] Forward-port of 7.0 bugfixes up to rev.9369 rev-id: launchpad_translations_on_behalf_of_openerp-20130820051502-deoiql3lru7goosd
...
bzr revid: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
2013-08-20 17:26:07 +02:00
Atul Patel (OpenERP)
d2834c42c3
[IMP]: IMprove typo
...
bzr revid: atp@tinyerp.com-20130813135816-05uz8ys2932a63at
2013-08-13 19:28:16 +05:30
Atul Patel (OpenERP)
2e20b9a45a
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130813135410-7w9yfc6zl3hxcnwd
2013-08-13 19:24:10 +05:30
Martin Trigaux
41ca4aa350
[FIX] point_of_sale: ok this one should be good
...
bzr revid: mat@openerp.com-20130814140240-f0qqsks6tcc423s8
2013-08-14 16:02:40 +02:00
Martin Trigaux
9f5c0f54ec
[FIX] point_of_sale: oups, needs an id
...
bzr revid: mat@openerp.com-20130814135346-6zpzl6tc0efowquj
2013-08-14 15:53:46 +02:00
Martin Trigaux
38f2806579
[FIX] point_of_sale: better default sale journal for new pos.config, use company of current user
...
done to fix test in 01_order_to_payment.yml when creating pos.order
default config can have journal of different company, will get exception if done with a journal of main company
bzr revid: mat@openerp.com-20130814134511-c0f3z27f9p2gflt6
2013-08-14 15:45:11 +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
Thibault Delavallée
034a5d5dcf
[FIX] point_of_sale: LocalService -> signal_ validation
...
bzr revid: tde@openerp.com-20130711125155-hmf0u0p0o45iac66
2013-07-11 14:51:55 +02:00
Thibault Delavallée
d6c74a369c
[MERGE] Forward-ported lp:~openerp-dev/openobject-addons/7.0-pos-improvements-fva (using -r 8946..8955).
...
This branch holds several improvements for the point of sale. However it cannot
be merged into 7.0 because a new column is added. As this branch has proven to
be correct, it is forward-ported into trunk.
bzr revid: tde@openerp.com-20130711084547-wl5q22g8z1aha126
2013-07-11 10:45:47 +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
Bharat R. Devnani (OpenERP)
e92a18ee0b
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20130701085739-94uxqowz623wudp4
2013-07-01 14:27:39 +05:30
Atul Patel (OpenERP)
4b98b1c689
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130620054125-ai4ozl8pd1hv84sr
2013-06-20 11:11:25 +05:30
Martin Trigaux
4910b5e654
[FIX] point_of_sale: don't group move lines if debit and credit
...
lp bug: https://launchpad.net/bugs/1127114 fixed
bzr revid: mat@openerp.com-20130626093412-or5k3eznjsxbvgu3
2013-06-26 11:34:12 +02:00
Thibault Delavallée
bc58a5a224
[CLEAN] Misc cleaning before merging.
...
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +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
Chandni Machchhar (OpenERP Trainee)
b83f1fbf83
[MERGE]: Merge with addons
...
bzr revid: chandni.machchhar3@gmail.com-20130612110354-h8nxz02l0yeqkqx9
2013-06-12 16:33:54 +05:30
Darshan Kalola (OpenERP Trainee)
ae1354509c
[MERGE] merged with main addons
...
bzr revid: darshankalola@gmail.com-20130607131308-9ovklg1q347w8f2o
2013-06-07 18:43:08 +05:30
Darshan Kalola (OpenERP Trainee)
00029958b3
[IMP] improve Help
...
bzr revid: darshankalola@gmail.com-20130607130240-e5indzh1nzfmy4wk
2013-06-07 18:32:40 +05:30
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
Darshan Kalola (OpenERP Trainee)
8f07cb2046
[IMP] Improved Help
...
bzr revid: darshankalola@gmail.com-20130605070425-ykw13dlv28aq4akh
2013-06-05 12:34:25 +05:30
ggh-openerp
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
ggh-openerp
7841bac687
[IMP] Improved typo in Warning
...
bzr revid: ggh@tinyerp.com-20130429053851-ipatcoxtjwrwfijk
2013-04-29 11:08:51 +05:30