74d2f592bf
[IMP] Minor spellchecking/cleanup/nitpicking while reviewing new v8 WMS
...
bzr revid: odo@openerp.com-20140508143940-itpazj4eatznerw7
2014-05-08 16:39:40 +02:00
70eb74a260
[MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
...
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
ada19d175d
[FIX] POS - Write the state to Paid before the create_picking. It's allow to stay in a valid state in workflow. And let the current stock picking out to 'Ready for delivery'
...
bzr revid: jke@openerp.com-20140507120144-m177kqxa3fbfl37r
2014-05-07 14:01:44 +02:00
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
57fc6c4d55
[FIX] When converting a pos order line to an invoice line, a key 'note' was passed to the 'create' but there is not a 'note' field in the model invoice line.
...
bzr revid: sle@openerp.com-20140414123529-7k2a0fdsz7fg01xl
2014-04-14 14:35:29 +02:00
afd490c984
[REM] removed details_summary, sales_user, sales_user_today, payment_user reports, wizards and rml
...
[REM] dead code: pos_box_entries.py/xml, pos_box_out.py/xml, pos_return_view.py/xml
[ADD] lines, invoice, cashbox of the day, payment, receipt, users product reports converted to QWeb. Added YML tests for the bank statement reports.
[FIX] closed cashbox of the day sql using old fields in its queries, yml test not correctly generating an invoice from a pos order
bzr revid: sle@openerp.com-20140414104954-xj10wi640tyr3ufe
2014-04-14 12:49:54 +02:00
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
dfdbf8cdc4
[MERGE] forward port of branch saas-2 up to revid 9162 chs@openerp.com-20140401184913-5hi2h11lnmadbozr
...
bzr revid: chs@openerp.com-20140401190308-f3f2l9br69qb33ob
2014-04-01 21:03:08 +02:00
822ef4a621
[MERGE] forward port of branch 7.0 up to revid 9943 launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
...
bzr revid: chs@openerp.com-20140401184913-5hi2h11lnmadbozr
2014-04-01 20:49:13 +02:00
9989113946
[MERGE] merge branch that fixes point of sale accordingly to changes made in stock
...
bzr revid: qdp-launchpad@openerp.com-20140328145710-ibzo59dv1p06jbg3
2014-03-28 15:57:10 +01:00
e0b27b4ee8
[MERGE] merged trunk up to revision 9251
...
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
c1ce615891
[FIX] point_of_sale: Replaced the call to undefined search_read(...) with search(...) and read(...) calls. (Maintenance Case: 605684)
...
bzr revid: rgo@tinyerp.com-20140326112922-x6ac9j157han28kb
2014-03-26 16:59:22 +05:30
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
fd6352ac06
[IMP] Change report to have location instead of warehouse
...
bzr revid: jco@openerp.com-20140324152211-jecefcplr9mjk0wy
2014-03-24 16:22:11 +01:00
2655798706
[IMP] Onchange on picking type in pos.config
...
bzr revid: jco@openerp.com-20140324125441-eh4wb77pwzop0zon
2014-03-24 13:54:41 +01:00
641fc49eeb
[ADD] Add default location for PoS config
...
bzr revid: jco@openerp.com-20140324123346-r190l8e1ug5mhgyr
2014-03-24 13:33:46 +01:00
d4eda78813
[IMP] Put company_id on pos config + remove pos config name
...
bzr revid: jco@openerp.com-20140324120747-v3mt7pwgqylekshg
2014-03-24 13:07:47 +01:00
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
Olivier Dony
Quentin (OpenERP)
Christophe Simonis
Kersten Jeremy
Josse Colpaert
Simon Lejeune
Ravi Gohil (OpenERP)
Denis Ledoux
Frédéric van der Essen
Thibault Delavallée
ddm@openerp.com
Paramjit Singh Sahota