91c3785691
[FIX]7.0 Problem with Point of Sale - Can't Close Uncaught TypeError
...
lp bug: https://launchpad.net/bugs/1066288 fixed
bzr revid: vja@tinyerp.com-20121016071616-kzjifxm9eala1fjx
2012-10-16 12:46:16 +05:30
8346293d72
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
59ddf58bb4
[MERGE] callback2deffered rpc
...
bzr revid: al@openerp.com-20121015133334-4fmbsa14r23laljs
2012-10-15 15:33:34 +02:00
cdd1b7c45e
[FIX] typo PoS
...
bzr revid: fp@tinyerp.com-20121013103756-0h1uw6wd7py809rc
2012-10-13 12:37:56 +02:00
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
00f3dfc6d8
[MERGE] use of formatLAng(amount, currency_obj=...) and use of display_address() in reports
...
bzr revid: qdp-launchpad@openerp.com-20121012071640-sxhy9xnat65r8158
2012-10-12 09:16:40 +02:00
e226a070e1
[FIX]:Uncaught Error: QWeb2 - template['PaypadButtonWidget']: Runtime Error: TypeError: Cannot read property 'name' of undefined
...
bzr revid: apa@tinyerp.com-20121012070145-8iu2yudx0yjzroj4
2012-10-12 12:31:45 +05:30
2762e94eb3
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011052218-dx74aeg04h6azdmz
bzr revid: apa@tinyerp.com-20121012050113-w3b9fijrbxfyndxj
2012-10-12 10:31:13 +05:30
bc44da05a1
[IMP] reports: use of FormatLang(amount, currency_obj=...) instead of printing currency.symbol directly in the report
...
bzr revid: qdp-launchpad@openerp.com-20121011094002-7unxi6bi2hh2u6k5
2012-10-11 11:40:02 +02:00
914498d2ff
[MERGE] trunk
...
bzr revid: fp@tinyerp.com-20121011081908-fu1don49seb3loro
2012-10-11 10:19:08 +02:00
ce440f16d3
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121011075658-bf5ax000j74vi6ro
2012-10-11 09:56:58 +02:00
faa9b72150
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011055111-o9jrrunnlx56ce1o
2012-10-11 11:21:11 +05:30
84a7523a63
[IMP] remove standalone web client, fix imports
...
bzr revid: al@openerp.com-20121010204617-ah29rz616xo7i2dr
2012-10-10 22:46:17 +02:00
dd5f5eca9b
[MERGE]
...
bzr revid: fp@openerp.com-20121010203818-32otffomve5ifm16
2012-10-10 22:38:18 +02:00
7b585d3e1f
[FIX]:Uncaught TypeError: Cannot read property 'context' of undefined
...
bzr revid: apa@tinyerp.com-20121010113556-p79hzujiunibwsix
2012-10-10 17:05:56 +05:30
57011e3ef5
[MERGE/FIX]:
...
- If you manually create a session by clicking on "All Sessions" then "Create" and enter a pos, the pos field will dissapear..
- Should not be possible to select view accounts for profit/losss acount on cash registers tab of payment method
bzr revid: apa@tinyerp.com-20121010104043-gcj3ytsjhua7k8p7
2012-10-10 16:10:43 +05:30
0e26c16d0f
[IMP] appear the pos fields when create a session
...
bzr revid: fka@tinyerp.com-20121010070940-vyjatobj08nmpoir
2012-10-10 12:39:40 +05:30
d48856e81a
[FIX]:point_of_sale: In the same way the %age of discount was wrong in the reporting > point of sale > Sale details, there's a problem of conversion from %age to amount in the other report (reporting > point of sale > ORDER ANALYSIS), where the Total discount is the sum of %ages converted in €. So two times 50% discount = 100€ even though the item cost 1 bazillion, which is not correct.
...
bzr revid: apa@tinyerp.com-20121010052920-7d2zl85war0bn8jr
2012-10-10 10:59:20 +05:30
8944588931
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121004050405-de1o2nl772ow12yf
bzr revid: atp@tinyerp.com-20121008051226-6fz3lau22ylb02oc
bzr revid: atp@tinyerp.com-20121008113735-ubbudyuqotrsg5fo
2012-10-08 17:07:35 +05:30
ddb869f180
[FIX] fixing css errors as reported by firefox
...
bzr revid: fva@openerp.com-20121005140616-w5tulvk6v6hesjmn
2012-10-05 16:06:16 +02:00
a014d89ab6
[IMP]add receipt ref for receipt in pos and pos order
...
bzr revid: sgo@tinyerp.com-20121005133315-qjwl6nx360em8u43
2012-10-05 19:03:15 +05:30
062a78f8da
[IMP]improve pos reprint wizard
...
bzr revid: sgo@tinyerp.com-20121005112633-a7er5yxbykgij52s
2012-10-05 16:56:33 +05:30
5b48e0894e
[IMP]discount shows grey and small font under product and total discount amt shows after tax
...
bzr revid: sgo@tinyerp.com-20121005110504-63l1uzxi0fomn4ic
2012-10-05 16:35:04 +05:30
b461dd366f
[IMP]discount shown on ticket. if pos have no order lines it can not validate for ticket print. and improve report of sale detail
...
bzr revid: sgo@tinyerp.com-20121005070033-o51n2w72j7322zg5
2012-10-05 12:30:33 +05:30
540cd63740
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121004055521-yadslxbizyevvfrh
2012-10-04 11:25:21 +05:30
7050ee5abb
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121004053709-mzo4257vg798d0a0
2012-10-04 11:07:09 +05:30
1fe81f3a96
[IMP] In rpc method remove callback and modify related code
...
bzr revid: ggh@tinyerp.com-20121003123412-22o4t380ipsmns2e
2012-10-03 18:04:12 +05:30
fbd443a66e
[MERGE] merge with addons
...
bzr revid: rma@tinyerp.com-20121003103503-5rdpwbp2cecfmna0
2012-10-03 16:05:03 +05:30
2d3d478784
[MERGE] Fix some bugs of the point of sale
...
bzr revid: stw@openerp.com-20121003080934-7viber8ldyrjgaqg
2012-10-03 10:09:34 +02:00
f715525300
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121003064028-49llvt047893tx2n
2012-10-03 12:10:28 +05:30
b0cdfa4eda
[FIX]point_of_sale:string improved in user view.
...
bzr revid: kbh@tinyerp.com-20121003055428-oc6r5t4fpmdb29tj
2012-10-03 11:24:28 +05:30
257d03f403
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121003052447-99gpby70gy2fbhih
2012-10-03 10:54:47 +05:30
bdae7c2850
[IMP]: ADD currency symbol with amount
...
bzr revid: atp@tinyerp.com-20121002164001-s8r2ivug8ghi36af
2012-10-02 22:10:01 +05:30
1653332080
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
0fa7da3168
[WIP FIX] point_of_sale: investigating a bug with codebar scanning in subcategories
...
bzr revid: fva@openerp.com-20121002101353-imjbqe1vxtdjbqu7
2012-10-02 12:13:53 +02:00
c850875ca3
[FIX] point_of_sale: Number.isNaN is not supported on older but supported browsers
...
bzr revid: fva@openerp.com-20121002100420-pcvbn7qqxyp62bzw
2012-10-02 12:04:20 +02:00
082f70cb6f
[MERGE]: Merged display_address() field
...
bzr revid: atp@tinyerp.com-20121002065832-7wick5qjfbbhy5jv
2012-10-02 12:28:32 +05:30
a9676cfd8c
[IMP] amout with currency.
...
bzr revid: nco@tinyerp.com-20121001110802-r3l169i2ka73t2rh
2012-10-01 16:38:02 +05:30
3bd0b43e81
[FIX] point_of_sale: We use a callback for the 'Validate & Open
...
Session' button, because we want to open the PoS UI.
[FIX] point_of_sale: Hide/Show the opening/closing cash control
bzr revid: stw@openerp.com-20121001095254-bcteq9amp0eurn3g
2012-10-01 11:52:54 +02:00
e7512fd22f
[IMP] point_of_sale: globally improved css design
...
bzr revid: fva@openerp.com-20120928152041-mo5oqca8zd0aaohu
2012-09-28 17:20:41 +02:00
a634a1a91f
expense.sxw pos_lines.sxw and pos_lines.rml
...
bzr revid: nco@tinyerp.com-20120928124057-26jmpyivpgs536cp
2012-09-28 18:10:57 +05:30
7f3455cdc8
[IMP] point_of_sale , pos_lines.rml
...
bzr revid: nco@tinyerp.com-20120928121313-r2iicypzvjlyrzjt
2012-09-28 17:43:13 +05:30
b3dde42f5b
[IMP] imporve amount with curruncy in point_of_sale , pos_lines.rml
...
bzr revid: nco@tinyerp.com-20120928114743-we0dvo10wv7d3its
2012-09-28 17:17:43 +05:30
155bdaf57b
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120927142055-p5yc406vkufi6rg9
2012-09-27 16:20:55 +02:00
ff211c375a
[FIX] point_of_sale: return the session id in the context for the call of the pos.ui
...
bzr revid: stw@openerp.com-20120927122022-fy2gx1z1xtkk14xt
2012-09-27 14:20:22 +02:00
4f74d0aee1
[FIX] point_of_sale: show the cash_register_balance when we are in closing_control
...
bzr revid: stw@openerp.com-20120927121954-1safkpgurh4nu9kc
2012-09-27 14:19:54 +02:00
8c42299413
[REMOVE] remove create button form all posgress report.
...
bzr revid: nco@tinyerp.com-20120927083839-ruhpxzwgdyasodfe
2012-09-27 14:08:39 +05:30
7146bf55aa
[IMP] correct the string mistake in point of sale module
...
bzr revid: rma@tinyerp.com-20120926132702-einbzxd11utfn6qf
2012-09-26 18:57:02 +05:30
1149fffd9a
[MERGE] point_of_sale: Show the opening & closing control
...
bzr revid: stw@openerp.com-20120926094502-d6qe9mkarfvr8rha
2012-09-26 11:45:02 +02:00
e3003f56b2
[IMP] point of sale, 10 firsts clicks cleaned
...
bzr revid: fp@tinyerp.com-20120925075645-9ydq1dh6usmwyknx
2012-09-25 09:56:45 +02:00
24a4e57171
[FIX] point_of_sale: show the opening cash control
...
bzr revid: stw@openerp.com-20120924115320-nkbfhfnyab4bhxrc
2012-09-24 13:53:20 +02:00
f0a883e6d6
[FIX] point_of_sale: Show the opening_control & closing_control
...
bzr revid: stw@openerp.com-20120924102613-twii7ba34wctx6c6
2012-09-24 12:26:13 +02:00
968325cb39
[WIP] point_of_sale: first test of new TPE API
...
bzr revid: fva@openerp.com-20120918133732-q7za0r3dcggem8mw
2012-09-18 15:37:32 +02:00
85b16184f8
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20120918131350-xx40khn6xsb5j16f
2012-09-18 15:13:50 +02:00
69d83db1e5
[MERGE] point_of_sale: select the cash journals and hide some elements on the form view.
...
bzr revid: stw@openerp.com-20120917153714-kelopzdwaysht3pd
2012-09-17 17:37:14 +02:00
2a4aaeba31
[FIX] point_of_sale: Show/Hide some groups in function of the state and the cash_control flag
...
bzr revid: stw@openerp.com-20120917140138-sjsnjxv27nd8rnao
2012-09-17 16:01:38 +02:00
06852d994b
[FIX] point_of_sale: Take the 'cash' journals if there is no specific cash journal for the Point Of Sale
...
bzr revid: stw@openerp.com-20120917120926-h3bzu2k9ds5lnjjr
2012-09-17 14:09:26 +02:00
ccb15e76f6
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx
2012-09-17 13:44:55 +02:00
b4d415ff9b
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120917050738-i5730n5sbqvnfsnh
2012-09-17 10:37:38 +05:30
b9fa71cc59
[MERGE] merge rpa's imprvoements of modules description
...
bzr revid: fp@openerp.com-20120916212615-jfoghzsady0ektp1
2012-09-16 23:26:15 +02:00
ab4b7da49f
[IMP] cleaned ir.actions.todo to launch newly installed application
...
bzr revid: fp@openerp.com-20120916114249-5px8shvbm3tzhidh
2012-09-16 13:42:49 +02:00
59c03591df
[MERGE] improvements on module descriptions
...
bzr revid: gim@openerp.com-20120914140950-drka4c0tnbnkw3fg
2012-09-14 16:09:50 +02:00
30839863e8
[IMP] improve module descriptions
...
bzr revid: gim@openerp.com-20120914122827-dhao39ur269mmin8
2012-09-14 14:28:27 +02:00
2e65d4319f
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120912051440-raj6egoom3qyfsmm
bzr revid: atp@tinyerp.com-20120913034436-i09g3lujgvy81gr6
bzr revid: atp@tinyerp.com-20120914051314-m5g13izj55f4sxqi
2012-09-14 10:43:14 +05:30
d7dfc3dc1c
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
8920abbb65
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120913151434-y30kfigwj20w3y58
2012-09-13 17:14:34 +02:00
703cc35a4d
[FIX] point_of_sale: demo data ean match the debug window defaults
...
bzr revid: fva@openerp.com-20120913150913-bq96hvr3cmbgijjg
2012-09-13 17:09:13 +02:00
200d33229a
[IMP] point_of_sale: scan and search in products packagings
...
bzr revid: fva@openerp.com-20120913140310-4z9bxo1d0r13ep76
2012-09-13 16:03:10 +02:00
b7d56a0b04
[IMP] point_of_sale: some improvements to the debug window
...
bzr revid: fva@openerp.com-20120913104621-zryga82o3d4vq174
2012-09-13 12:46:21 +02:00
10c5a5c02a
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120913053058-unlfdj92o69rnjam
2012-09-13 11:00:58 +05:30
a5f52bc3e5
[IMP] touchscreen pos, usability improvements
...
bzr revid: fp@tinyerp.com-20120912182126-7lgskacso9pfh7er
2012-09-12 20:21:26 +02:00
168e3244f3
[IMP] start session directly if possible with POS
...
bzr revid: fp@tinyerp.com-20120912181814-4t3rlicu5s9wqap8
2012-09-12 20:18:14 +02:00
9dfca35b19
[IMP] point_of_sale: put debug window code in the right place
...
bzr revid: fva@openerp.com-20120912162653-fnbvqwg4l51lveal
2012-09-12 18:26:53 +02:00
a5bed8994c
[IMP] point_of_sale: debug window
...
bzr revid: fva@openerp.com-20120912161229-4lgcgt4xt2cdzceo
2012-09-12 18:12:29 +02:00
4db2bc0c43
[FIX] point_of_sale: help wasn't always cancelled when popup closed
...
bzr revid: fva@openerp.com-20120911101830-dvxi9sg5oan5r5nc
2012-09-11 12:18:30 +02:00
9899e87dd0
[IMP]: point_of_sale: Improved module description for point_of_sale
...
bzr revid: rpa@tinyerp.com-20120911100941-3r0a3q3ojry8si4h
2012-09-11 15:39:41 +05:30
431fae4da5
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120911045411-mivfwqle7pidfr68
2012-09-11 10:24:11 +05:30
f711f7d9a6
[MERGE] muti-currency group
...
bzr revid: fp@openerp.com-20120910201408-paf7q0cj22i72k2n
2012-09-10 22:14:08 +02:00
d71e5b45b6
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120910154950-rg1phce0w33gsq8b
2012-09-10 17:49:50 +02:00
83fc106eaa
[FIX] point_of_sale: coherent image url handling
...
bzr revid: fva@openerp.com-20120910154828-4k699hi3lu8lgxvu
2012-09-10 17:48:28 +02:00
7c9b5c8e5b
[IMP] point_of_sale: If there is no journals for the pos.config, select the cash journals
...
bzr revid: stw@openerp.com-20120910091618-nzv26m258xx64na5
2012-09-10 11:16:18 +02:00
f1cf4c04b9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
2012-09-09 16:32:14 +05:30
3982e5ba7a
[IMP] mail_group, point of sale, hr: updated image fields help, as small and medium sizes are now 64x64 ans 128x128, to match more closely OpenERP image sizes. product: image_medium are not up-sized when resizing them. This means that images smaller than 128x128 won't be resized in image_medium. The purpose is to avoid having unwanted blank frame around images in POS.
...
bzr revid: tde@openerp.com-20120907095155-i5hlmidnkq7r2r7b
2012-09-07 11:51:55 +02:00
b086b8a584
[CLEAN] mail_group, product, point_of_sale, hr: cleaned help of image, because it was too technical-related. Added a comment in code instead about PIL and base64. By the way, small cleaning of the white spaces.
...
bzr revid: tde@openerp.com-20120907092333-9f745210yr3p22ay
2012-09-07 11:23:33 +02:00
ac75763855
[MRG] merge with lp:openobjec-addons.
...
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30
aac17b11a4
[FIX] remove semantic part1
...
bzr revid: al@openerp.com-20120906101723-eeieyzhj4racxq14
2012-09-06 12:17:23 +02:00
b2cb4b841d
[FIX] point_of_sale: unrecognized_items error handling
...
bzr revid: fva@openerp.com-20120905210751-7lbzkypzefy6zb3f
2012-09-05 23:07:51 +02:00
998134d464
[FIX] point_of_sale: help popup on welcome screen
...
bzr revid: fva@openerp.com-20120905203317-34hkv0ouawdp8gxw
2012-09-05 22:33:17 +02:00
63df74b8dc
[FIX] keyboard layout and numpad input
...
bzr revid: fva@openerp.com-20120905202058-o5r2ckzhwdkv2xhq
2012-09-05 22:20:58 +02:00
bff5b81db3
[FIX] fixing some regressions
...
bzr revid: fva@openerp.com-20120905164221-hcigfd0kxdckgz94
2012-09-05 18:42:21 +02:00
41e16c6592
[MERGE] sync with trunk
...
bzr revid: odo@openerp.com-20120905163135-9f6q0ghri1kq6z75
2012-09-05 18:31:35 +02:00
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
49b1605b98
[FIX] point_of_sale: css fixes related to ul/li semantic css changes
...
bzr revid: fva@openerp.com-20120905115000-dx2exlr3cnn2iszy
2012-09-05 13:50:00 +02:00
eb53669cb1
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120905094101-j20tm78k7sq6dnxd
2012-09-05 11:41:01 +02:00
f24667b1f9
[FIX] point_of_sale: ean argument was wrongly passed to the proxy
...
bzr revid: fva@openerp.com-20120905092053-9hj9sbscqrjbg0h0
2012-09-05 11:20:53 +02:00
bc586f2efe
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120905081314-uu3khdpohgz23j6q
2012-09-05 10:13:14 +02:00
2160072508
[MERGE] sync with trunk
...
bzr revid: odo@openerp.com-20120905073134-v1j98vzvmwe6a72i
2012-09-05 09:31:34 +02:00
709331f682
[MERGE] remove unneeded demo users
...
bzr revid: al@openerp.com-20120905001533-fz1htj832djequ6p
2012-09-05 02:15:33 +02:00
5126f6ff6e
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20120904163725-ptsij09rve8j3txs
2012-09-04 18:37:25 +02:00
ee07aa224c
[IMP] point_of_sale: added console ean input in debug mode
...
bzr revid: fva@openerp.com-20120904154603-khymfg996jdgn9xr
2012-09-04 17:46:03 +02:00
Vishmita
Mayur Maheshwari (OpenERP)
Antony Lesuisse
Fabien Pinckaers
Quentin (OpenERP)
Amit Patel
Fabien Pinckaers
Foram Katharotiya (OpenERP)
Atul Patel (OpenERP)
Frédéric van der Essen
Sanjay Gohel (Open ERP)
ggh-openerp
Randhir Mayatra (OpenERP)
Stephane Wirtel
Khushboo Bhatt (Open ERP)
Antonin Bourguignon
Nimesh (Open ERP)
Gilles Major
Jigar Amin - OpenERP
Rucha (Open ERP)
Thibault Delavallée
Turkesh Patel (Open ERP)
Olivier Dony
niv-openerp