eef0d61bb9
[MERGE] fix partial payment wizard
...
bzr revid: fp@tinyerp.com-20121113073428-aa2g1vnensxfcgn4
2012-11-13 08:34:28 +01:00
abb680ec29
[MERGE] fix po translation
...
bzr revid: fp@tinyerp.com-20121112084105-9ovbr3tpv4uitboh
2012-11-12 09:41:05 +01:00
0a7d680313
[FIX] Issue with result.result in POS.
...
lp bug: https://launchpad.net/bugs/1066288 fixed
bzr revid: vta@openerp.com-20121109133045-z7w5i49eikobyskw
2012-11-09 14:30:45 +01:00
c5961309c4
[FIX] Fixed POS delete_payment_line triggering and processing.
...
bzr revid: vta@openerp.com-20121109124854-qray80vx77vlli4r
2012-11-09 13:48:54 +01:00
bf07a0daa1
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121109063407-tebmex7hfpur96xw
2012-11-09 12:04:07 +05:30
185b32d7d5
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121107091958-f3rqu7nc585umjwq
2012-11-07 10:19:58 +01:00
35d3d481f7
[IMP]change typo
...
bzr revid: sgo@tinyerp.com-20121106071724-jwd7c75rk382yuzf
2012-11-06 12:47:24 +05:30
bfb7746b6b
[IMP]stock picking name set on create picking
...
bzr revid: sgo@tinyerp.com-20121106071116-nki3vftl249l2hes
2012-11-06 12:41:16 +05:30
0be8f4b72d
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121106065724-5bp6du6cqo3sun88
2012-11-06 12:27:24 +05:30
b74fe87f94
[IMP]ser pricelist of pos on pos order
...
bzr revid: sgo@tinyerp.com-20121106061302-m00bezd0bt0line7
2012-11-06 11:43:02 +05:30
8f83c2194b
[IMP]pos tab in user will show edit button only in edit form and change string of form and help
...
bzr revid: sgo@tinyerp.com-20121105131121-umf8viq2gy1mf3p9
2012-11-05 18:41:21 +05:30
00a28c4b3d
[IMP]pos does not calculate tax and touch screen does not gives actually quantity
...
bzr revid: sgo@tinyerp.com-20121105104357-6r59u4g20ojg0hlw
2012-11-05 16:13:57 +05:30
22ad7a70f7
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121105084838-gwc7xb19f7131vbi
2012-11-05 09:48:38 +01:00
5c3e56267e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121105063300-ylbdx03epxui6v2v
2012-11-05 12:03:00 +05:30
974ca267cf
[MERGE] fix multi-company for pos
...
bzr revid: fp@openerp.com-20121103172128-rx5lvo5xzmsj9ay1
2012-11-03 18:21:28 +01:00
74476c8e22
[FIX] POS close session without cash register
...
bzr revid: fp@openerp.com-20121103171225-nlp53s0aenamdhcg
2012-11-03 18:12:25 +01:00
ce874db95a
[FIX] POS
...
bzr revid: fp@openerp.com-20121103152504-f3o6ce0e833hdibj
2012-11-03 16:25:04 +01:00
f3a92c9633
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121103050437-hjtar0inhj4gqyfi
2012-11-03 05:04:37 +00:00
cd68364301
[MERGE] English typos
...
bzr revid: fp@openerp.com-20121102173407-umicel4287htim14
2012-11-02 18:34:07 +01:00
376cfc937a
[MERGE] addosn 17
...
bzr revid: fp@tinyerp.com-20121102082707-wpv96avu8l5incs8
2012-11-02 09:27:07 +01:00
321754dfe0
[FIX]point_of_sale:fixed the issue of point of sale order receipt fields translation problem
...
lp bug: https://launchpad.net/bugs/1073199 fixed
bzr revid: ssu@tinyerp.com-20121101062613-dplo6xr4e3q6c42y
2012-11-01 11:56:13 +05:30
b006809773
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121101043649-5rzrir0djswt67t6
2012-11-01 04:36:49 +00:00
a7874fc421
[MERGE] point_of_sale: Fix some bugs
...
bzr revid: stw@openerp.com-20121031145708-g7ddb6xsrx2ag8c4
2012-10-31 15:57:08 +01:00
a2715888c1
[IMP] jQuery deferred API changes refactoring. Changed 'then's in 'done'/'fail' and 'pipe's in 'then'
...
bzr revid: fme@openerp.com-20121031103148-r1slfpl2kcnajjd3
2012-10-31 11:31:48 +01:00
1fc8b2e611
[IMP]Improve tool tip.
...
bzr revid: vba@tinyerp.com-20121031072758-niyxbgdzih79mln1
2012-10-31 12:57:58 +05:30
510be6595c
Improve tooltip.
...
bzr revid: vba@tinyerp.com-20121030131401-hf7oonmt0nkwfi1y
2012-10-30 18:44:01 +05:30
87d3caa50f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
72072ccee2
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121029060408-l6o9b7fejdo9uqv0
2012-10-29 11:34:08 +05:30
de55e6d736
[MERGE]merge with trunk-terminology_batch2.
...
bzr revid: vba@tinyerp.com-20121029055922-pmwrqgxq8yo3qb20
2012-10-29 11:29:22 +05:30
0bf0b95d67
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121029051732-hcgpnra148041ews
2012-10-29 10:47:32 +05:30
a7368145ca
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
7850a91339
[IMP]Improve a tooltip.
...
bzr revid: vba@tinyerp.com-20121023130242-pu2o7e9x7lpr7g36
2012-10-23 18:32:42 +05:30
1204262d46
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121023091417-5noy0gguxd12pduk
2012-10-23 14:44:17 +05:30
a53941b165
[FIX] Fixed CallbackEnabled issues in POS.
...
bzr revid: vta@openerp.com-20121023075035-wx3awh0sdeeqa7t3
2012-10-23 09:50:35 +02:00
4694363d62
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121023065055-uapr3ywmqngewjb2
2012-10-23 12:20:55 +05:30
ae95cab533
[FIX] point_of_sale: Add a context on launch_payment() method.
...
bzr revid: vba@tinyerp.com-20121023052715-78d4sykmrrpzult0
2012-10-23 10:57:15 +05:30
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
50e0b17662
[FIX] pos closing
...
bzr revid: al@openerp.com-20121022104529-9wq22t76fj6zqxu6
2012-10-22 12:45:29 +02:00
6696825b5e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121017070937-52t28h5twjkj5rlr
bzr revid: apa@tinyerp.com-20121019062157-qxy9gw1b5d9siipp
bzr revid: apa@tinyerp.com-20121022051523-v89anrokk46jxmqb
2012-10-22 10:45:23 +05:30
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
e5ea70b4c2
[FIX] point_of_sale: typo in report
...
bzr revid: qdp-launchpad@openerp.com-20121018135949-b08zihsoo7s0km05
2012-10-18 15:59:49 +02:00
f30d1585e5
[IMP]set pos company in statment create
...
bzr revid: sgo@tinyerp.com-20121018125506-lrdsyklk0oap2u5z
2012-10-18 18:25:06 +05:30
5469854d17
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121018081536-r0xfo12gttw0loab
2012-10-18 10:15:36 +02:00
df2750f9fd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121018044110-cqlg7hbfgy4m2bba
2012-10-18 04:41:10 +00:00
cbdb0ccf9c
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121017140509-67yq1gjzrs871hb6
2012-10-17 16:05:09 +02:00
56a478d1cc
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121016125359-p5g1zp3kuy1bv8k6
bzr revid: apa@tinyerp.com-20121017071028-sf28vvwcyvb6s76r
2012-10-17 12:40:28 +05:30
8a38ee944e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121017043613-kd7vkw5ixd4djrpm
2012-10-17 04:36:13 +00:00
fa206b6c42
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121015055335-jdu7jcul5wfq8ptp
bzr revid: apa@tinyerp.com-20121016090046-uo8i442o80kga8yw
2012-10-16 14:30:46 +05:30
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
7ef13b6e8f
[IMP][MERGE]remove list price and added price instead. merge with parent
...
bzr revid: sgo@tinyerp.com-20121015071901-a003w3ynul571eto
2012-10-15 12:49:01 +05:30
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
aca92d1c4c
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011055023-0huqe4kr4e6s3her
2012-10-11 11:20:23 +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
6f0d95e1db
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121009091112-deph5zzpnxcft9ct
2012-10-09 14:41:12 +05:30
8f8e6967d1
[IMP]pos product can not consider pricelist price it only consider list price of product. make it work on price of product of given pricelist
...
bzr revid: sgo@tinyerp.com-20121008125709-rxfptf69lyaj0p3a
2012-10-08 18:27:09 +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
5930fd069f
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20120904102700-8f94o2dvdt0f33bv
2012-09-04 15:57:00 +05:30
42ae38116a
[MERGE] point_of_sale: Improve the layout of the pos.session.opening wizard.
...
bzr revid: stw@openerp.com-20120904100711-rp4ca0u9hs0t7vm4
2012-09-04 12:07:11 +02:00
48c081f271
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
74e4fe0f53
[MERGE] USablity improvements: product form/kanban/search, membership, projects
...
bzr revid: fp@tinyerp.com-20120903175638-lq221k6yjyams8kn
2012-09-03 19:56:38 +02:00
d66519fda2
[FIX] point_of_sale: I should have tested this more
...
bzr revid: fva@openerp.com-20120903145958-c7i93lp8q8w8ilop
2012-09-03 16:59:58 +02:00
e0d5b6ac8b
[IMP] point_of_sale: fetch is now a method
...
bzr revid: fva@openerp.com-20120903144354-8563uwq7x0cvqvrp
2012-09-03 16:43:54 +02:00
f8212984f3
[IMP] point_of_sale: moved data loading to it's own method for easier extension dev
...
bzr revid: fva@openerp.com-20120903142527-iv0d97a0tzbjyo6o
2012-09-03 16:25:27 +02:00
b832115057
[FIX] point_of_sale: Return the state of the session in the wizard
...
bzr revid: stw@openerp.com-20120903134533-lqyay7rv7jkusde8
2012-09-03 15:45:33 +02:00
2c3b3a0bd1
[IMP] point_of_sale: adding a description field to the products
...
bzr revid: fva@openerp.com-20120903133239-hai1o87yrpxvbaic
2012-09-03 15:32:39 +02:00
d5459171bd
[FIX] point_of_sale: Show the Opening and Closing balance only if the session is closed
...
bzr revid: stw@openerp.com-20120903125740-xxl4x298imiyo0y9
2012-09-03 14:57:40 +02:00
6040787bb0
[FIX] point_of_sale: forgot to add the nohover css file
...
bzr revid: fva@openerp.com-20120903124838-gmn4wsjrbqnhbi9m
2012-09-03 14:48:38 +02:00
81115666a1
[IMP] point_of_sale: only sell products that can be sold ...
...
bzr revid: fva@openerp.com-20120903122649-etypfgvdjo3s8p0s
2012-09-03 14:26:49 +02:00
716651c27d
[IMP] point_of_sale: alternative css without hover effects for resistive screens
...
bzr revid: fva@openerp.com-20120903115954-t26j8qx54a6o9pta
2012-09-03 13:59:54 +02:00
f39f799897
Fix: Account configuration : removed currency group.
...
bzr revid: tta@openerp.com-20120903095908-tswt6gi2zl5w89s2
2012-09-03 15:29:08 +05:30
a77587e064
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120903094840-vd63m4i8vkqxjij2
2012-09-03 11:48:40 +02:00
6fa349a4eb
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
dfb82b2081
[MERGE] Merge from trunk.
...
bzr revid: jra@tinyerp.com-20120903065444-bcadcpsnadx0vhpx
2012-09-03 12:24:44 +05:30
e3f1c26e6a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
2012-09-03 05:21:17 +00:00
7ebf462e07
[IMP] product view
...
bzr revid: fp@tinyerp.com-20120831174746-7bfitkd45m73r6oz
2012-08-31 19:47:46 +02:00
4785fc109e
[FIX] Point of Sales Users Demo
...
bzr revid: cto@openerp.com-20120831170747-iyptvo6iy96d12w4
2012-08-31 19:07:47 +02:00
33897328bc
[IMP] product view
...
bzr revid: fp@tinyerp.com-20120831164018-b8m7xhxi2na5eraj
2012-08-31 18:40:18 +02:00
349c24a1cd
[IMP] usability
...
bzr revid: fp@tinyerp.com-20120831163517-vqatk8mzl7u2vuym
2012-08-31 18:35:17 +02:00
6eb0b6af71
fix
...
bzr revid: fp@tinyerp.com-20120831162831-qn2ai0258pki7fxp
2012-08-31 18:28:31 +02:00
9cfe5665a5
[DONE] point_of_sale: disable validation button when order not fully paid
...
bzr revid: fva@openerp.com-20120831145606-nrk44gs60lab4k3l
2012-08-31 16:56:06 +02:00
b3ec8d7647
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120831143222-j86sa4w0vuy24z7j
2012-08-31 16:32:22 +02:00
846ec67adc
[WIP] point_of_sale: disable validation button when order not fully paid
...
bzr revid: fva@openerp.com-20120831143159-a64527c3a1a8chk0
2012-08-31 16:31:59 +02:00
bf513b5919
[IMP] point_of_sale: Add a description when the session is in progress
...
bzr revid: stw@openerp.com-20120831102509-yv3bc68gii0sexfk
2012-08-31 12:25:09 +02:00
2e664de4f8
[IMP] Improved code to remove warning(server log) for deprecated type.
...
bzr revid: jra@tinyerp.com-20120831101659-voh9g3kwmhji2bf1
2012-08-31 15:46:59 +05:30
c14a11482c
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
1dce0b1dc4
[FIX] all mail dependencies: replace message_post call by normal record + review misc wording
...
bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
2012-08-30 16:18:52 +02:00
54237bc2a2
[MERGE] point_of_sale: Add some improvements and bug fixes
...
bzr revid: stw@openerp.com-20120830132642-o9ish51w0s7aigzn
2012-08-30 15:26:42 +02:00
7d120eb1d1
[FIX] point_of_sale: Set the right balance end for a bank statement
...
[FIX] point_of_sale: Show/Hide some tabs
bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
2012-08-29 17:46:34 +02:00
93395ac1ec
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120829125759-mjulntnmsyjzs0xq
2012-08-29 14:57:59 +02:00
1eedcaedad
[IMP] point_of_sale: TODO changes
...
bzr revid: fva@openerp.com-20120829125640-5bml13zupja3w30b
2012-08-29 14:56:40 +02:00
6aded504b3
[FIX] point_of_sale: redefine the copy function for the pos.config to avoid a copy of the sequence.
...
[IMP] point_of_sale: Associate a default category for the existing products.
bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
2012-08-29 14:25:01 +02:00
0e14e8dc20
[MERGE]Merged with latest trunk
...
bzr revid: dhr@tinyerp.com-20120829102402-3sdf5i8rfgq9dxca
2012-08-29 15:54:02 +05:30
d3bb4f5ae5
merge
...
bzr revid: fp@tinyerp.com-20120829094828-b8pxz76tfnigfffw
2012-08-29 11:48:28 +02:00
4b614305d4
[IMP] add context on the call of the method refund
...
bzr revid: benoit.guillot@akretion.com.br-20120829084032-9ow83wx3kcmrvep7
2012-08-29 10:40:32 +02:00
8b910c1f1d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
6086951935
[MERGE]Merged with trunk
...
bzr revid: dhr@tinyerp.com-20120829061429-yko2f9xgqsyynvig
2012-08-29 11:44:29 +05:30
768d9cdb7e
[IMP] account: Merge the opening_control and closing_control flags in cash_control
...
[IMP] account: In the case where the bank statement is a cash register, we can get the coins of the last register.
[IMP] account: Hide the 'Available Coins' if the journal hasn't the cash_control flag.
[FIX] account: Use some default values for the profit/loss and internal account.
[IMP] point_of_sale: Avoid to have two payment methods with the cash_control in a pos.config object.
[REF] point_of_sale: Refactor the computation code of the cash_journal, cash_register and cash_control flags.
[IMP] point_of_sale: Store the difference in the right account if the journal of the statement is a cash_control or nota.
[FIX] point_of_sale: Use the session name instead of the order name for the account.bank.statement.line .
[IMP] point_of_sale: [DEMO] Define the default payment_methods for the pos.config.
bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
2012-08-28 13:21:16 +02:00
3733972565
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120828092928-da2a6k1f2e7g9i42
2012-08-28 14:59:28 +05:30
4e31d1be93
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
c2a8adb976
[IMP]pos,product(pricelist) and hr_expense_report : applying multi_currency group to currency field
...
bzr revid: dhr@tinyerp.com-20120828070841-l318wc2b4jkm99dz
2012-08-28 12:38:41 +05:30
4b0d1be1c0
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
65f532e001
[IMP] made a whole-application replace of $element by $el
...
bzr revid: nicolas.vanhoren@openerp.com-20120824182743-1d9cii7kigc7exer
2012-08-24 20:27:43 +02:00
45cf233538
[FIX] point_of_sale: Hide the has_XXX_control fields in the session
...
bzr revid: stw@openerp.com-20120824130730-8dqrjjqr7z1stwl5
2012-08-24 15:07:30 +02:00
ec6bd9c649
[FIX] point_of_sale: Review the buttons for the pos.session object
...
bzr revid: stw@openerp.com-20120824114300-jdax2175w9mbcb2n
2012-08-24 13:43:00 +02:00
de6d26886a
[IMP] Remove type field from ir.ui.view model.
...
bzr revid: bth@tinyerp.com-20120823125311-nx4x46ea3g2ercl8
2012-08-23 18:23:11 +05:30
00139302a7
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120823072017-c48q59mif39j55wm
2012-08-23 12:50:17 +05:30
39ac8404ff
[IMP]Tax fix related to stock and pos
...
bzr revid: dhr@tinyerp.com-20120823071044-aonyui4dq2li8xnj
2012-08-23 12:40:44 +05:30
73025425f0
[IMP]Tax related changes in mrp and pos
...
bzr revid: dhr@tinyerp.com-20120823051120-en7wvauuwgop2w26
2012-08-23 10:41:20 +05:30
121b351b59
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
a0679e6e4f
[MERGE] demo data branch
...
bzr revid: qdp-launchpad@openerp.com-20120822160856-k308a270wx2wnsj6
2012-08-22 18:08:56 +02:00
e30fed20b8
merge_trunk
...
bzr revid: fp@tinyerp.com-20120822133742-yx81c62bux28wruy
2012-08-22 15:37:42 +02:00
1dd5177e11
[IMP]
...
bzr revid: dhr@tinyerp.com-20120822133428-24wti3kz7lh469jh
2012-08-22 19:04:28 +05:30
095843797c
[IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
...
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
197e673100
[IMP] point_of_sale: improve the layout of 'your session'
...
bzr revid: stw@openerp.com-20120821150612-4ikdil8vzmkc0wwz
2012-08-21 17:06:12 +02:00
3ecb0798a3
[IMP]Fixing inherit id issues related to procurement and location changes
...
bzr revid: dhr@tinyerp.com-20120821124241-mibvnmuxby5xuzsv
2012-08-21 18:12:41 +05:30
0d930ba843
[MERGE] from stw
...
bzr revid: fva@openerp.com-20120821121123-ingbtoedurmt6h48
2012-08-21 14:11:23 +02:00
2e4d656dcb
[IMP] point_of_sale: removed useless settings, Wubbit Twarks
...
bzr revid: fva@openerp.com-20120821104814-wuxk1qptj7xqr1i9
2012-08-21 12:48:14 +02:00
23de15d82b
[IMP] point_of_sale: simpler way to load models
...
bzr revid: fva@openerp.com-20120821100452-zop43cmqyxq0del0
2012-08-21 12:04:52 +02:00
bc1f8e6d4b
[IMP] point_of_sale: improve the layout of the pos.order
...
bzr revid: stw@openerp.com-20120821084857-4ieoknwcsivdooa1
2012-08-21 10:48:57 +02:00
28c036aef0
[FIX] point_of_sale: A manager can create a ir.sequence for the pos.config
...
bzr revid: stw@openerp.com-20120821083828-as5sqvatvvseaj9d
2012-08-21 10:38:28 +02:00
c803243a38
[FIX] point_of_sale: remove an useless test
...
bzr revid: stw@openerp.com-20120821082356-dr4vdka5u796ho9w
2012-08-21 10:23:56 +02:00
ca93a52e64
[FIX] point_of_sale: fix a report
...
bzr revid: stw@openerp.com-20120821082343-mu1p8231c4wa0kjm
2012-08-21 10:23:43 +02:00
b3cecb2162
[IMP] point_of_sale: renamed the js files
...
bzr revid: fva@openerp.com-20120821075434-dy4oqwuok39i4eyj
2012-08-21 09:54:34 +02:00
8d052c96bc
[FIX] point_of_sale: added contact_address to print info, empty order styling
...
bzr revid: fva@openerp.com-20120820135957-o5exttxak611e624
2012-08-20 15:59:57 +02:00
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
c447533f7d
[FIX] point_of_sale: fix css for receipt printing
...
bzr revid: fva@openerp.com-20120820124007-fg36abyblxpboiyi
2012-08-20 14:40:07 +02:00
b29c4a6113
[IMP] point_of_sale: improved receipt screen
...
bzr revid: fva@openerp.com-20120820102401-t5zkmh2hoamba719
2012-08-20 12:24:01 +02:00
d0f762ab1f
[IMP] point_of_sale: more todos
...
bzr revid: fva@openerp.com-20120820093010-a2ymlgaa6z5ku53o
2012-08-20 11:30:10 +02:00
185c82348c
[IMP] point_of_sale: todos
...
bzr revid: fva@openerp.com-20120820071327-wfbd7g5wbh5zrnaa
2012-08-20 09:13:27 +02:00
69578a30c2
[MERGE] from stw
...
bzr revid: fva@openerp.com-20120817154315-yj19b39s2693apze
2012-08-17 17:43:15 +02:00
da93d8b440
[IMP] point_of_sale: all images are app-cached now
...
bzr revid: fva@openerp.com-20120817154248-z86i0a838wd9ul92
2012-08-17 17:42:48 +02:00
62ffc54bf2
[MERGE] improve the point of sale
...
bzr revid: stw@openerp.com-20120817151933-ztflsr992l8ixze8
2012-08-17 17:19:33 +02:00
890371d982
[IMP] point_of_sale: fix some typo
...
[FIX] point_of_sale: add some groups
bzr revid: stw@openerp.com-20120817151529-1kkm9m5g5ob291ur
2012-08-17 17:15:29 +02:00
4230baf35a
[FIX] point_of_sale: set the 'False' value to opening_control and closing_control
...
bzr revid: stw@openerp.com-20120817143134-v9vjzvgh5kddeduc
2012-08-17 16:31:34 +02:00
211a9d0904
[FIX] point_of_sale: Typo
...
bzr revid: stw@openerp.com-20120817142838-rc2zu2xa57xoty7f
2012-08-17 16:28:38 +02:00
e47792d9bf
[IMP] point_of_sale: category pictures are back and cached
...
bzr revid: fva@openerp.com-20120817142415-3k9cdc1mc68n8shk
2012-08-17 16:24:15 +02:00
6ac583c0f7
[IMP] mail cleaning
...
bzr revid: fp@tinyerp.com-20120817111936-2d33nlqlbvkjb374
2012-08-17 13:19:36 +02:00
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
66ece041f0
[IMP] append note
...
bzr revid: fp@tinyerp.com-20120817102650-1sglq1y2dbb3xqju
2012-08-17 12:26:50 +02:00
adc76215ef
[FIX] point_of_sale: connection is now session. Removed console.log
...
bzr revid: fva@openerp.com-20120816163251-6nds8dmlcz8mz30v
2012-08-16 18:32:51 +02:00
36b8744644
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
715e52130f
[IMP] point_of_sale: removed websql option from backend
...
bzr revid: fva@openerp.com-20120816160455-25gz0qb7kh0t3nfs
2012-08-16 18:04:55 +02:00
15261610fb
[IMP] point_of_sale: removed websql option from client
...
bzr revid: fva@openerp.com-20120816160120-v27xcczg3be31pnz
2012-08-16 18:01:20 +02:00
b3bcd4eabc
[FIX] point_of_sale: fixed some bugs with the scanner
...
bzr revid: fva@openerp.com-20120816155801-oexzurmsgfiv2xt9
2012-08-16 17:58:01 +02:00
daba4e4fc2
[IMP] point_of_sale: ImageCache and RegExp search
...
bzr revid: fva@openerp.com-20120816150213-mdctwsjxiyjh4lxi
2012-08-16 17:02:13 +02:00
7a24bdb1f7
[FIX]: Improved old product names with new
...
bzr revid: rpa@tinyerp.com-20120816084224-t12wf5vipd8u90a7
2012-08-16 14:12:24 +05:30
f35c0b3d44
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120814161000-41ai95ixagtqteok
2012-08-14 21:40:00 +05:30
0e31e74b40
[FIX] point_of_sale: forgot to remove a ref to the DAO
...
bzr revid: fva@openerp.com-20120814153905-zlxpitgrhizt68zt
2012-08-14 17:39:05 +02:00
c5dc5cef00
[IMP] sed -i '' -e 's/connection/session/g'
...
bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
2012-08-14 17:30:53 +02:00
5a3dc89e7c
[IMP] point_of_sale: DAO removed, db used for orders instead. Don't stop sending orders on single failure
...
bzr revid: fva@openerp.com-20120814152112-vmitvbajx3r2mdeh
2012-08-14 17:21:12 +02:00
2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
36ea689ad9
[MERGE] html5 amnifest
...
bzr revid: fva@openerp.com-20120814120052-s9avcsbsxl06zewr
2012-08-14 14:00:52 +02:00
7559c2e771
[WIP] point_of_sale: moving DAO to db
...
bzr revid: fva@openerp.com-20120814115630-23cv9s71zh79xcve
2012-08-14 13:56:30 +02:00
652300eb89
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120814061700-k4swskeiz9r3ypn5
2012-08-14 11:47:00 +05:30
643b6cfc36
[FIX] image urls and NETWORK section
...
bzr revid: al@openerp.com-20120813223032-t6nouzthq43xr841
2012-08-14 00:30:32 +02:00
8d97d9830d
[FIX] remove unused or duplicate files
...
bzr revid: al@openerp.com-20120813221645-s8n8du7fy2sqhl0g
2012-08-14 00:16:45 +02:00
8627aa0b28
[IMP] point_of_sale add html5 manifest on /pos/app
...
bzr revid: al@openerp.com-20120813221601-gfvwiwii6s1b785d
2012-08-14 00:16:01 +02:00
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
48062d4cf1
[IMP] point_of_sale: removed IndexeDB and asynchronous backend
...
bzr revid: fva@openerp.com-20120813160026-04w28p3pojzvdlkj
2012-08-13 18:00:26 +02:00
b6c254942a
[FIX] point_of_sale: images are working now
...
bzr revid: fva@openerp.com-20120813144355-vgojt7llli8u9vye
2012-08-13 16:43:55 +02:00
01cb3ebb99
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
4c3e048d40
[MERGE WIP] merging from trunk. Still some issues with the thumbnails
...
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
98e591c2a7
[IMP]: point_of_sale: Improved remaining product name translation
...
bzr revid: rpa@tinyerp.com-20120813071720-kcsjouksbz4v0act
2012-08-13 12:47:20 +05:30
7a1a9460d9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120813051748-klau4w0nig2apfxb
2012-08-13 10:47:48 +05:30
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
9bc2064028
[FIX] PoS import order from UI, return money
...
bzr revid: fp@openerp.com-20120811143309-pd44zfw6l67j7x7l
2012-08-11 16:33:09 +02:00
c17b2443e7
[IMP] improved UI for PoS - mainly forms version=7.0
...
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
72fdeea2d8
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120810153957-asszi74t9dxrzhx7
2012-08-10 17:39:57 +02:00
1f32ebdc7c
[FIX] pos: Fix runbot breakage: use new XML id for unreference_product + move to pos_data file
...
bzr revid: odo@openerp.com-20120810151204-t6c0wmiusf9un7gq
2012-08-10 17:12:04 +02:00
8759e49b83
[FIX] point_of_sale: reverting changes on the pos's views
...
bzr revid: fva@openerp.com-20120810141930-3xkh9ny0splzrs75
2012-08-10 16:19:30 +02:00
f2fd44d85b
[MERGE] latust trunk
...
bzr revid: abo@openerp.com-20120810140856-xl6sj3xu9t4bee6c
2012-08-10 16:08:56 +02:00
760939d83f
[IMP] point_of_sale: IndexedDB: the LocalStorage DB is working now
...
bzr revid: fva@openerp.com-20120810135832-7xb3yq0r1p829nv1
2012-08-10 15:58:32 +02:00
01dc1b218b
[IMP] help menutips for PoS
...
bzr revid: fp@tinyerp.com-20120810135548-w2cgv11ynu6l8n5l
2012-08-10 15:55:48 +02:00
cf57a87d41
[IMP] point of sale backend, useability improvements
...
bzr revid: fp@tinyerp.com-20120810134517-tenqseu6otf0rdin
2012-08-10 15:45:17 +02:00
9dd3e6476f
[IMP] PoS backend
...
bzr revid: fp@tinyerp.com-20120809212311-q2b86eww9ppvdv8s
2012-08-09 23:23:11 +02:00
78d8b5d394
[WIP] point_of_sale: indexeddb : products and categories are no longer in memory
...
bzr revid: fva@openerp.com-20120809195555-oluxe7xe8k2ugcoi
2012-08-09 21:55:55 +02:00
03b79a9832
[WIP] point_of_sale: much progress on the indexeddb backend
...
bzr revid: fva@openerp.com-20120809172113-ex3o5vyt4ckv4au6
2012-08-09 19:21:13 +02:00
1674c9add5
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120809165534-89dhvj3pi1obnn8q
2012-08-09 22:25:34 +05:30
ee4fd16e94
[FIX] remove the option from the user_id fields
...
we want users to be openable !
also improve indentation and remove some useless whitespaces
bzr revid: abo@openerp.com-20120809163529-8adlpszt3n6lhszi
2012-08-09 18:35:29 +02:00
24f6e09c45
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120809143919-qrn9nm5ut5vlm8hw
2012-08-09 16:39:19 +02:00
7739d0d69b
[IMP]: point_of_sale: Translated PoS product names in English
...
bzr revid: rpa@tinyerp.com-20120809125412-is3y1fpjyo01c5b1
2012-08-09 18:24:12 +05:30
c6d01a7754
[IMP]: point_of_sale: Translated PoS category name in English and added images for all categories
...
bzr revid: rpa@tinyerp.com-20120809125325-vt5cew4b6mgpjtga
2012-08-09 18:23:25 +05:30
46cbde1ec9
[IMP]Remove type field from the modules
...
bzr revid: tch@tinyerp.com-20120809071034-vvqp0m3yp25pij7g
2012-08-09 12:40:34 +05:30
8df3f3477b
[IMP]Remove type field from the modules
...
bzr revid: tch@tinyerp.com-20120809065633-9zivhonm3pt82rxu
2012-08-09 12:26:33 +05:30
fc1b1749a8
[IMP]Remove type field from the modules
...
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
3fd9a77c83
[REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
...
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.
bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
ff612f9d02
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120808094005-o7v0l6u15ide75za
2012-08-08 15:10:05 +05:30
4388ace499
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
2012-08-08 11:10:48 +02:00
d597437dd7
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
dc8f543d17
[WIP] point_of_sale: indexeddb : compatible localstorage backend. + anthony's modifications to the views...
...
bzr revid: fva@openerp.com-20120807161844-hd7ioxipnc6794jf
2012-08-07 18:18:44 +02:00
a97687a420
[MERGE] latest trunk
...
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'
bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
8a64e7580a
[IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
...
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
023262e519
[IMP] product, hr, point of sale, mail_group: propagated function name change (now prefixed with image_) in image module.
...
bzr revid: tde@openerp.com-20120807111039-57cykhxurm2wj79k
2012-08-07 13:10:39 +02:00
6c4dda8441
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120807100920-mr0oc56qs2zntvu1
2012-08-07 12:09:20 +02:00
3cfd65b43d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
c8c95d46f9
[IMP] product, hr, pos, mail_group: removed the onchange_image, updated used images and classes in views.
...
bzr revid: tde@openerp.com-20120806155354-sjkrmrffgb2ik4ba
2012-08-06 17:53:54 +02:00
996183acf7
[WIP] point_of_sale: indexedDB backend
...
bzr revid: fva@openerp.com-20120806154054-1yubgy8o8wwlc5b8
2012-08-06 17:40:54 +02:00
a814343ab7
[MERGE] Mergede with addons/trunk.
...
bzr revid: tde@openerp.com-20120806124445-hym9imdiqgeot8fu
2012-08-06 14:44:45 +02:00
7c51b1811d
[FIX]all :set a no_open widget in this filed(country_id,state_id,title,context_id,timebox_id,user_id)
...
bzr revid: mma@tinyerp.com-20120806110307-nj7qipixr14puhub
2012-08-06 16:33:07 +05:30
389f8d6803
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
b7daa1fb31
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
2012-08-06 10:39:52 +05:30
0869066f99
[IMP] improved modules message at installation --> to be reviewed later
...
bzr revid: fp@openerp.com-20120805201322-y8ghspcb69wmb3ut
2012-08-05 22:13:22 +02:00
7904580e60
[IMwP] open the right menu according to the installed application
...
bzr revid: fp@openerp.com-20120804215327-651jy6mn1w15x430
2012-08-04 23:53:27 +02:00
Fabien Pinckaers
vta vta@openerp.com
Sanjay Gohel (Open ERP)
Fabien Meghazi
Amit Patel
Fabien Pinckaers
Stephane Wirtel
Vijaykumar Baladaniya
Quentin (OpenERP)
Antony Lesuisse
Mayur Maheshwari (OpenERP)
Frédéric van der Essen
Vishmita
Foram Katharotiya (OpenERP)
Atul Patel (OpenERP)
ggh-openerp
Randhir Mayatra (OpenERP)
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
Jiten (OpenERP)
Tejas Tank
Cecile Tonglet
Dharti Ratani (OpenERP)
Benoit Guillot
Bhumi Thakkar (Open ERP)
Hardik
Christophe Simonis
Vo Minh Thu
Twinkle Christian (OpenERP)
pso (OpenERP)