6f1b820d33
[REF] OpenERP --> Odoo in various UI texts (2)
...
Some things missed by commit 8b67a7202d
2014-07-18 14:59:38 +02:00
8b67a7202d
[REF] OpenERP --> Odoo in various UI texts
...
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages
(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)
Closes #1260
2014-07-18 13:45:41 +02:00
33eb3dffb2
[REM] models: remove the magic methods signal_XXX()
2014-07-07 11:50:30 +02:00
cbe2dbb672
[MERGE] new v8 api by rco
...
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
5d0ee85ac5
[FIX] The documentation stored in /dev/null states t-css|t-js
2014-07-02 15:45:28 +02:00
9007aeb5a6
[FIX] point_of_sale: typo in the template field blocked the point of sale launch
2014-07-02 15:04:18 +02:00
4e513fc81e
[IMP] point_of_sale: load assets with templating sytem so that scripts are not minified in debug mode
2014-07-02 15:01:55 +02:00
cab5fdf4f3
[FIX] point_of_sale: finally made the webclient instanciate the pos
2014-07-01 16:47:37 +02:00
1703af0f4a
[WIP] point_of_sale: trying to make the web client instanciation work
2014-07-01 16:14:58 +02:00
25e4a10878
[FIX] point_of_sale: the webclient needs a html stub to instanciate itself
2014-07-01 15:15:19 +02:00
371ba83206
[FIX] point_of_sale: do not use local jquery replace inside widget
2014-07-01 15:01:28 +02:00
7842b62880
[MERGE] from master
2014-07-01 13:32:28 +02:00
c4049bc356
[WIP] removing incomplete fidelity points feature for the v8.0 release
2014-07-01 13:02:02 +02:00
10ce35040b
[FIX] point of sale and barcode interface 'mini webclien' initialisation
2014-06-27 17:18:26 +02:00
6db8bf3def
Merge pull request #326 from hmen89/master
...
[ADD] point_of_sale: make the creation of orders and payment inheritable in create_from_ui method
2014-06-27 11:55:24 +02:00
8cabd5eac9
merge upstream
2014-06-25 19:08:49 +02:00
026e38b48f
[REM] Unnecessary `size` parameters on char fields
2014-06-25 17:13:43 +02:00
6284fbbbf0
[ADD] FIXED create_from_ui inheritable to add more fields on order and payment
2014-06-23 17:06:55 -04:00
96f038a6ab
[IMP] product: all left menu item became product.template's action
2014-06-16 17:16:50 +02:00
49d7b107d1
Pull request feedback by chs
2014-06-13 17:27:59 +02:00
b021330f0e
[MERGE] Bzr branch lp:~openerp-usertesting/openobject-addons/trunk-restaurant-wip-fva
2014-06-13 16:19:05 +02:00
74168c4e9d
Merge pull request #272 from odoo-dev/master-inline-searchview-ged
...
[MERGP] Inline Searchview
This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place. It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)
Because of this, other large changes have been made:
the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)
It is likely that some stupid bugs have been introduced. Please don't hurt me.
2014-06-12 16:27:11 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
af58bc5914
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-11 10:10:58 +02:00
ccdae747a0
[MERGE] forward port of branch saas-5 up to a7c2125
2014-06-10 13:19:55 +02:00
a7c2125735
[MERGE] forward port of branch saas-4 up to 6b8e972
2014-06-10 13:15:46 +02:00
6b8e9727e5
[MERGE] forward port of branch saas-3 up to 4601d85
2014-06-10 12:29:47 +02:00
4601d85944
[MERGE] forward port of branch 7.0 up to 6fdb783
2014-06-10 11:49:14 +02:00
8202561511
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-10 11:43:17 +02:00
25292ef0a5
[FIX] point_of_sale: correct call to default value
...
The default value should be called with a lambda otherwise the payment_date is set to the date the server was started (opw 606715)
2014-06-04 15:19:57 +02:00
36cdac48b7
[IMP] product: move product packaging field from product.product to product.template
2014-06-03 11:53:41 +02:00
e3491ccb71
[IMP] account: bank statement reconciliation widget (part 2)
2014-05-30 18:47:50 +02:00
514203743d
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
...
Conflicts:
addons/mrp/mrp_view.xml
2014-05-30 10:29:30 +02:00
138274e30d
[FIX] point_of_sale: fix product view layout
2014-05-28 20:50:20 +02:00
6e6b5ea15b
[FIX] point_of_sale: public category became pos category
2014-05-27 10:36:08 +02:00
43977deb71
[IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison.
2014-05-27 09:42:52 +02:00
62900fe01b
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
...
Conflicts:
addons/crm/crm_case_section_view.xml
2014-05-26 10:06:31 +02:00
5d8927e2b1
[FIX] Issues #167 . Remove obsolete shop reference
2014-05-22 22:55:50 +02:00
2af03e1b6e
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
2014-05-22 16:44:33 +02:00
02035b27b8
[RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs
2014-05-22 14:07:15 +02:00
555677f14d
[IMP] replace all 'Group By...' by 'Group By'
...
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters. This change was requested by the upper management
2014-05-22 11:44:35 +02:00
593cdf427f
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
2014-05-21 10:29:04 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
bb26dea60b
[MERGE] forward port of branch saas-3 up to revid 38abc8a
2014-05-20 19:00:50 +02:00
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00
44dca825e0
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10056 revid:dle@openerp.com-20140519133339-uxb01aik1z8wu1sy
2014-05-19 15:36:48 +02:00
a8a085eabb
[FIX] point_of_sale: opw-607551, mark the pos order as paid before trying to create the picking, so in case the picking could not be created for one reason or another, the pos order workflow process continue.
...
This commit partially reverts rev. 6036 revid:fp@tinyerp.com-20111219220053-tn5gc1lmc13fjpyf, the second part of this commit already has been revert in a previous revision.
2014-05-19 15:33:39 +02:00
cab190b136
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9460 revid:dle@openerp.com-20140519103942-do7uem4in0jfqzo2
2014-05-19 12:46:33 +02:00
87a8e5dc9c
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10054 revid:dle@openerp.com-20140519103020-bcqz4rssbqsvn9m7
2014-05-19 12:39:42 +02:00
7f0a167cf7
[REVERT] revid:jke@openerp.com-20140507120144-m177kqxa3fbfl37r: create_picking checks if the order is in state draft before doing anything. Writing the state 'paid' just before calling this method is then not a good idea
2014-05-18 13:25:23 +02:00
0fb14cbe0a
[FIX] point_of_sale: add product variant in the displayed name (opw 607456)
2014-05-16 14:06:17 +02:00
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
168b8e1d5e
[REM] removed old conflicting files badly merged (?)
...
bzr revid: qdp-launchpad@openerp.com-20140508143825-owheu6q219d8qbww
2014-05-08 16:38:25 +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
8dc5f240a9
[REM] Removed addons.web#html_template usage
...
bzr revid: fme@openerp.com-20140506163334-x94pz9bau4a0r0lb
2014-05-06 18:33:34 +02:00
830a4af3e5
[IMP] Picking type instead of warehouse in PoS
...
bzr revid: jco@openerp.com-20140502145852-th5tc9tsdwm9l9z8
2014-05-02 16:58:52 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
8474a2ed6f
[MERGE] Web assets moved from manifests to ir.ui.view bundles
...
bzr revid: fme@openerp.com-20140430151509-mme5st89o1hj4zcs
2014-04-30 17:15:09 +02:00
ef85e3de80
[FIX] point of sale loading
...
bzr revid: fme@openerp.com-20140430121632-llnwhirjl3ii6m93
2014-04-30 14:16:32 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
80f68fe4bb
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140429124215-92f645c16v9j1dyi
2014-04-29 14:42:15 +02:00
0d2a0e8109
[FIX] point of sale: payment report bad behaviour when printing multiple documents
...
bzr revid: sle@openerp.com-20140429122400-s2ey704e8qfifzzj
2014-04-29 14:24:00 +02:00
ba6e63d690
[IMP] point of sale: better check before printing a potential invoice from a pos order
...
bzr revid: sle@openerp.com-20140429121329-lxgwpbuccdy67r4v
2014-04-29 14:13:29 +02:00
8db594758e
[REM] point_of_sale: removed closed cashbox report that is nearly the session resume report
...
bzr revid: sle@openerp.com-20140429114045-kaj86qq00dovj75o
2014-04-29 13:40:45 +02:00
58233749ef
[FIX] point of sale session summary report: better display, divide the tables
...
bzr revid: sle@openerp.com-20140429100738-t5tvsucuu7ss42v8
2014-04-29 12:07:38 +02:00
003b3fd41e
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140428162055-9t72vke2kdkhqcwr
2014-04-28 18:20:55 +02:00
0d6ea88e57
[FIX] pos test reports: typo
...
bzr revid: sle@openerp.com-20140428162032-9s1s0wwxkboqeo2z
2014-04-28 18:20:32 +02:00
10046d854c
[IMP] point_of_sale: use the product unit's precision for rounding the weight
...
bzr revid: fva@openerp.com-20140428153326-klgddc93ud9t0uqr
2014-04-28 17:33:26 +02:00
f210babfc6
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140425122510-y60j039e3khbwwd5
2014-04-25 14:25:10 +02:00
3f0a8e8931
[IMP] point_of_sale, hw_scale: various small fixes and improvements for the scale module
...
bzr revid: fva@openerp.com-20140425122220-q7rw1dve8bgs25as
2014-04-25 14:22:20 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
f3da22c067
[IMP] point_of_sale, hw_scale: first commit for the hw_scale module, which handles scale connections for the POS
...
bzr revid: fva@openerp.com-20140424171259-hi9ma6w0fkdfrqnv
2014-04-24 19:12:59 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
b667f6a292
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140422124030-gowf9zyx1d36j01g
bzr revid: sle@openerp.com-20140424124655-95ex30m25soiu4wd
2014-04-24 14:46:55 +02:00
36b0c079c9
[REF] point_of_sale: removing commented line
...
bzr revid: qdp-launchpad@openerp.com-20140422121639-eho65ncckm2h279s
2014-04-22 14:16:39 +02:00
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
e3ecf7f4d4
[FIX] en_US typos - opw 606919
...
bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
2014-04-22 10:58:37 +02:00
89fd1bede4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
2014-04-22 08:24:59 +00:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
9f6182b311
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140417150308-xuhxfxb8d45j3yfq
2014-04-17 17:03:08 +02:00
d86cc2063e
[FIX]tooltip: remove old and not necessary tooltip line from pos start widget
...
bzr revid: csn@openerp.com-20140417122946-n8pq7ln66yg0n49m
2014-04-17 14:29:46 +02:00
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
e0d45c418a
[IMP] improves the put money in/take money out stat button in point of sale form views
...
bzr revid: ged@openerp.com-20140415115349-360ydoz85069bgyb
2014-04-15 13:53:49 +02:00
28fa8ebb8c
[IMP] point of sale: added a session summary report
...
bzr revid: sle@openerp.com-20140414144427-ry3yxybx385a4pop
2014-04-14 16:44:27 +02:00
11a0b506d0
[FIX] bad condition on report_payment qweb view resulting in empty report
...
bzr revid: sle@openerp.com-20140414125522-v4obm4xreljizqje
2014-04-14 14:55:22 +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
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +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
ff4726ea7d
[MERGE] merged trunk up to revision 9281
...
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
16ce262c33
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00: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
7a3da62754
[FIX] point_of_sale: removed old reference to warehouse_id in rml file + removed unused pos_return wizard
...
bzr revid: qdp-launchpad@openerp.com-20140401124712-uz97vqfuyi8kn1un
2014-04-01 14:47:12 +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
4745099706
[FIX] hw_escops, point_of_sale: backporting fixes from the pos-restaurant branch
...
bzr revid: fva@openerp.com-20140328134401-ao85rr8b29nqg626
2014-03-28 14:44:01 +01:00
77ff3a69b8
[IMP] improve icons and views
...
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
457a62dee6
[IMP] add stat button for point of sale, email template
...
bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
2014-03-27 17:07:20 +05:30
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
a73211f83f
[MERGE] merged trunk up to revision 9255
...
bzr revid: qdp-launchpad@openerp.com-20140326154304-2yxzrmkzimzyam3p
2014-03-26 16:43:04 +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
2378decc04
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140326103307-lchlskkdweospgps
2014-03-26 11:33:07 +01:00
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
4d2eb14146
[IMP] The main pos config should use a standard picking type
...
bzr revid: jco@openerp.com-20140324160311-aj4zh1y9etbeszfp
2014-03-24 17:03:11 +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
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38: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
6472e4155a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
2014-03-23 06:44:12 +00: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
0e4cfe0add
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9157 revid:dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
...
bzr revid: chs@openerp.com-20140320134212-9nbuc7uqla4uiyf7
bzr revid: dle@openerp.com-20140320112958-slajf0ho0jtl7u60
bzr revid: dle@openerp.com-20140320161349-olyte7xt35nfj3dg
bzr revid: dle@openerp.com-20140320181737-68q9xh9jhfjynjip
2014-03-20 19:17:37 +01:00
a4afb910e9
[IMP] hw_escpos / point_of_sale: print receipt with an xml template
...
bzr revid: fva@openerp.com-20140320164530-odpeuf1igh7wkrms
2014-03-20 17:45:30 +01:00
84eeb79875
[FIX] point_of_sale: add multi-companies rules on pos.config
...
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
2014-03-20 16:44:36 +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
da210e4b5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
d6b93c8b24
[FIX] point_of_sale: use correct method to redirect to login page
...
bzr revid: chs@openerp.com-20140310153838-svwzew0vuk0khlxz
2014-03-10 16:38:38 +01:00
b201dc79b7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00: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
3d4f063e51
[FIX] point_of_sale: accept ean13 barcodes with a stripped leading zero
...
bzr revid: fva@openerp.com-20140224160118-44bnm5kxs53n6siy
2014-02-24 17:01:18 +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
95f2c5537d
[IMP] point_of_sale: make the order flush timeout dependant on the number of orders to be flushed
...
bzr revid: fva@openerp.com-20140224144143-4fhlswjk2y4skd6j
2014-02-24 15:41:43 +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
3ea931c486
[IMP] save all orders at once (client)
...
bzr revid: ddm@openerp.com-20140214144930-5zpn3miys1hwrdoa
2014-02-14 15:49:30 +01:00
1277c16dd7
[MERGE] Merge from trunk
...
bzr revid: jco@openerp.com-20140214100157-1vbjgifkouh0h4ix
2014-02-14 11:01:57 +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
64ead8b005
[FIX] point_of_sale: sales summary report displays actual amount of taxes, instead of displaying the amount where the taxe is applied
...
bzr revid: dle@openerp.com-20140212121408-4tv8ca1ukqempx1k
2014-02-12 13:14:08 +01:00
b6e708c1be
[FIX]point_of_sale: Mode of payment displayed browse_record object instead of the name of the method payment
...
bzr revid: dle@openerp.com-20140212113004-d9eammlp5gtm2m2v
2014-02-12 12:30:04 +01:00
bcc6a6aeda
[IMP] point_of_sale: allow negative product quantities, and negatives totals
...
bzr revid: fva@openerp.com-20140211164541-nt2xu5rhdv0tm7pk
2014-02-11 17:45:41 +01:00
9b249181e3
[MERGE]merge with latest trunk
...
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
2014-02-10 17:15:56 +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
04a6074b1a
[MERGE] forward porting fixes from saas-3
...
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
2014-02-10 16:56:28 +01:00
356010c357
[FIX] point_of_sale: totals were not rendrered on firefox due to use of nonstandard innerText dom property
...
bzr revid: fva@openerp.com-20140207161647-rgeymwt4ksei2cod
2014-02-07 17:16:47 +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
008e3c1ab0
[FIX] point_of_sale: receipt header & footer could overflow outside of ticket
...
bzr revid: fva@openerp.com-20140206143648-z1bsknelzznf0jqj
2014-02-06 15:36:48 +01:00
ec4dd7389b
[IMP] point_of_sale: try harder to connect to proxy when the ip is already known
...
bzr revid: fva@openerp.com-20140206140645-uo82x3tf60wlhytj
2014-02-06 15:06:45 +01:00
1e4d99eede
[MERGE] backport trunk revisions
...
* 9094 fva@openerp.com-20140203144847-21cv7pt7lnlxdsve
* 9095 fva@openerp.com-20140203153233-zj12w2o1uxyz5hoq
bzr revid: chs@openerp.com-20140206132039-y1whtc8qqqs8ey92
2014-02-06 14:20:39 +01:00
ffabcd257c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
2bebb9cd4d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00:00
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
73569da5e8
[IMP] point_of_sale: open cashbox on payment validation and not on payment method selection
...
bzr revid: fva@openerp.com-20140203153102-kfdaoaoo50mbudpk
2014-02-03 16:31:02 +01:00
4208281471
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201060213-5gub5wavdno2vcu4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202053135-qolj2vd2n4tjwbp3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203051828-wflc11kw2q8wc0aq
2014-02-03 05:18:28 +00:00
8342a7c51d
[FIX] point_of_sale: update redirection system with the website-al changes
...
bzr revid: fva@openerp.com-20140131114542-09hnjju5sdcen20q
2014-01-31 12:45:42 +01:00
a45ae1384c
[IMP] point_of_sale: increased size of logo on receipt
...
bzr revid: fva@openerp.com-20140131102245-hhshe83xuanllhyt
2014-01-31 11:22:45 +01:00
ff8f5104b1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140131062421-oq9ywafamdrwjbtj
2014-01-31 06:24:21 +00:00
4b30f1fcbd
[MERGE] trunk-website-al
...
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
2014-01-31 01:51:57 +01:00
ba2d4c9030
[IMP] point_of_sale, hw_escpos: hopefully much faster printing on the posbox by caching logo conversion
...
bzr revid: fva@openerp.com-20140130182109-11njt0khmylp0r7p
2014-01-30 19:21:09 +01:00
bc39772f0a
[FIX] point_of_sale: add port and protocol to forced proxy ip if necessary
...
bzr revid: fva@openerp.com-20140130154352-z2ulesl1wliodwja
2014-01-30 16:43:52 +01:00
3a8291d8ed
[IMP] Use cors in pos devices.js
...
bzr revid: fme@openerp.com-20140130151235-0kewmjr5g2w6aiij
2014-01-30 16:12:35 +01:00
9cdcf812a6
[MERGE] merge from trunk into local branch
...
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
2014-01-30 14:52:51 +01:00
dac3796177
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140130125458-rnhvcsgpafcaqftt
2014-01-30 13:54:58 +01:00
8cf2adf5e3
[IMP] point_of_sale: hold receipts until the printer is back online
...
bzr revid: fva@openerp.com-20140130103051-htsx7ts111axhhub
2014-01-30 11:30:51 +01:00
e58efb7361
[IMP] replace the Order Analysis tree view by a graph view to use the new Pivot table. Also, removes the Day/Month/Year attributes of the postgres view (addon point_of_sale)
...
bzr revid: ged@openerp.com-20140130094455-cai7dvvozwhojaff
2014-01-30 10:44:55 +01:00
f31ddba8b3
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140129153718-b86vsyogxkr8lk19
2014-01-29 16:37:18 +01:00
4e73dce8d3
[FIX] point_of_sale: loading screen was not waiting until posbox connection
...
bzr revid: fva@openerp.com-20140129135710-vobqzjyq12d7io3v
2014-01-29 14:57:10 +01:00
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
c36fb2b016
[IMP] point_of_sale: moving demo data image from xml to file system
...
bzr revid: fva@openerp.com-20140127172121-kjpf2b4cpr608e4d
2014-01-27 18:21:21 +01:00
e2f2381fc2
[FIX] point_of_sale: fixing pos incompatibilities with the model changes in trunk-website-al
...
bzr revid: fva@openerp.com-20140127161005-2tntipu1x50kuhpz
2014-01-27 17:10:05 +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
85daaccb61
[FIX] point_of_sale: prevent barcode scanner connection loss
...
bzr revid: fva@openerp.com-20140127123614-vjrcwgh7s8rs2y2u
2014-01-27 13:36:14 +01:00
d9cdc8564c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00:00
c9879fcd1e
[IMP] point_of_sale: refactor proxy to use event based status notifications
...
bzr revid: fva@openerp.com-20140127002203-y2qnhwf0z708gbrx
2014-01-27 01:22:03 +01:00
1e09d3b3f5
[IMP] point_of_sale: Realtime printer & scanner online status
...
bzr revid: fva@openerp.com-20140126215528-q32v2q8keh6m0ufo
2014-01-26 22:55:28 +01:00
805d3757e9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00:00
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
3ad6be4466
point_of_sale restore pristine files
...
bzr revid: al@openerp.com-20140120140333-sxg3gh4lgh20teal
2014-01-20 15:03:33 +01:00
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00: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
1353e44bb3
[IMP] point_of_sale: less confusing synchronisation indicator
...
bzr revid: fva@openerp.com-20140116172846-7lyz50jr69crbxsn
2014-01-16 18:28:46 +01:00
ff9e9e7c88
[IMP] point_of_sale: adding the icon fonts 'font-awesome'
...
bzr revid: fva@openerp.com-20140116112322-n538un8zobptg2cy
2014-01-16 12:23:22 +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
2131aaa48f
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140115171732-2uh1mgmseaag34qy
2014-01-15 18:17:32 +01:00
eae55df214
[FIX] point_of_sale: let the session generate a session_id itself
...
bzr revid: chs@openerp.com-20140115161651-aht37d2ruf1jyzw6
2014-01-15 17:16:51 +01:00
edce92293d
[FIX] point_of_sale: increased network posbox discovery timeout
...
bzr revid: fva@openerp.com-20140115154542-vpl29qoj80ftskuf
2014-01-15 16:45:42 +01:00
e9e2673044
[REF] Remove unused picture from POS
...
bzr revid: jke@openerp.com-20140114135154-4xyk2z4qarx6s59r
2014-01-14 14:51:54 +01:00
4165921640
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140110172323-35agisgr341hzc3b
2014-01-10 18:23:23 +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
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
7ab7cf2149
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140109101313-cle2m2axh6vjj8yy
2014-01-09 11:13:13 +01:00
a726bf2d76
[FIX] point_of_sale: removed console.logs, fixed the tests to work with the new ui
...
bzr revid: fva@openerp.com-20140106174957-ee323a33j59q1npw
2014-01-06 18:49:57 +01:00
b9a245b22a
[IMP] point_of_sale: proper dom cache implementation, removed Imagecache as it is now obsolete, and some minor css fixes
...
bzr revid: fva@openerp.com-20140106171532-bue38i0myofyt3ww
2014-01-06 18:15:32 +01:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
643bb8566c
[IMP] point_of_sale: detailed tax report on receipt
...
bzr revid: fva@openerp.com-20140106135119-cnhopx3nie7f0r8h
2014-01-06 14:51:19 +01:00
b1af63310c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131219061324-aw7yvvnjapbx5x1i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053354-9ybfurq6yvrliqge
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054728-1db5iqqokg67bcyr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052619-5szmeohg88k0m4xt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054325-pww3zkiyzxll4qy7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054504-671epcsd8458kil8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062350-h5v8idg6hlix6rnx
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061853-bndte11d6k8po640
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054743-exo0ixnpjkfwfstl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050440-fme1x3f2g4s1dxqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062427-4v5wusiplrcj4jjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061934-r5xq4gfoy22w6nll
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054800-delmrxbtcvm3xxyw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050503-xu0r3lopkkfn20ca
2014-01-06 05:05:03 +00:00
96dd2211c9
[IMP] point_of_sale: styling of the category button without pictures
...
bzr revid: fva@openerp.com-20140103164048-pwq852fmbroz27c3
2014-01-03 17:40:48 +01:00
36a58d47d0
[FIX] point_of_sale: changed background of product categories list
...
bzr revid: fva@openerp.com-20140103155615-on0o5sy4d2f6jxx1
2014-01-03 16:56:15 +01:00
d38b7c2065
[FIX] point_of_sale: overflow on the receipt footer & header in the web printing
...
bzr revid: fva@openerp.com-20140103155319-lvxy7slsw9riwfwq
2014-01-03 16:53:19 +01:00
23adb2214a
[IMP] point_of_sale: receipt footer & header in web printing
...
bzr revid: fva@openerp.com-20140103154939-jm6rddipomf5d2wy
2014-01-03 16:49:39 +01:00
434513e761
[hw_scanner] implementation of the client side component of the barcode scanner proxy
...
bzr revid: fva@openerp.com-20140103130930-q1shnj9172yzn0gr
2014-01-03 14:09:30 +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
bf650fa07a
[IMP] hw_escpos: basic support for japanese receipt and open cashdrawer
...
bzr revid: fva@openerp.com-20131226165620-6262zfqyxxyryxo0
2013-12-26 17:56:20 +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
293001c826
[IMP] point_of_sale: ESC/POS receipt printing
...
bzr revid: fva@openerp.com-20131220163057-9nu1u7hti0m8wo3h
2013-12-20 17:30:57 +01:00
2fec901cb5
[FIX] point_of_sale & hw_proxy: connect the pos to the new proxy, and fix scale emulation
...
bzr revid: fva@openerp.com-20131219142911-i9mkwqt1e0wz28i7
2013-12-19 15:29:11 +01:00
eea3942247
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131219104529-pm5covlh6uvo992d
2013-12-19 11:45:29 +01:00
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
586e8984fe
[FIX] point_of_sale: proper closing action
...
bzr revid: fva@openerp.com-20131218145602-0ss9j35xg0bofeh7
2013-12-18 15:56:02 +01:00
12818d0c63
[FIX] point_of_sale: make debug window draggable on touch devices
...
bzr revid: fva@openerp.com-20131217172258-llzy2ews9727pref
2013-12-17 18:22:58 +01:00
a0199955b3
[FIX] point_of_sale: minimal viable styling for OpenERP error dialogs
...
bzr revid: fva@openerp.com-20131217170654-qj5evj3t7ilih69b
2013-12-17 18:06:54 +01:00
ba88cd3438
[FIX] point_of_sale: remove useless console.logs
...
bzr revid: fva@openerp.com-20131217165641-a30md8f5k8p9fhmh
2013-12-17 17:56:41 +01:00
68f8dd7e23
[FIX] point_of_sale: activate the font 'Lato' & prevent rubberbanding on application body when possible
...
bzr revid: fva@openerp.com-20131217151550-i8wd88qby6gjaclj
2013-12-17 16:15:50 +01:00
e4ab24115a
[FIX] point_of_sale: css fixes for firefox
...
bzr revid: fva@openerp.com-20131217110900-e90yywg8yr0ey4bh
2013-12-17 12:09:00 +01:00
d9f1ee976e
[FIX] point_of_sale: onscreen keyboard working again
...
bzr revid: fva@openerp.com-20131216182059-4wukpqfvyagzm5vu
2013-12-16 19:20:59 +01:00
a50930e0d6
[FIX] point_of_sale: debug widget imput styling
...
bzr revid: fva@openerp.com-20131216160911-i7g286ksotw4esby
2013-12-16 17:09:11 +01:00
7ba916397d
[FIX] point_of_sale: drag & dropping the debug widget
...
bzr revid: fva@openerp.com-20131216155723-nnlv8223v9fr70nn
2013-12-16 16:57:23 +01:00
e1c4c930a8
[FIX] point_of_sale: crash on scale screen
...
bzr revid: fva@openerp.com-20131216152113-3y2s2fva3wvguoxt
2013-12-16 16:21:13 +01:00
f8777d18db
[WIP] point_of_sale: removing useless backbone models & making browser print work again
...
bzr revid: fva@openerp.com-20131216143559-6unghp0sza9ihs4r
2013-12-16 15:35:59 +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
a5cc6d6aed
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +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
20be322c45
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9684 rev-id: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
...
bzr revid: chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: dle@openerp.com-20131204150643-is3y0b9n8enh3yql
bzr revid: chs@openerp.com-20131206152726-pirikn7v8pev90ic
bzr revid: dle@openerp.com-20131206162437-b9niay99mirk44qm
bzr revid: tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v
bzr revid: dle@openerp.com-20131209155721-589zihxx8jmvlpvp
2013-12-09 16:57:21 +01:00
3be327c0ae
[FIX] point_of_sale: ignore TOTAlY returns
...
Returns were partially ignored when typing keystrokes, thanks to a return; when event which equaled 13, but the default behaviour (press on the focused input/button) was not prevented. This is now the case thanks to preventDefault. For instance, just after a discount set, the focused input was pressed and the associated value was added when scanning a new product with the scanner. Therefore, if we entered a discount of 30%, scanning a new product added '0', the last pushed button, to the discount, and then added the product.
bzr revid: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
2013-12-09 15:56:52 +01:00
86bb946087
[IMP] point_of_sale: adding lato font
...
bzr revid: fva@openerp.com-20131207170616-je7r27nb6n2wsrq0
2013-12-07 18:06:16 +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
019938f2c8
[WIP] point_of_sale: finished css optimisations
...
bzr revid: fva@openerp.com-20131205175325-8v81lfj69020x0qe
2013-12-05 18:53:25 +01:00
d4e7b6eb96
[WIP] point_of_sale: more perf improvement, this time on the receipt and payment screen + lots of usability improvements and cleanups
...
bzr revid: fva@openerp.com-20131204172122-mzl4wg4uw51uzdfv
2013-12-04 18:21:22 +01:00
4fd98907ce
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
7d062a0b45
[WIP] point_of_sale: improved performance of the product screen & order widget + ongoing cleanup
...
bzr revid: fva@openerp.com-20131202162144-6se3s0wjwz0jdfih
2013-12-02 17:21:44 +01:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
57ef91409a
[MERGE] bootstrap3
...
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +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
14e995b452
[WIP] point_of_sale: improving performance on mobile devices
...
bzr revid: fva@openerp.com-20131127191750-ob13h0s99b9amsa5
2013-11-27 20:17:50 +01:00
165af24f49
[WIP] point_of_sale: more progress on ipadification: the app now is in a separate controller, with proper meta tags for standalone apps, pixel ratio, etc
...
bzr revid: fva@openerp.com-20131127144427-odf37v9dthuw4yrm
2013-11-27 15:44:27 +01:00
0521d1aab3
[MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
...
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
28c074dcb2
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131126142328-26gdibac45v17djm
2013-11-26 15:23:28 +01:00
1a96fe1402
[WIP] point_of_sale: mobile ui optimisations
...
bzr revid: fva@openerp.com-20131125172726-xp81rn938rtfwlbs
2013-11-25 18:27:26 +01:00
bb1e256f5b
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
...
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
3fe26a6bb7
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131125103655-2w83i8oy6ebtruin
2013-11-25 11:36:55 +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
7b472fdc2f
[FIX] point_of_sale: fixed forgotten reference to 'code_id' (field previously renamed into 'code' to reflect its selection nature)
...
bzr revid: qdp-launchpad@openerp.com-20131121081749-hgk8qvgt5q1tvjw0
2013-11-21 09:17:49 +01:00
e22d25ecdc
[MERGE]with latest.
...
bzr revid: kch@tinyerp.com-20131121061028-t0mu64yq94yn1drv
2013-11-21 11:40:28 +05:30
271ed43e7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00: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
b261aad229
[IMP] point_of_sale: allow up to 8 payment methods to be displayed simultaneously
...
bzr revid: fva@openerp.com-20131118172620-tp3viaggc12wvjtl
2013-11-18 18:26:20 +01:00
1fba5804fc
[IMP] point_of_sale: allow up to 8 simultaneous payment methods to be displayed at once
...
bzr revid: fva@openerp.com-20131118172301-c71ic2xazlkjhr4d
2013-11-18 18:23:01 +01:00
926ff04ed8
[IMP]improved css for pos screen header.
...
bzr revid: ima@tinyerp.com-20131118053359-ccc5w6zrunagx2v6
2013-11-18 11:03:59 +05:30
03676cd07e
[FIX] point_of_sale: missing commits from last backport from trunk
...
bzr revid: fva@openerp.com-20131118093920-pz96e91clsfy6exd
2013-11-18 10:39:20 +01:00
60863b5ab0
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20131115121027-nwm6t768w6fjkqhi
2013-11-15 13:10:27 +01:00
b15ef95e41
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131114095621-rlx3w1i1cjy3fvwf
2013-11-14 15:26:21 +05:30
ddf6ec224f
[IMP] point_of_sale: improve the reactivity of the searchbox by timeouting on the search instead on searching after each character change
...
bzr revid: fva@openerp.com-20131112160534-004d8df6ede1b4yt
2013-11-12 17:05:34 +01:00
2c5632271f
[IMP] point_of_sale: only open cashbox when paying with cash + add manual override
...
bzr revid: fva@openerp.com-20131112151041-3betwjahh9ph9vx5
2013-11-12 16:10:41 +01:00
7c6292f91e
[FIX] point_of_sale: make the web printed receipt fit on 80mm paper
...
bzr revid: fva@openerp.com-20131112140457-sfmbu0ujz8lwfiil
2013-11-12 15:04:57 +01:00
55864d01e1
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20131111124249-18c9hwxcw4c8276o
2013-11-11 18:12:49 +05:30
510fb17b3e
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131024051759-qurv9c60xmeeikia
bzr revid: psa@tinyerp.com-20131029133146-2l6xpqsl3jdvfqaj
bzr revid: psa@tinyerp.com-20131111120727-bj8600jau4imn44g
2013-11-11 17:37:27 +05:30
f08f16cb30
[FIX] point_of_sale: `update` button in POS order form was calling a non-existing method
...
This dummy button is only meant to save the
order and refresh the view, which is easily
accomplished by sending an non-existing
workflow signal. Setting the button type
to the default `workflow` type (or simply
removing the wrong type) fixes the problem.
bzr revid: odo@openerp.com-20131107110256-zfok0mwkbesrkf81
2013-11-07 12:02:56 +01:00
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
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00: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
6582780d3b
[IMP] point_of_sale: restructured the main widget to use a generic scrollable subwindow system
...
bzr revid: fva@openerp.com-20131106103255-3ym4kh9wom5t1vra
2013-11-06 11:32:55 +01:00
fcbe2e3a97
[IMP] point_of_sale: renamed point-of-sale class + new subwindow layouting system
...
bzr revid: fva@openerp.com-20131105151548-vpsg2npnp0bx7pwd
2013-11-05 16:15:48 +01:00
b0c8e312d8
[IMP] point_of_sale: use placeholder + remove obsolete css rules
...
bzr revid: fva@openerp.com-20131105145844-69o6j8ynkn90fz23
2013-11-05 15:58:44 +01:00
29b0755b84
[IMP] point_of_sale: remove global calls to jquery
...
bzr revid: fva@openerp.com-20131105143128-hl73k961kgzyomw9
2013-11-05 15:31:28 +01:00
d4e8041601
[IMP] point_of_sale: removed all ids from templates and css
...
bzr revid: fva@openerp.com-20131105141903-3n8iq4geiwhq4nav
2013-11-05 15:19:03 +01:00
15062bdffe
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105060056-7xuq20lqt1upcdc6
2013-11-05 06:00:56 +00:00
7a991fbb46
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131030145903-wux05uymt1yfryq4
2013-10-30 15:59:03 +01:00
40c309024c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00: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
e5ad3700cb
[IMP] convert controllers to the new route api
...
bzr revid: al@openerp.com-20131027174813-ghwl3p6w7ebr20s9
2013-10-27 18:48:13 +01:00
3d8b7984be
import cleanups part1
...
bzr revid: al@openerp.com-20131022170659-kg9err029ha22evh
2013-10-22 19:06:59 +02:00
7f8f78cc4f
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131021055621-l0dw112tf8535j7q
2013-10-21 11:26:21 +05:30
f2e561afec
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 8960 rev-id: dle@openerp.com-20131018125818-1k168nlo2ferj25w
...
bzr revid: dle@openerp.com-20131018131007-etdut0wpjqhnexz2
2013-10-18 15:10:07 +02:00
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
dd18cff878
[IMP] Added attrs for closing balance in pos.
...
bzr revid: psa@tinyerp.com-20131015073857-b3izcxgn51q25jd0
2013-10-15 13:08:57 +05:30
8874046c39
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053740-rinm5yfv4pp3toj2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015051750-ss2jdlo4w12420rv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015051826-9alld47gks4izhjq
2013-10-15 05:18:26 +00:00
d6ae4209e4
[IMP] point_of_sale: hardware acceleration for scrolling
...
bzr revid: fva@openerp.com-20131014163414-x3mub8q5ajsqvsdl
2013-10-14 18:34:14 +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
8ce6495216
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131011124642-zjw0e4qljksvcda8
2013-10-11 18:16:42 +05:30
5c7e3be8ab
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131011093703-y3jdkox2xjkgorsu
2013-10-11 11:37:03 +02:00
65966940c8
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
06aaa06d9f
[WIP] point_of_sale: don't auto bottom scroll if not at bottom + saner css
...
bzr revid: fva@openerp.com-20131009145717-n42jt76nig0poc2n
2013-10-09 16:57:17 +02:00
613a3a78df
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131009133316-5zodruf4nk4kxmva
2013-10-09 15:33:16 +02:00
7976d4aa89
[FIX] point_of_sale: fix orderline selection
...
bzr revid: fva@openerp.com-20131009132944-x8st6n2etzcammig
2013-10-09 15:29:44 +02:00
f2aae63c61
[WIP] point_of_sale: automatically scroll to bottom
...
bzr revid: fva@openerp.com-20131009125128-yydt3l8vi8z2ik8p
2013-10-09 14:51:28 +02:00
ca28f214e4
[WIP] point_of_sale: used one jquery event handler for all products in product list in order to accelerate rerendering
...
bzr revid: fva@openerp.com-20131009101325-d71q3ppxb7hstzvd
2013-10-09 12:13:25 +02:00
2779496635
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131009054822-v57c9imyteomp381
bzr revid: launchpad_translations_on_behalf_of_openerp-20131009054909-1nmq8z3sk3ao5j0m
2013-10-09 05:49:09 +00:00
9329c3ba9d
[WIP] point_of_sale: add fastclick.js to remove tab delay on mobile devices
...
bzr revid: fva@openerp.com-20131008151940-67uky6vmn52vxyun
2013-10-08 17:19:40 +02:00
f564973ce0
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131008144807-dka0effsf6i30pem
2013-10-08 16:48:07 +02:00
96d57510af
[WIP] point_of_sale: removed js scrollbars
...
bzr revid: fva@openerp.com-20131008143639-qacekusrhy6uoues
2013-10-08 16:36:39 +02:00
e73a22ccb9
[WIP] point_of_sale: trying to remove all css fx to see if it's really faster
...
bzr revid: fva@openerp.com-20131008142309-4a1hgsg8ikw8dvzw
2013-10-08 16:23:09 +02:00
ba2657303d
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131007054548-w2yucsn99aty90wm
2013-10-07 11:15:48 +05:30
94887c5cb8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
2013-10-04 10:50:39 +02:00
9e85aa3e72
[FORWARD] Forward port of saas-2 branch until revision 8931 tde@openerp.com-20131003140458-ztnd9taih2rcq8ty
...
bzr revid: tde@openerp.com-20131004081915-4i2rn3fsj8qzov63
2013-10-04 10:19:15 +02:00
6ad09a8b40
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131004054526-wrer2m4h9u0lpvmm
2013-10-04 05:45:26 +00:00
5cba82e2c9
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
...
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
3acc213554
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9493 rev-id: launchpad_translations_on_behalf_of_openerp-20131003055550-0r0oqctbd69hv6ud
...
bzr revid: dle@openerp.com-20131003094541-ro29hhkas03rdvw8
2013-10-03 11:45:41 +02:00
b53d5c32ac
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131003055550-0r0oqctbd69hv6ud
2013-10-03 05:55:50 +00:00
be6cb7fc2a
[FIX] point_of_sale: remove useless or condition in tax computation
...
bzr revid: mat@openerp.com-20131002143734-b51sl1taumajaaus
2013-10-02 16:37:34 +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
e441ba637f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131002053724-elxvqw0n42c4lr9m
2013-10-02 05:37:24 +00:00
a9158e5993
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9487 rev-id: dle@openerp.com-20130930141202-ghnujem348kydd2m
...
bzr revid: dle@openerp.com-20130930150804-b4j080uy06t4n7f1
2013-09-30 17:08:04 +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
08d7b4136d
[FIX] point_of_sale: return empty list instead of False for report computation (opw 598437)
...
bzr revid: mat@openerp.com-20130927111118-bis9odhacjqaqmyp
2013-09-27 13:11:18 +02:00
e66ae2e671
[FIXED] pos: Fixed the issue of pos detail report when trying to pring report having order without TAX were throwing error(Maintenance case: 598437)
...
bzr revid: han@tinyerp.com-20130927103543-jppq53ugkj1gk2cl
2013-09-27 16:05:43 +05:30
1b0ad68d7a
[MERGE] Merged lp:openobject-addons
...
bzr revid: psa@tinyerp.com-20130925082318-253ageephv3s49ut
2013-09-25 13:53:18 +05:30
38a2ca7f3f
[MERGE] back port of branch trunk up to revid 8924 fva@openerp.com-20130924094515-j605mg8lozzli3u2
...
bzr revid: chs@openerp.com-20130924110701-a5h94knbm279d1m0
2013-09-24 13:07:01 +02:00
b4e57aa481
[FIX] point_of_sale: make sure that internal reference barcodes don't conflict with ean barcodes
...
bzr revid: fva@openerp.com-20130924093410-c1yh72t4jd9667ia
2013-09-24 11:34:10 +02:00
68c23991d7
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20130923151432-rba58178m69ldzgb
2013-09-23 17:14:32 +02:00
4b90d41e47
[FIX] point_of_sale: order close confirmation was put on all header buttons instead of just the close button
...
bzr revid: fva@openerp.com-20130923150431-pgri8o2gqup37dpk
2013-09-23 17:04:31 +02:00
e03f3aa288
[IMP] point_of_sale: support for non ean13 barcodes using the Internal Reference field
...
bzr revid: fva@openerp.com-20130923145139-iu3ds9tcfzy1ffcf
2013-09-23 16:51:39 +02:00
5d89ca5f6d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045555-o80w0vjyl4g3d2qn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060115-eauj5wlxmkpyxwys
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053444-ai66yjl1419gee8h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053502-xuqx6gazdvsak6e5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130921055928-8y21w291t5w0k13o
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053456-pcgrwl35kk8b7ff8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053531-3twd4g12gj4iqmv3
2013-09-23 05:35:31 +00:00
5a4b68e422
[FIX] point_of_sale: currency should be fetched from the pricelist instead of the company
...
bzr revid: fva@openerp.com-20130920123018-b10rrmxmx85ludth
2013-09-20 14:30:18 +02:00
885bd7ff7a
[FIX] point_of_sale: barcode scanner was not working in firefox due to usage of event.keyCode instead of event.which
...
bzr revid: fva@openerp.com-20130920094837-nks57e8qk3rgfksc
2013-09-20 11:48:37 +02:00
60b17e760c
[IMP] point_of_sale: when the product search returns only one product, order it on 'enter' keypress
...
bzr revid: fva@openerp.com-20130920094734-mvte0wkdw151691n
2013-09-20 11:47:34 +02:00
c7471d1bff
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
b32d7a7351
[FIX] point_of_sale: replaced utf8 special characters by image as those glyphs were not supported on enough systems
...
bzr revid: fva@openerp.com-20130919145133-5glux5wmidwddq6u
2013-09-19 16:51:33 +02:00
6700ef32bd
[IMP] point_of_sale: rename Start Selling to Resume Session when appropriate
...
bzr revid: fva@openerp.com-20130919135413-6hwj3b7vxstf8wq1
2013-09-19 15:54:13 +02:00
91763dbd57
[IMP] point_of_sale: confirmation message on session close when there are unposted orders
...
bzr revid: fva@openerp.com-20130919131228-hhrp3guno8ddt5m2
2013-09-19 15:12:28 +02:00
316d079b59
[IMP] point_of_sale: remove empty payment lines when going back to product screen
...
bzr revid: fva@openerp.com-20130919131012-ylnqrab48a9746l6
2013-09-19 15:10:12 +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
6fb8cb4756
[FIX] point_of_sale: barcode scanner was not working in firefox due to usage of event.keyCode instead of event.which
...
bzr revid: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
2013-09-18 17:33:47 +02:00
d30f5e8be6
[IMP] point_of_sale: when the product search returns only one product, order it on 'enter' keypress
...
bzr revid: fva@openerp.com-20130918134208-t9g50q8whdft4xzq
2013-09-18 15:42:08 +02:00
645c3ccf65
[FIX] point_of_sale: currency should be fetched from the pricelist instead of the company
...
bzr revid: fva@openerp.com-20130918122836-pqi1w41swu4rcrga
2013-09-18 14:28:36 +02:00
e00111a061
[IMP] Improved code.
...
bzr revid: psa@tinyerp.com-20130918111959-1dzkuxv4acjys8kl
2013-09-18 16:49:59 +05:30
6aa1cc0c71
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130918091235-0qtu3s3i0gmabgjr
2013-09-18 14:42:35 +05:30
0d826f64ca
[FIX] point_of_sale: missing renamings from the JobQueue refactor
...
bzr revid: fva@openerp.com-20130917124615-kqtix2atp1xguszw
2013-09-17 14:46:15 +02:00
ad6bbe490a
[FIX] point_of_sale: scaled product weren't ordered with the correct weight
...
bzr revid: fva@openerp.com-20130917123446-671ijt70i93p0w67
2013-09-17 14:34:46 +02:00
674054c97e
[IMP] point_of_sale: removed ProductWidget for faster product list updates
...
bzr revid: fva@openerp.com-20130917122929-8pybdbvgrv8kbgru
2013-09-17 14:29:29 +02:00
c33fd59465
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130917101910-4h2g2njs2e9toc36
2013-09-17 12:19:10 +02:00
65c70b85a7
[IMP + FIX] point_of_sale: plugged the memory leaks
...
- correctly call destroy on widgets
- unbind backbone events on destroy
- jquery show() hide() flooded jQuery.cache
- introduced automated ui tests
bzr revid: fva@openerp.com-20130917101420-g76gos2qjjaii3zf
2013-09-17 12:14:20 +02:00
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
Richard Mathot
rlu-odoo
Raphael Collet
Fabien Meghazi
Frederic van der Essen
Frederic van der Essen
Simon Lejeune
Martin Trigaux
Christophe Simonis
Jaydeep Barot
Grover Menacho
Christophe Matthieu
Dimitri del Marmol
ged-odoo
Martin Trigaux
qdp-odoo
Sylvain LE GAL
Olivier Dony
Denis Ledoux
Quentin (OpenERP)
Christophe Simonis
Kersten Jeremy
Josse Colpaert
Gery Debongnie
Antony Lesuisse
Frédéric van der Essen
Anael Closson
Launchpad Translations on behalf of openerp
Cedric Snauwaert
Randhir Mayatra rma-openerp
Ravi Gohil (OpenERP)
Thibault Delavallée
Stephane Wirtel
Paramjit Singh Sahota
Christophe Matthieu
Kunal Chavda (Open ERP)
ima-openerp
Xavier Morel
Hardik Ansodariya