Commit Graph

1953 Commits

Author SHA1 Message Date
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
vta vta@openerp.com a53941b165 [FIX] Fixed CallbackEnabled issues in POS.
bzr revid: vta@openerp.com-20121023075035-wx3awh0sdeeqa7t3
2012-10-23 09:50:35 +02:00
Quentin (OpenERP) b2de4d421c [MERGE] merged a branch with several fixes, related to the new patch applied on server fo 1) osv/orm: call the fct_inv for functional fields that are stored=True 2) tools/yamp_import: on record creation, do not consider fields that wouldn't be returned by the client because readonly in the view
bzr revid: qdp-launchpad@openerp.com-20121022130156-ki47is4opjex9d79
2012-10-22 15:01:56 +02:00
Antony Lesuisse 50e0b17662 [FIX] pos closing
bzr revid: al@openerp.com-20121022104529-9wq22t76fj6zqxu6
2012-10-22 12:45:29 +02:00
Mayur Maheshwari (OpenERP) d1131c4a8d [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121018052756-65fv51x0qrmz7zj6
bzr revid: mma@tinyerp.com-20121019050930-mcht3lslqjk38q22
2012-10-19 10:39:30 +05:30
Quentin (OpenERP) e5ea70b4c2 [FIX] point_of_sale: typo in report
bzr revid: qdp-launchpad@openerp.com-20121018135949-b08zihsoo7s0km05
2012-10-18 15:59:49 +02:00
Frédéric van der Essen 5469854d17 [MERGE] from trunk
bzr revid: fva@openerp.com-20121018081536-r0xfo12gttw0loab
2012-10-18 10:15:36 +02:00
Launchpad Translations on behalf of openerp df2750f9fd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121018044110-cqlg7hbfgy4m2bba
2012-10-18 04:41:10 +00:00
Frédéric van der Essen cbdb0ccf9c [MERGE] from trunk
bzr revid: fva@openerp.com-20121017140509-67yq1gjzrs871hb6
2012-10-17 16:05:09 +02:00
Launchpad Translations on behalf of openerp 8a38ee944e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121017043613-kd7vkw5ixd4djrpm
2012-10-17 04:36:13 +00:00
Mayur Maheshwari (OpenERP) 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
Antony Lesuisse 59ddf58bb4 [MERGE] callback2deffered rpc
bzr revid: al@openerp.com-20121015133334-4fmbsa14r23laljs
2012-10-15 15:33:34 +02:00
Fabien Pinckaers cdd1b7c45e [FIX] typo PoS
bzr revid: fp@tinyerp.com-20121013103756-0h1uw6wd7py809rc
2012-10-13 12:37:56 +02:00
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
Quentin (OpenERP) 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
Quentin (OpenERP) 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
Fabien Pinckaers 914498d2ff [MERGE] trunk
bzr revid: fp@tinyerp.com-20121011081908-fu1don49seb3loro
2012-10-11 10:19:08 +02:00
Quentin (OpenERP) ce440f16d3 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121011075658-bf5ax000j74vi6ro
2012-10-11 09:56:58 +02:00
Amit Patel faa9b72150 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121011055111-o9jrrunnlx56ce1o
2012-10-11 11:21:11 +05:30
Antony Lesuisse 84a7523a63 [IMP] remove standalone web client, fix imports
bzr revid: al@openerp.com-20121010204617-ah29rz616xo7i2dr
2012-10-10 22:46:17 +02:00
Fabien Pinckaers dd5f5eca9b [MERGE]
bzr revid: fp@openerp.com-20121010203818-32otffomve5ifm16
2012-10-10 22:38:18 +02:00
Atul Patel (OpenERP) 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
Frédéric van der Essen ddb869f180 [FIX] fixing css errors as reported by firefox
bzr revid: fva@openerp.com-20121005140616-w5tulvk6v6hesjmn
2012-10-05 16:06:16 +02:00
Amit Patel 540cd63740 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121004055521-yadslxbizyevvfrh
2012-10-04 11:25:21 +05:30
Atul Patel (OpenERP) 7050ee5abb [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121004053709-mzo4257vg798d0a0
2012-10-04 11:07:09 +05:30
ggh-openerp 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
Randhir Mayatra (OpenERP) fbd443a66e [MERGE] merge with addons
bzr revid: rma@tinyerp.com-20121003103503-5rdpwbp2cecfmna0
2012-10-03 16:05:03 +05:30
Stephane Wirtel 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
Atul Patel (OpenERP) f715525300 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121003064028-49llvt047893tx2n
2012-10-03 12:10:28 +05:30
Khushboo Bhatt (Open ERP) 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
Atul Patel (OpenERP) 257d03f403 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121003052447-99gpby70gy2fbhih
2012-10-03 10:54:47 +05:30
Atul Patel (OpenERP) bdae7c2850 [IMP]: ADD currency symbol with amount
bzr revid: atp@tinyerp.com-20121002164001-s8r2ivug8ghi36af
2012-10-02 22:10:01 +05:30
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Atul Patel (OpenERP) 082f70cb6f [MERGE]: Merged display_address() field
bzr revid: atp@tinyerp.com-20121002065832-7wick5qjfbbhy5jv
2012-10-02 12:28:32 +05:30
Nimesh (Open ERP) a9676cfd8c [IMP] amout with currency.
bzr revid: nco@tinyerp.com-20121001110802-r3l169i2ka73t2rh
2012-10-01 16:38:02 +05:30
Stephane Wirtel 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
Frédéric van der Essen e7512fd22f [IMP] point_of_sale: globally improved css design
bzr revid: fva@openerp.com-20120928152041-mo5oqca8zd0aaohu
2012-09-28 17:20:41 +02:00
Nimesh (Open ERP) 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
Nimesh (Open ERP) 7f3455cdc8 [IMP] point_of_sale , pos_lines.rml
bzr revid: nco@tinyerp.com-20120928121313-r2iicypzvjlyrzjt
2012-09-28 17:43:13 +05:30
Nimesh (Open ERP) 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
Frédéric van der Essen 155bdaf57b [MERGE] from trunk
bzr revid: fva@openerp.com-20120927142055-p5yc406vkufi6rg9
2012-09-27 16:20:55 +02:00
Stephane Wirtel 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
Stephane Wirtel 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
Nimesh (Open ERP) 8c42299413 [REMOVE] remove create button form all posgress report.
bzr revid: nco@tinyerp.com-20120927083839-ruhpxzwgdyasodfe
2012-09-27 14:08:39 +05:30
Randhir Mayatra (OpenERP) 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
Stephane Wirtel 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
Fabien Pinckaers e3003f56b2 [IMP] point of sale, 10 firsts clicks cleaned
bzr revid: fp@tinyerp.com-20120925075645-9ydq1dh6usmwyknx
2012-09-25 09:56:45 +02:00
Stephane Wirtel 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
Stephane Wirtel 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
Frédéric van der Essen 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