3631cc0df6
[IMP] Give pos config picking type and stock location instead of warehouse
...
bzr revid: jco@openerp.com-20140321160634-zo9pke8pyy1b8byc
2014-03-21 17:06:34 +01:00
cac0c9600a
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
...
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
99a3c45976
[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
...
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
112fe22347
[FIX] point_of_sale: prevent duplicated order posting
...
bzr revid: dle@openerp.com-20140317164131-eewyqmzz5niebz2a
2014-03-17 17:41:31 +01:00
d504764eff
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
...
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
e36b32a661
[MERGE] merged with main trunk (revision 9186)
...
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
4b72678bc7
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
...
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
cde82643d0
[MERGE] point of sale fixes
...
bzr revid: chs@openerp.com-20140224172113-gj1t8hi7a8hr60gq
2014-02-24 18:21:13 +01:00
8d5398d661
[FIX] point_of_sale: if an order fails to mark as PAID, leave it at NEW so that the pos client can process new orders. The error has to be manually corrected by the user before session closing
...
bzr revid: fva@openerp.com-20140224150830-5uddv7i1djff2aip
2014-02-24 16:08:30 +01:00
ef6cdbf0f2
[MERGE] [IMP] point of sale: usability: label typos + help in menus
...
bzr revid: tde@openerp.com-20140218083412-k1jajrze3nc51xyh
2014-02-18 09:34:12 +01:00
e7f238615c
[IMP] fetch only relevant fields when checking for dupes
...
bzr revid: ddm@openerp.com-20140213163849-8v485vq5v4xmeocg
2014-02-13 17:38:49 +01:00
44ca72e32b
merge saas3
...
bzr revid: ddm@openerp.com-20140213152921-mas1gd10zy9s0nxy
2014-02-13 16:29:21 +01:00
8bbb206504
[IMP] save new orders only
...
bzr revid: ddm@openerp.com-20140213152449-tarl15agw9r3teqg
2014-02-13 16:24:49 +01:00
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
bbd813e76e
[MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
...
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
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
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
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
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
5585a38ecc
[MERGE] from trunk, need point_of_sale updates
...
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
b0abc338d2
[IMP] point_of_sale: better feedback on network and proxy connectivity + removed pos settings for obsolete features + improved proxy settings
...
bzr revid: fva@openerp.com-20140117175830-himux7xmaopw9yia
2014-01-17 18:58:30 +01:00
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
a97a587fad
[IMP] point_of_sale: posbox automatic discovery
...
bzr revid: fva@openerp.com-20140110171746-286285ds696d5kby
2014-01-10 18:17:46 +01:00
7ab7cf2149
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140109101313-cle2m2axh6vjj8yy
2014-01-09 11:13:13 +01:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
0fd4888e84
[hw_scanner] implementation of the server side component of the barcode scanner proxy
...
bzr revid: fva@openerp.com-20140102141519-jaqi8mcqff282c6n
2014-01-02 15:15:19 +01:00
737be08fbf
[MERGE] account: cash register view improvements
...
- now looking like cash control methods from the point of sale module.
point of sale: improved some tooltips + cash control form view improvements
bzr revid: tde@openerp.com-20140102113009-lb1vv2w3g4dz2oqw
2014-01-02 12:30:09 +01:00
f5718efa6e
[MERGE] merged with trunk
...
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
2013-12-30 11:28:02 +01:00
7980ac78ae
[IMP] Improved code as per the suggestions on the Merge proposal.
...
bzr revid: psa@tinyerp.com-20131230072452-zew8ys6lqomzxcsm
2013-12-30 12:54:52 +05:30
0bcd78116f
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131227153517-j278y3hrjj2nzw79
2013-12-27 16:35:17 +01:00
e95ea35caa
[IMP] hw_escpos: company logo on receipt and multi-lingual receipt support
...
bzr revid: fva@openerp.com-20131224151112-3svn5wm1wyf71wim
2013-12-24 16:11:12 +01:00
eea3942247
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131219104529-pm5covlh6uvo992d
2013-12-19 11:45:29 +01:00
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
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
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
3805e87c73
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131206145635-kjsm7hi2psblxb3t
2013-12-06 15:56:35 +01:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
2a2ef2fe4b
[FIX] point_of_sale: wrong object name fixed
...
bzr revid: qdp-launchpad@openerp.com-20131202093800-b4rdelveh3rildog
2013-12-02 10:38:00 +01:00
df2d5e148e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
28c074dcb2
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131126142328-26gdibac45v17djm
2013-11-26 15:23:28 +01:00
6f67143908
[FIX] *: do not call deprecated method LocalService()
...
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
2013-11-21 13:06:11 +01:00
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
55864d01e1
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20131111124249-18c9hwxcw4c8276o
2013-11-11 18:12:49 +05:30
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
7f0e721cc1
[IMP] point_of_sale: more css adaptations for iPad / android + a few bug correction along the way
...
bzr revid: fva@openerp.com-20131106161723-vus7amgc6cfw3bzr
2013-11-06 17:17:23 +01:00
5bb4fa2b43
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
2a982d199e
[MERGE] merged with trunk
...
bzr revid: qdp-launchpad@openerp.com-20131028093247-8eegjl3zle5aoqae
2013-10-28 10:32:47 +01:00
7f8f78cc4f
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131021055621-l0dw112tf8535j7q
2013-10-21 11:26:21 +05:30
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
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
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
65966940c8
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
607de396ba
[MERGE] Sync with trunk, until revision 8927
...
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
f03ef79b6b
[IMP] Pos Orders should be set as done
...
bzr revid: jco@openerp.com-20130927161059-fxmqat0099nsp7q3
2013-09-27 18:10:59 +02:00
62be9e42a1
[IMP] Use separate picking type for PoS
...
bzr revid: jco@openerp.com-20130927132211-q0nfbe1xuzdjubsi
2013-09-27 15:22:11 +02:00
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
e00111a061
[IMP] Improved code.
...
bzr revid: psa@tinyerp.com-20130918111959-1dzkuxv4acjys8kl
2013-09-18 16:49:59 +05:30
bf7a359abe
[FIX] Default picking type method of PoS should return id
...
bzr revid: jco@openerp.com-20130916082116-tqe24ota8fzb7uh8
2013-09-16 10:21:16 +02:00
daa7594cbb
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130913112155-jll3rlzcgsjrtzv4
2013-09-13 16:51:55 +05:30
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
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
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
8a23802e9e
[IMP] stock: removed location input and location output on warehouse
...
bzr revid: qdp-launchpad@openerp.com-20130903090334-iqtk4a762volg5s2
2013-09-03 11:03:34 +02:00
606431f0ee
[MERGE]merge with parent
...
bzr revid: rma@tinyerp.com-20130830053621-briu78l6scvuleu4
2013-08-30 11:06:21 +05:30
9d7a35accc
[IMP] change the label name of 'to_weight' field
...
bzr revid: rma@tinyerp.com-20130829131148-oak9gqmkm2jqqvdq
2013-08-29 18:41:48 +05:30
ad7732a4c2
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20130829051125-jmxg4bi8ban5buij
2013-08-29 10:41:25 +05:30
ed35895126
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130828163937-japdo58t20hhqfoz
2013-08-28 18:39:37 +02:00
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
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
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
efc01a8a84
[IMP]Replaced type with picking_type_id
...
bzr revid: pooja.zakhariya@gmail.com-20130827111939-t7memjjkn08yhbum
2013-08-27 16:49:39 +05:30
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
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
32143e8935
[MERGE] merge with addons
...
bzr revid: voraamitr@gmail.com-20130822124057-rv6oqd0n22mf53c8
2013-08-22 18:10:57 +05:30
68711bb1c5
[IMP] remove unused space
...
bzr revid: voraamitr@gmail.com-20130822123156-dv80muri4r9ivx5a
2013-08-22 18:01:56 +05:30
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
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
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
0671ecff9f
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130821051503-hmhnoeelta1jc15p
2013-08-21 10:45:03 +05:30
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
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
d2834c42c3
[IMP]: IMprove typo
...
bzr revid: atp@tinyerp.com-20130813135816-05uz8ys2932a63at
2013-08-13 19:28:16 +05:30
2e20b9a45a
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130813135410-7w9yfc6zl3hxcnwd
2013-08-13 19:24:10 +05:30
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
9f5c0f54ec
[FIX] point_of_sale: oups, needs an id
...
bzr revid: mat@openerp.com-20130814135346-6zpzl6tc0efowquj
2013-08-14 15:53:46 +02:00
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
05e01eafe6
[FIX]scrap
...
bzr revid: csn@openerp.com-20130807110219-82bky3atj4jefox8
2013-08-07 13:02:19 +02:00
2788ae87e3
[REF] no need to pass product_qty as it's a computed field
...
bzr revid: qdp-launchpad@openerp.com-20130806154856-msym9zsqufyx6nlx
2013-08-06 17:48:56 +02:00
a513fcceee
[ADD] added value for the field product_uom_qty
...
bzr revid: bde@tinyerp.com-20130806130939-44o690pv6c31d9dj
2013-08-06 18:39:39 +05:30
54631bda2a
[MERGE] trunk
...
bzr revid: fp@openerp.com-20130803175004-ivqkxtsd7vh4npwe
2013-08-03 19:50:04 +02:00
e3096577b2
[REM] removed auto_picking field + removed picking workflow
...
bzr revid: qdp-launchpad@openerp.com-20130724102017-0oel0yi08dsxvmxi
2013-07-24 12:20:17 +02:00
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
034a5d5dcf
[FIX] point_of_sale: LocalService -> signal_ validation
...
bzr revid: tde@openerp.com-20130711125155-hmf0u0p0o45iac66
2013-07-11 14:51:55 +02:00
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
dbddcbaf2d
[MERGE] upstream
...
bzr revid: hmo@tinyerp.com-20130710080735-k1164irzdrbahy4k
2013-07-10 13:37:35 +05:30
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
e92a18ee0b
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20130701085739-94uxqowz623wudp4
2013-07-01 14:27:39 +05:30
9598f4c0be
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20130620060637-s4x59zxv02sna643
2013-06-20 11:36:37 +05:30
4b98b1c689
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130620054125-ai4ozl8pd1hv84sr
2013-06-20 11:11:25 +05:30
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
5a761f9752
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130617065636-t6kjnfe6vyz6m8av
2013-06-17 12:26:36 +05:30
bc58a5a224
[CLEAN] Misc cleaning before merging.
...
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +02:00
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
5ee65de025
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130613084838-twjsl8cdi5ajjp4c
2013-06-13 14:18:38 +05:30
b83f1fbf83
[MERGE]: Merge with addons
...
bzr revid: chandni.machchhar3@gmail.com-20130612110354-h8nxz02l0yeqkqx9
2013-06-12 16:33:54 +05:30
ae1354509c
[MERGE] merged with main addons
...
bzr revid: darshankalola@gmail.com-20130607131308-9ovklg1q347w8f2o
2013-06-07 18:43:08 +05:30
00029958b3
[IMP] improve Help
...
bzr revid: darshankalola@gmail.com-20130607130240-e5indzh1nzfmy4wk
2013-06-07 18:32:40 +05:30
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
2bda4f7b3c
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130607113500-jzhet9cr98c0ss4s
2013-06-07 17:05:00 +05:30
8f07cb2046
[IMP] Improved Help
...
bzr revid: darshankalola@gmail.com-20130605070425-ykw13dlv28aq4akh
2013-06-05 12:34:25 +05:30
d43bb76e99
[IMP] remove extraneous whitespaces
...
bzr revid: rma@tinyerp.com-20130531103847-hhyro1m9oldzujkm
2013-05-31 16:08:47 +05:30
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
7841bac687
[IMP] Improved typo in Warning
...
bzr revid: ggh@tinyerp.com-20130429053851-ipatcoxtjwrwfijk
2013-04-29 11:08:51 +05:30
507cd402b7
[IMP] changes the labels string as per suggestion
...
bzr revid: rma@tinyerp.com-20130417095544-wl04gd57vuv4k2c4
2013-04-17 15:25:44 +05:30
d1e17fbde0
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
f19775e627
[Merge] with trunk
...
bzr revid: ggh@tinyerp.com-20130417060803-krp406lxyh3l2hp0
2013-04-17 11:38:03 +05:30
735a20f320
[REM] Remove the onchange pos available method
...
bzr revid: ggh@tinyerp.com-20130417052737-4t5ejcwzkkkgfqdj
2013-04-17 10:57:37 +05:30
c46929268d
[FIX] account* modules: added 'account_period_prefer_normal':True in context when trying to find the period related to a date.
...
This patch will be forward ported in trunk by changing the behaviour of account_period.find() in order to fetch the normal periods by default (account_period_prefer_normal will be True by default) because there are no business case i could think of where you'd like to get the opening period (except in the closure but it's held in a different way there). On the other hand, it's pretty easy to forget to put that key in the context and introduce a new bug that will select the opening period instead of the wanted one
bzr revid: qdp-launchpad@openerp.com-20130418102433-t52uj23trkpr8vnb
2013-04-18 12:24:33 +02:00
efceba5b8b
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130416073641-pcelb6zsq8dg56wb
2013-04-16 09:36:41 +02:00
812c852fd0
[FORWARD] Merged 7.0 addons revisions until 9021
...
bzr revid: tde@openerp.com-20130415084302-hx7zxtpl5u6yphfg
bzr revid: tde@openerp.com-20130415153732-v4ols3t56rku92oz
2013-04-15 17:37:32 +02:00
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
794455418c
[Merge] with trunk
...
bzr revid: ggh@tinyerp.com-20130412130406-1a4glbnb0rvg5k63
2013-04-12 18:34:06 +05:30
cd0d874f02
[IMP] Improve code for default payment method in pos
...
bzr revid: ggh@tinyerp.com-20130412105954-2lxok63u799s31sa
2013-04-12 16:29:54 +05:30
6e63c47c64
[FIX] pos,cash-register: corrected word theoritical to theoretical changes.
...
bzr revid: tta@openerp.com-20130412093807-9bazw36l9khrjm0l
2013-04-12 15:08:07 +05:30
a3b5ce64a4
[IMP] Remove others category in demo data
...
bzr revid: ggh@tinyerp.com-20130412073655-rwscgrno71a3fzlo
2013-04-12 13:06:55 +05:30
354ac328c8
[FIX] point_of_sale fix tax rouding, this time tested, tnx fva
...
bzr revid: al@openerp.com-20130411224306-eei87tz4xp3d0o7n
2013-04-12 00:43:06 +02:00
4da68cbc22
[FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
ef81f0bd43
[IMP] point_of_sale: add a configuration option to enable invoicing from the Point of Sale (enabled by default)
...
bzr revid: fva@openerp.com-20130411122250-aju5cl91wduj2bj0
2013-04-11 14:22:50 +02:00
3aa6f4add5
[IMP] point_of_sale: the invoicing should now work reliably and validate the orders
...
bzr revid: fva@openerp.com-20130411120719-colzjq4l8eaiotdf
2013-04-11 14:07:19 +02:00
e582096959
[IMP] Improved code in Pos
...
bzr revid: ggh@tinyerp.com-20130411102949-lfeakwxskka8hzyy
2013-04-11 15:59:49 +05:30
43a9fa81fd
[IMP] Name of method changed
...
bzr revid: ggh@tinyerp.com-20130411051350-0esvxad9a189x8iz
2013-04-11 10:43:50 +05:30
6ca422445c
[IMP] POS: Remove Default Category, when pos created
...
bzr revid: ggh@tinyerp.com-20130410105743-5i04atwsawpb8c6u
2013-04-10 16:27:43 +05:30
5aae7d0ec0
[IMP] Improve the code
...
bzr revid: ggh@tinyerp.com-20130410093456-rhjlutpqrqxshy2p
2013-04-10 15:04:56 +05:30
12b4e84f7b
[IMP] POS:product is not available_in_pos so category not show
...
bzr revid: ggh@tinyerp.com-20130410071724-wn0rlfbxk3jxsv3j
2013-04-10 12:47:24 +05:30
b2a872846c
[FIX] point_of_sale: use the correct rounding method for computing taxes
...
bzr revid: fva@openerp.com-20130409160021-707f3vrxcrqytsl6
2013-04-09 18:00:21 +02:00
07db55efa3
[IMP] POS:Available in pos checkbox not click pos_categ no need to display
...
bzr revid: ggh@tinyerp.com-20130409132314-2o0uvomvd5afy624
2013-04-09 18:53:14 +05:30
0d34beaf27
[IMP] POS: Without demo db, default Others pos category removed
...
bzr revid: ggh@tinyerp.com-20130409110851-krcl059eprf63sas
2013-04-09 16:38:51 +05:30
b062573df4
[IMP] pos,cash-register: Corrected tooltips and layout.
...
bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
2013-04-09 10:17:24 +05:30
4bb06462d7
[FIX] Check that payment method journal is of type cash or bank
...
bzr revid: jco@openerp.com-20130405134438-86l1ph7192owwrol
2013-04-05 15:44:38 +02:00
76b7a08275
[IMP] pos session and cash register, Improved tooltip and layout.
...
bzr revid: tta@openerp.com-20130405092419-jpa89isevfq6jw49
2013-04-05 14:54:19 +05:30
8e0f1cd1b9
[MERGE] lp:~openerp-dev/openobject-addons/trunk-cashcontrol--cha.
...
bzr revid: tta@openerp.com-20130404131017-phib24vytdx5fqmj
2013-04-04 18:40:17 +05:30
c5cde2a6a3
[MERGE] fixes in POS: optimizing the code when closing a session to have acceptable delays, used the right partner, changing the partner on the pos order also change it on the payment linked...
...
bzr revid: qdp-launchpad@openerp.com-20130404151428-yr2jhgjkolyjrcyf
2013-04-04 17:14:28 +02:00
14e4841c83
[IMP] pos.session:Corrected tooltip for cash_register_difference field.
...
bzr revid: tta@openerp.com-20130401103929-tdpsfl7w8akhh4d8
2013-04-01 16:09:29 +05:30
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
cae96ed454
[FIX] point_of_sale: correctly set the customer on the order
...
bzr revid: fva@openerp.com-20130329110048-1cx2sr4hp98cue0f
2013-03-29 12:00:48 +01:00
78e9418717
[FIX] Write all lines at once to the move instead of creating move lines separately
...
bzr revid: jco@openerp.com-20130328155549-pdqg0fgk1timzgfb
2013-03-28 16:55:49 +01:00
c0b4f5b714
[FIX] taxes should have partner too
...
bzr revid: jco@openerp.com-20130328121615-eyoplrrrofrosuay
2013-03-28 13:16:15 +01:00
2d210fce44
[FIX] Use accounting partner and take partner into account when group by
...
bzr revid: jco@openerp.com-20130328112829-6sj9eixmkzm3dr1r
2013-03-28 12:28:29 +01:00
fb38f1d81d
[FIX] Update partner in associated bank statements when changing partner in pos order
...
bzr revid: jco@openerp.com-20130325134410-ky0akwdcfr805df8
2013-03-25 14:44:10 +01:00
Josse Colpaert
Denis Ledoux
Christophe Simonis
Quentin (OpenERP)
Frédéric van der Essen
Thibault Delavallée
ddm@openerp.com
Olivier Dony
Paramjit Singh Sahota
Christophe Matthieu
Randhir Mayatra (OpenERP)
Martin Trigaux
Pooja Zankhariya (OpenERP Trainee)
Amit Vora (OpenERP Trainee)
Atul Patel (OpenERP)
Cedric Snauwaert
Bharat R. Devnani (OpenERP)
Fabien Pinckaers
Harry (OpenERP)
Foram Katharotiya (OpenERP)
Chandni Machchhar (OpenERP Trainee)
Darshan Kalola (OpenERP Trainee)
ggh-openerp
Vo Minh Thu
Tejas Tank
Antony Lesuisse
Raphael Collet