Commit Graph

315 Commits

Author SHA1 Message Date
Alexis de Lattre bc3666aed5 [FIX] point_of_sale: redundance in report.pos.order search view
Avoid double entry in search filters of POS reporting.
Replace by 2 other usefull filters.

Closes #4600
2015-10-12 15:38:28 +02:00
Denis Ledoux 2d3973481f [FIX] point_of_sale: Sales details products translations
In the Sales Details report, the products were
not translated in the user language.

opw-647700
2015-08-24 18:27:55 +02:00
Goffin Simon 740efb9349 [FIX] point_of_sale: bad indentation 2015-05-11 14:10:12 +02:00
Goffin Simon 163e7ee5ed [FIX] point_of_point: POS sales details
Total of the day must include the invoiced lines.

opw:634098
2015-05-11 13:52:44 +02:00
Denis Ledoux cad5dffdfa [FIX] point_of_sale: Taxes in sales lines report
product_taxes_rel is the many2many table between
product.template and account.tax

product_id on the POS order line is a product.product.

Therefore, the join on product_taxes_rel should
be done using the product.template id of
the product on the pos order line, and
not directly the product.product id.

opw-632720
2015-04-13 13:00:52 +02:00
Denis Ledoux a175ed6b2f [MERGE] forward port of branch saas-3 up to 30674c3 2014-12-23 14:03:38 +01:00
Denis Ledoux 30674c3ed6 [MERGE] forward port of branch 7.0 up to e151e8f 2014-12-23 13:50:25 +01:00
Denis Ledoux e151e8f871 [FIX] point_of_sale: pos details report company taxes and payments
If the sales details only fetches the pos sales details of his own company, it should be the case for the pos payments and taxes as well.
2014-12-23 13:17:54 +01:00
Simon Lejeune 8138db8e0f [FIX] point_of_sale: details of sales report: include discount when computing taxes
Also, fixed a typo in the report's view.
2014-11-03 12:25:18 +01:00
Christophe Simonis 262eb662de [MERGE] forward port of branch 8.0 up to d80376a 2014-10-21 14:33:36 +02:00
Christophe Simonis 22c390285f [MERGE] forward port of branch 7.0 up to 78a29b3 2014-10-21 13:06:27 +02:00
Denis Ledoux 78a29b3738 [FIX] point_of_sale: no need to specify numeric digits
In the report pos order, average_price was set as a numeric(16,2), therefore, if the amount was too big, it led to a psql crash:
A field with precision 16, scale 2 must round to an absolute value less than 10^14.
2014-10-21 10:13:44 +02:00
Christophe Simonis db759948ff [MERGE] forward port of branch 7.0 up to 75d3ea6 2014-10-14 14:36:45 +02:00
David Monjoie 75d3ea6208 [FIX] point_of_sale: fixed display of untaxed amount in sales lines report 2014-10-14 14:11:53 +02:00
Denis Ledoux 18d365ce05 "[REVERT][FIX] point_of_sale: field date of report.pos.order should be a datetime"
This reverts commit 97d097a2af.

As explained in the commit comments (on Github), this patch leads to an infinite loop in 7.0, the filter of the pos orders report using the '=' operator in its domain, which is not available for datetime fields, but is for date fields.

This should not be forward ported to newer release (saas-3)
2014-08-29 20:40:31 +02:00
qdc 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
Christophe Simonis 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
qdc 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
Martin Trigaux 80d8532370 Forward port of branch saas-5 up to rev 4895281e 2014-08-22 09:12:14 +02:00
Martin Trigaux 4895281e58 Forward port of branch saas-4 up to rev 15a3a2a 2014-08-21 18:17:35 +02:00
Martin Trigaux 15a3a2a63a Forward port of branch saas-3 up to 7bcefaf 2014-08-21 18:14:22 +02:00
Martin Trigaux 7bcefaf232 Forward port of branch 7.0 up to 0ab88f5 2014-08-21 17:57:57 +02:00
Denis Ledoux 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
Christophe Simonis 5dff035878 [MERGE] forward port of branch saas-5 up to 39bee35 2014-08-20 20:33:17 +02:00
Christophe Simonis c3131317d7 [MERGE] forward port of branch saas-4 up to ddef2dd 2014-08-20 17:57:22 +02:00
Christophe Simonis ddef2dd10a [MERGE] forward port of branch saas-3 up to 8f13e83 2014-08-20 17:51:20 +02:00
Christophe Simonis 8f13e8320e [MERGE] forward port of branch 7.0 up to d0a0b7d 2014-08-20 17:45:05 +02:00
Frederic van der Essen 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
Denis Ledoux 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
Géry Debongnie 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
Richard Mathot 6f1b820d33 [REF] OpenERP --> Odoo in various UI texts (2)
Some things missed by commit 8b67a7202d
2014-07-18 14:59:38 +02:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Géry Debongnie 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
Quentin (OpenERP) 168b8e1d5e [REM] removed old conflicting files badly merged (?)
bzr revid: qdp-launchpad@openerp.com-20140508143825-owheu6q219d8qbww
2014-05-08 16:38:25 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Simon Lejeune 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
Simon Lejeune 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
Simon Lejeune 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
Quentin (OpenERP) 36b0c079c9 [REF] point_of_sale: removing commented line
bzr revid: qdp-launchpad@openerp.com-20140422121639-eho65ncckm2h279s
2014-04-22 14:16:39 +02:00
Simon Lejeune 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
Quentin (OpenERP) 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
Josse Colpaert 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
Quentin (OpenERP) e36b32a661 [MERGE] merged with main trunk (revision 9186)
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
Olivier Dony 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
Denis Ledoux 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
Denis Ledoux 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
Denis Ledoux 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
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Gery Debongnie 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