8046b7367d
[MERGE] forward port of branch saas-5 up to 7e117b1
2014-08-28 16:51:11 +02:00
7e117b18a0
[MERGE] forward port of branch saas-3 up to ada9724
2014-08-28 16:21:27 +02:00
ada9724655
[MERGE] forward port of branch 7.0 up to 3509e15
2014-08-28 16:12:55 +02:00
8aca457e34
[IMP] Updated website urls on modules and info page
2014-08-26 21:40:18 +02:00
69cd13a084
[FIX] point_of_sale: incorrect sequences for orders
...
A new ir.sequence is generated at pos.config creation for the orders. However it was not used as the type was not set. The fallback was done on the general sequence.
In addition to the sequences being shared, it was not possible to create a pos.order in multicompany (no sequence found for user company, name was null).
Same issue for the pos.order.line.
This patch generates correctly pos.order and pos.order.line sequences at pos.config creation.
Instead of using the pos.config sequence to generate session number (not what this field was intended to), use the existing sequence for pos.session.
Remove company_id value on default pos.session sequence to make sure it's shared between companies and correctly set the prefix.
2014-08-26 16:33:58 +02:00
f6dceb2ef6
[IMP] point_of_sale: prevent multicompany configuration issues
...
If the pos.config is not properly configured for multicompany (e.g. using location belonging to another company), launching a session with this config may fail (access rights).
This prevents to configure an incorrect point of sale in the first place.
2014-08-26 16:15:22 +02:00
73fc6419a9
[FIX] point_of_sale: the order reference used the session sequence number wich was not unique accross sessions on different point_of_sales.
...
Now we are using the session id which is unique, but is less understandable
2014-08-26 12:38:35 +02:00
f1d4d8d86c
[IMP] point_of_sale: automatically update partners data when they are modified
2014-08-26 12:21:04 +02:00
f57787e07e
[IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files)
2014-08-26 11:56:49 +02:00
8b4c7d7655
[FIX] point_of_sale: the category list now uses less space when the categories don't have pictures, freeing some screen space on tablets
2014-08-25 14:31:44 +02:00
73546f70ca
[FIX] point_of_sale: generate bank statement with commerical partner
...
When a pos session is closed & confirmed, the account.move were generated with the commercial partner except for the bank statement which prevented automatic reconciliation.
This patch uses the commercial partner also for bank statement.
Fixes #1558 , #1764
2014-08-22 15:29:23 +02:00
5a5f811d23
[REVERT] commit 5e5c73e
...
Branch 8.0 is a **stable** branch. This mean no database schema
changes.
2014-08-22 13:59:22 +02:00
5e5c73e7ba
[IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files)
2014-08-22 09:49:09 +02:00
80d8532370
Forward port of branch saas-5 up to rev 4895281e
2014-08-22 09:12:14 +02:00
4895281e58
Forward port of branch saas-4 up to rev 15a3a2a
2014-08-21 18:17:35 +02:00
15a3a2a63a
Forward port of branch saas-3 up to 7bcefaf
2014-08-21 18:14:22 +02:00
7bcefaf232
Forward port of branch 7.0 up to 0ab88f5
2014-08-21 17:57:57 +02:00
2fd16b5552
[IMP] point_of_sale: add missing functionality necessary for the loyalty module
2014-08-21 12:19:04 +02:00
99ce17cfca
[FIX] point_of_sale: report, product_id of line is product_product
...
product_id column of pos_order_line is a product_product
the left join of l.product_id was done on product_template, instead of product_product
It worked as long as the ids product_product were the same as product_template. Meaning that, if you used variants, this report view was screwed.
2014-08-21 11:20:09 +02:00
d14297ac53
[FIX] better responsibilities on objects POS
2014-08-21 10:38:21 +02:00
0829afadd2
[FIX] point_of_sale: continuation of the session closing fix
2014-08-20 23:08:20 +02:00
62a8e5b457
[FIX] point_of_sale: partial fix for unclosable sessions
2014-08-20 22:24:21 +02:00
5dff035878
[MERGE] forward port of branch saas-5 up to 39bee35
2014-08-20 20:33:17 +02:00
1d85c667f7
[FIX] point_of_sale: correct SyntaxError
2014-08-20 20:24:09 +02:00
76a84ce2bf
[FIX] partner of order
2014-08-20 19:38:41 +02:00
c3131317d7
[MERGE] forward port of branch saas-4 up to ddef2dd
2014-08-20 17:57:22 +02:00
ddef2dd10a
[MERGE] forward port of branch saas-3 up to 8f13e83
2014-08-20 17:51:20 +02:00
8f13e8320e
[MERGE] forward port of branch 7.0 up to d0a0b7d
2014-08-20 17:45:05 +02:00
d421f9a365
[IMP] point_of_sale: track session logins
...
the pos session now keeps track of the session logins, and that number is
included in in the order reference. This prevents orders generated in parallely
created sessions from having the same reference, and also helps reduce fraud.
2014-08-20 15:13:46 +02:00
ffba505817
[FIX] point_of_sale: updated the tooltip for the to weight option to make it clearer that it is to be used with the hardware scale integration
2014-08-19 18:02:17 +02:00
3071af9b11
[FIX] point_of_sale: prevent changing the customer after printing the receipt
2014-08-19 17:55:46 +02:00
986f0e9d46
[FIX] point_of_sale: the receipt would not print correctly on first try
2014-08-19 17:15:14 +02:00
24df6dc8b2
[FIX] product, point_of_sale: add a display_default_code context option that can remove the internal reference (default code) from the displayed product name. Used in the point of sale to unclutter the receipt & GUI
2014-08-18 14:51:15 +02:00
221b746c7f
[FIX] point_of_sale: invoicing in the pos printed the wrong order due to a mismatch between order ids and invoice ids
2014-08-18 14:03:14 +02:00
57fe94b34e
[FIX] point_of_sale: the order uid were generated via timestamp, which were not sequencial or easy to understand, they are now generated with the order id and order sequence number which are sequencial
2014-08-18 12:19:56 +02:00
5d1d77e6e2
[FIX] point_of_sale: the product name field changed to display_name to include variants information, this should be reflected in searches as well.
2014-08-18 11:35:24 +02:00
97d097a2af
[FIX] point_of_sale: field date of report.pos.order should be a datetime
...
The date_order field of the pos.order is a datetime, not a date
As, in report.pos.order, the date field is related to date_order of the pos.order
We usually do not commit fixes altering the model fields structure in 7.0, but this one is retro-compatible, as the database structure won't change
2014-08-14 18:01:37 +02:00
50ef63881a
[I18N] Update 8.0 translation with latest source code
2014-08-14 17:01:54 +02:00
85d2b45aaa
[I18N] Update 7.0 translations with latest changes on Launchpad
...
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
2014-08-14 03:38:58 +02:00
96c36e895c
[I18N] Update all 7.0 translation templates with latest terms and annotations
...
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
e11eddf753
[MERGE] Forward-port of saas-5 up to 20cc18d
2014-08-13 20:46:47 +02:00
fe83c11301
[MERGE] forward port of branch saas-4 up to b49755b
...
The forward port of the fix 3609ba10f2
2014-08-13 10:45:36 +02:00
b49755b545
[MERGE] forward port of branch saas-3 up to 591326c
2014-08-13 10:29:14 +02:00
591326c54e
[FIX] pos: the widget.pos.cashier is not always defined
2014-08-13 10:20:03 +02:00
ef944dcd55
[IMP] Maifest for Github README.md on main apps
2014-08-12 11:33:15 +02:00
519a704cba
Merge pull request #1731 from hmen89/8.0-pos-dom-cache-fix
...
[FIX] point_of_sale: DOM Cache Error
2014-08-11 18:12:01 +02:00
d91263d03e
[FIX] point_of_sale: #1558 The partner was not correctly identified on the bank statement line, creating open balances on the partner account
2014-08-11 18:02:28 +02:00
1cb4495422
[FIX] point_of_sale: DOM Cache Error
2014-08-11 11:58:15 -04:00
c40c9734f1
[FIX] point_of_sale: support for variants in the pos, one simply needed to use the display_name which contains the product variant info.
...
Conflicts:
addons/point_of_sale/static/src/js/models.js
2014-08-11 17:17:12 +02:00
37a2f10127
[IMP] point_of_sale: make the confirm action color less frightening & longer delay
2014-08-11 17:17:12 +02:00
4f55c9d68d
[FIX] point_of_sale: it was too easy to accidentally hit the close button on ipads, made it double click only
2014-08-11 17:17:12 +02:00
8d32f80fe3
[FIX] point_of_sale: order sequence number should take into account offline generated orders
2014-08-11 17:17:12 +02:00
7e18563bdb
[FIX] point_of_sale: partners should be searchable by phone or mobile number
2014-08-11 17:17:12 +02:00
4ae6babb29
[FIX] point_of_sale: order buttons were too big to be used on tablets
2014-08-11 17:17:12 +02:00
ae65be2b2a
[MERGE] forward port of branch saas-5 up to 0739bc4
2014-08-11 15:58:02 +02:00
7c647ec876
[MERGE] forward port of branch saas-4 up to 0a1e4a0
2014-08-08 17:27:29 +02:00
0a1e4a05b2
[MERGE] forward port of branch saas-3 up to 81a902a
2014-08-08 17:06:39 +02:00
81a902a07d
[MERGE] forward port of branch 7.0 up to 5f696ba
2014-08-08 16:18:35 +02:00
5f696ba86c
[FIX] pos: display cashier name on receipt, not the user
2014-08-08 16:05:32 +02:00
7f82caa1a4
[FIX] point_of_sale: show_popup('name','comment') should display the comment in the popup
2014-08-08 13:48:33 +02:00
978fd47261
[MERGE] forward port of branch 7.0 up to 095be21
2014-08-06 13:06:20 +02:00
3bb6136055
[FIX] point_of_sale: clear tag in pos order sheet layout
...
Without clear tag total amounts breaks sheet layout.
2014-08-06 11:58:38 +02:00
dbc2d309b4
[FIX] point_of_sale: partner list rendering was not refreshing correctly. + limited display to 1000 partners for performance reasons
2014-08-05 14:10:59 +02:00
bfd66f351b
[FIX] point_of_sale: removed useless console.log()
2014-08-05 14:09:21 +02:00
a27d1a7134
[IMP] point_of_sale: allow an order to remember what screen it was on, instead
...
of switching back to default screen.
This is used by the soon to be merged restaurant addon to create new orders
and display them at a particular screen. However, this behaviour is more
confusing in the other cases, so I'll think of a better way to solve this.
2014-08-05 14:09:07 +02:00
28de2183ea
[IMP] point_of_sale: report errors when loading the point of sale with a traceback and a nice popup
2014-08-05 14:08:38 +02:00
eacd5329e3
[IMP] point_of_sale: made the server data loading more modular for easier development of point_of_sale extensions
2014-08-05 14:08:24 +02:00
db9a06b842
[IMP] point_of_sale: tests work better when they are loaded and run by the unit test system!
2014-08-05 14:08:08 +02:00
59396b45f5
[IMP] point_of_sale: forgot changes in this file in the previous commit that introduced unit tests
2014-08-05 14:07:58 +02:00
a70b286144
[IMP] point_of_sale: add a basic UI unit test based on the new 'Tour' module
2014-08-05 14:07:41 +02:00
ad0f710fe7
[IMP] point_of_sale: add a debug option to delete all unsent orders
2014-08-05 14:07:23 +02:00
584a78a82b
[IMP] point_of_sale: add debug popup that displays unsent order data, for when localStorage is hard to inspect
...
Conflicts:
addons/point_of_sale/static/src/js/widgets.js
2014-08-05 14:07:14 +02:00
85d697670c
[IMP] point_of_sale: show traceback popup when there is a server error when posting orders (which should NEVER happen !)
2014-08-05 14:04:50 +02:00
8e212eb6fb
[FIX] point_of_sale: it was impossible to delete a pos session
2014-08-05 14:04:38 +02:00
4f0d454217
[FIX] point_of_sale: order invoicing was broken
2014-08-05 14:04:17 +02:00
ac47f95bad
[IMP] point_of_sale: improved rendering speed of the partner list
2014-08-05 14:03:59 +02:00
75a6bcaee4
[IMP] point_of_sale: a little explaination of how the barcode pattern system works
2014-08-05 14:03:38 +02:00
2c3fa1c48b
[IMP] point_of_sale: add an error sound to the error popups
2014-08-05 14:03:21 +02:00
1bb219907f
[MERGE] forward port of branch saas-5 up to 655a5b9
2014-08-04 16:56:10 +02:00
7efe3bb2d8
[FIX] point_of_sale: On product form : push on button 'Set a Custom Ean' on tab information raise an exception => Use a record action and clean python files
2014-07-31 17:21:26 +02:00
366a30db95
[FIX] correct various date issues in reporting
...
* remove old 'day', 'month', 'field' and replace them by the actual
date/datetime field
* remove weird cast to char when creating the view to prevent crash
when grouping on them
* remove duplicates (such as 'creation_date' and 'create_date')
* fix typing errors (field type date defined as a datetime in the
postgres view)
* fix search view definition
2014-07-30 15:11:22 +02:00
954ab3eefb
Merge pull request #1268 from odoo-dev/8.0-pos-fixes-qdp
...
[FIX] point_of_sale: fixed errors that avoid closing a pos session + [IM...
2014-07-22 08:58:02 +02:00
5ae60d8a2d
[FIX] point_of_sale: fixed errors that avoid closing a pos session + [IMP] account: added back the account_id field on statement.line obj to ease the reconciliation process when importing statements (or creating them through pos.orders). Fix #932
2014-07-18 15:43:20 +02:00
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
Christophe Simonis
Fabien Pinckaers
Martin Trigaux
Frederic van der Essen
qdc
Denis Ledoux
Antony Lesuisse
Olivier Dony
Frédéric Van der Essen
Grover Menacho
Paulius Sladkevičius
Christophe Matthieu
Géry Debongnie
qdp-odoo
Richard Mathot
rlu-odoo
Raphael Collet
Fabien Meghazi
Frederic van der Essen
Simon Lejeune
Martin Trigaux
Jaydeep Barot
Dimitri del Marmol
Sylvain LE GAL
Denis Ledoux
Quentin (OpenERP)
Christophe Simonis
Kersten Jeremy
Josse Colpaert
Gery Debongnie