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
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
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
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
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
Olivier Dony
Quentin (OpenERP)
Christophe Simonis
Kersten Jeremy
Fabien Meghazi
Josse Colpaert
Gery Debongnie
Antony Lesuisse
Simon Lejeune
Frédéric van der Essen
Anael Closson
Launchpad Translations on behalf of openerp
Cedric Snauwaert