168b8e1d5e
[REM] removed old conflicting files badly merged (?)
...
bzr revid: qdp-launchpad@openerp.com-20140508143825-owheu6q219d8qbww
2014-05-08 16:38:25 +02:00
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +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
36b0c079c9
[REF] point_of_sale: removing commented line
...
bzr revid: qdp-launchpad@openerp.com-20140422121639-eho65ncckm2h279s
2014-04-22 14:16:39 +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
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
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
e36b32a661
[MERGE] merged with main trunk (revision 9186)
...
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +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
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
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
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +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
65966940c8
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02: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
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
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
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
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
2f9980881b
[FORWARD] Forward-port of addons saas-1 until revision 8775 (revid tde@openerp.com-20130913092546-kzshg1a7sls566l8).
...
[FIX] account: trunk version of the fix added in version 9440 of 7.0 branch
bzr revid: tde@openerp.com-20130913095612-i2f0kd3mhxdavdp6
2013-09-13 11:56:12 +02:00
b17fd217bd
[FIX] point_of_sale: correct _get_tax_amount to see several taxes in reports
...
bzr revid: mat@openerp.com-20130912130747-g3mj44w341v8ao2z
2013-09-12 15:07:47 +02:00
dee5ace29b
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20130624095319-sqkrnk4r1mst8nvk
2013-06-24 11:53:19 +02:00
9c8d2f1ea9
[REM] point_of_sale: removed by margin analysis that doesn't sound interestigng at all for a point of sale and that is not compliant with the new type of standard price (fields.property)
...
bzr revid: qdp-launchpad@openerp.com-20130528095822-xxnubsv1mkgg78vu
2013-05-28 11:58:22 +02:00
0e33939193
[TODO] code review of the WIP
...
bzr revid: qdp-launchpad@openerp.com-20130507144728-10cleynxqzu667wd
2013-05-07 16:47:28 +02:00
96ea6418c6
[IMP] Change standard_price field of product into a property: requires changing SQL queries
...
bzr revid: jco@openerp.com-20130417150213-4nm9tc8nzvsgm5ix
2013-04-17 17:02:13 +02:00
d187245d70
[IMP]improve code
...
bzr revid: sgo@tinyerp.com-20130417065614-tobshhmomx82zkaa
2013-04-17 12:26:14 +05:30
d1e17fbde0
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
5639a52431
[MERGE] use new report API.
...
bzr revid: vmt@openerp.com-20130328121009-r3n63gmhfkv0dnby
2013-03-28 13:10:09 +01:00
598b455c22
[REF] point_of_sale: rml_parse has already a self.pool, not need to call pooler.get_pool().
...
bzr revid: vmt@openerp.com-20130327130138-tzhqev6yako5xr9f
2013-03-27 14:01:38 +01:00
9bb5ee90e4
[IMP] removed unused netsvc imports.
...
bzr revid: vmt@openerp.com-20130222161029-zecwro75yra2vz0d
2013-02-22 17:10:29 +01:00
6be21ac5d3
[IMP]add onchange of warehouse to change company related to warehouse and improve some code
...
bzr revid: sgo@tinyerp.com-20130131062613-tmlgvdrculc2udu1
2013-01-31 11:56:13 +05:30
e4250d1558
[IMP]remove sale.shop from pos and improve code
...
bzr revid: sgo@tinyerp.com-20130123113306-n7enol5as84sv0g2
2013-01-23 17:03:06 +05:30
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
321754dfe0
[FIX]point_of_sale:fixed the issue of point of sale order receipt fields translation problem
...
lp bug: https://launchpad.net/bugs/1073199 fixed
bzr revid: ssu@tinyerp.com-20121101062613-dplo6xr4e3q6c42y
2012-11-01 11:56:13 +05:30
a7874fc421
[MERGE] point_of_sale: Fix some bugs
...
bzr revid: stw@openerp.com-20121031145708-g7ddb6xsrx2ag8c4
2012-10-31 15:57:08 +01:00
4694363d62
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121023065055-uapr3ywmqngewjb2
2012-10-23 12:20:55 +05:30
e5ea70b4c2
[FIX] point_of_sale: typo in report
...
bzr revid: qdp-launchpad@openerp.com-20121018135949-b08zihsoo7s0km05
2012-10-18 15:59:49 +02:00
fa206b6c42
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121015055335-jdu7jcul5wfq8ptp
bzr revid: apa@tinyerp.com-20121016090046-uo8i442o80kga8yw
2012-10-16 14:30:46 +05:30
00f3dfc6d8
[MERGE] use of formatLAng(amount, currency_obj=...) and use of display_address() in reports
...
bzr revid: qdp-launchpad@openerp.com-20121012071640-sxhy9xnat65r8158
2012-10-12 09:16:40 +02:00
2762e94eb3
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011052218-dx74aeg04h6azdmz
bzr revid: apa@tinyerp.com-20121012050113-w3b9fijrbxfyndxj
2012-10-12 10:31:13 +05:30
bc44da05a1
[IMP] reports: use of FormatLang(amount, currency_obj=...) instead of printing currency.symbol directly in the report
...
bzr revid: qdp-launchpad@openerp.com-20121011094002-7unxi6bi2hh2u6k5
2012-10-11 11:40:02 +02:00
d48856e81a
[FIX]:point_of_sale: In the same way the %age of discount was wrong in the reporting > point of sale > Sale details, there's a problem of conversion from %age to amount in the other report (reporting > point of sale > ORDER ANALYSIS), where the Total discount is the sum of %ages converted in €. So two times 50% discount = 100€ even though the item cost 1 bazillion, which is not correct.
...
bzr revid: apa@tinyerp.com-20121010052920-7d2zl85war0bn8jr
2012-10-10 10:59:20 +05:30
062a78f8da
[IMP]improve pos reprint wizard
...
bzr revid: sgo@tinyerp.com-20121005112633-a7er5yxbykgij52s
2012-10-05 16:56:33 +05:30
b461dd366f
[IMP]discount shown on ticket. if pos have no order lines it can not validate for ticket print. and improve report of sale detail
...
bzr revid: sgo@tinyerp.com-20121005070033-o51n2w72j7322zg5
2012-10-05 12:30:33 +05:30
f715525300
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121003064028-49llvt047893tx2n
2012-10-03 12:10:28 +05:30
Quentin (OpenERP)
Josse Colpaert
Simon Lejeune
Olivier Dony
Denis Ledoux
Gery Debongnie
Martin Trigaux
Hardik Ansodariya
Thibault Delavallée
sgo@tinyerp.com
Vo Minh Thu
Stephane Wirtel
Amit Patel
Sanjay Gohel (Open ERP)
Atul Patel (OpenERP)