pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,276 Commits 1 Branch 0 Tags
be0da788f6fca9d95c2d667e619bfc9939cefb65
Commit Graph
76276 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gery Debongnie be0da788f6 [MERGE] merge trunk into local branch 
bzr revid: ged@openerp.com-20140113110402-t4hmjl1vdqt91qx6
bzr revid: ged@openerp.com-20140113142408-12i6pqw1cbdqhqg2
 2014-01-13 15:24:08 +01:00
Martin Trigaux a75ec87028 [MERGE] [FIX] account: accounting periods in demo data are no longer opening periods, create a new period_0 as opening period 
bzr revid: mat@openerp.com-20140113140646-aa0wh2ixmkx2f6cq
 2014-01-13 15:06:46 +01:00
Martin Trigaux 1f163f5a78 [FIX] account: demo opening period, add x in the name 
bzr revid: mat@openerp.com-20140113122917-zszm18ywrel1ie68
 2014-01-13 13:29:17 +01:00
Martin Trigaux 7078d1c36a [MERGE] sync with trunk 
bzr revid: mat@openerp.com-20140113112336-1dg6zz86g24yiicq
 2014-01-13 12:23:36 +01:00
Frédéric van der Essen 6df89aa77a [FIX] adding new python dependencies brought by the hw_escpos module to the install script 
bzr revid: fva@openerp.com-20140113111705-649g7wknkb10u6re
 2014-01-13 12:17:05 +01:00
Martin Trigaux e0f4c59f11 [FIX] account: accounting periods in demo data are no longer opening periods, create a new period_0 as opening period 
bzr revid: mat@openerp.com-20140113105555-nuefln1bajgwexpd
 2014-01-13 11:55:55 +01:00
Frédéric van der Essen 8a43a64250 [MERGE] better management for python dependencies of the hardware driver modules 
bzr revid: fva@openerp.com-20140113105447-4ylwptc139oho2m6
 2014-01-13 11:54:47 +01:00
Frédéric van der Essen 310807b286 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140113105344-285tkvqrnmza0awn
 2014-01-13 11:53:44 +01:00
Martin Trigaux fb6f7b406d [IMP] project: remove duplicated field complete_name (already present in account.analytic.account) 
bzr revid: mat@openerp.com-20140113103245-md9rl0hsym79abdq
 2014-01-13 11:32:45 +01:00
Frédéric van der Essen 0b580af49b [FIX] hw_scanner: made evdev dependency optional (obviously it won't work if it's not installed...) 
bzr revid: fva@openerp.com-20140113103148-2uvhd7de6i9o40kx
 2014-01-13 11:31:48 +01:00
Frédéric van der Essen f72044585a [FIX] hw_escpos: removed PIL external dependency as it is already required by openerp 
bzr revid: fva@openerp.com-20140113101520-meh1tswxn2eg11ge
 2014-01-13 11:15:20 +01:00
Frédéric van der Essen b897920b5a [FIX] hw_escpos: added pyserial, pyqrcode & PIL as external dependencies of the module, to prevent it from being installed if they aren't available 
bzr revid: fva@openerp.com-20140113100418-v08gb20ayy7eeogm
 2014-01-13 11:04:18 +01:00
Frédéric van der Essen 59ba2bf90b [FIX] hw_escpos: added pyusb as an external dependency of the module, to prevent it from being installed without pyusb available 
bzr revid: fva@openerp.com-20140113094418-m6727xev0kt7bgk8
 2014-01-13 10:44:18 +01:00
Frédéric van der Essen bee7a6d4f3 [FIX] point_of_sale: removed useless escpos python module & pyusb from hw_proxy module 
bzr revid: fva@openerp.com-20140113092322-qa8v4qhr4qo2kouc
 2014-01-13 10:23:22 +01:00
Frédéric van der Essen 9dd30a1815 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140113090646-4o165k3l1hbeogit
 2014-01-13 10:06:46 +01:00
Gery Debongnie 0c24b69db2 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140113081030-74nfutdr5le70dz4
 2014-01-13 09:10:30 +01:00
Launchpad Translations on behalf of openerp fa02a0a2e7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111054551-r144q2z5chu41e2t
 2014-01-11 05:45:51 +00:00
Frédéric van der Essen bf792a2fd6 [MERGE] point_of_sale: big point of sale upgrade for posbox campaign 
bzr revid: fva@openerp.com-20140110172410-ao0le042o8h9enha
 2014-01-10 18:24:10 +01:00
Frédéric van der Essen 4165921640 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140110172323-35agisgr341hzc3b
 2014-01-10 18:23:23 +01:00
Frédéric van der Essen a97a587fad [IMP] point_of_sale: posbox automatic discovery 
bzr revid: fva@openerp.com-20140110171746-286285ds696d5kby
 2014-01-10 18:17:46 +01:00
Stephane Wirtel a097785c67 [MERGE] Extract the base64 encoded images from the xml files lp:~openerp-dev/openobject-server/trunk-extracted_img-stw 
bzr revid: stw@openerp.com-20140109161022-tbrcm0e0f6plj6fe
 2014-01-09 17:10:22 +01:00
Stephane Wirtel b5635f8603 [MERGE] Extract the base64 encoded images from the xml files lp:~openerp-dev/openobject-addons/trunk-extracted_img-stw 
bzr revid: stw@openerp.com-20140109160942-zo338hdm1bg8wdr0
 2014-01-09 17:09:42 +01:00
Stephane Wirtel 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
Stephane Wirtel 89f71281a7 [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-20140109154338-0spjbo109pxh75pp
 2014-01-09 16:43:38 +01:00
Stephane Wirtel 31fbdd57b2 [FIX] Add the default shell 
bzr revid: stw@openerp.com-20140109105100-qevvw17ns4xe9ame
 2014-01-09 11:51:00 +01:00
Frédéric van der Essen 7ab7cf2149 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140109101313-cle2m2axh6vjj8yy
 2014-01-09 11:13:13 +01:00
Stephane Wirtel 8eebb40313 [FIX] On OSX, the system has a lot of Bitmap fonts, and in this case, Reportlab 
can not load the 'head' table from the structure of the TTF file. There is no
good way to check if a TTF file is an old style or new style.

bzr revid: stw@openerp.com-20140109095420-uixw7u1b0dbhcp4v
 2014-01-09 10:54:20 +01:00
Stephane Wirtel 5aef04550f [REF] Merge a refactoring of the workflow (lp:~openerp-dev/openobject-server/trunk-refactor-workflow-stw) 
bzr revid: stw@openerp.com-20140109095017-xakyapswp8b5eed5
 2014-01-09 10:50:17 +01:00
Stephane Wirtel 552c76c8b2 [REF] Use the contextlib.closing function instead of a couple of try/catch for 
the release of the database cursor.

bzr revid: stw@openerp.com-20140109093258-vmr1a3gaxruo0psp
 2014-01-09 10:32:58 +01:00
Martin Trigaux 5237d95f16 [ADD] project: add change_default parameter on project_id field of project.task. This allows to set default values depending on project through ir.values. 
bzr revid: mat@openerp.com-20140107171346-nd1a2esmdaqj9xip
 2014-01-07 18:13:46 +01:00
Frédéric van der Essen 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
Frédéric van der Essen 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
Frédéric van der Essen 4b4642bcc9 [IMP] hw_escpos: print taxes details on receipt 
bzr revid: fva@openerp.com-20140106145446-fhcefc6zy8w7zsur
 2014-01-06 15:54:46 +01:00
Frédéric van der Essen 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
Quentin (OpenERP) 5881686194 [IMP] web_kanban_sparkline: don't show the value in the tooltip for the sparklines of type 'tristate' 
bzr revid: qdp-launchpad@openerp.com-20140106131605-8lfp6dzpnl9vor09
 2014-01-06 14:16:05 +01:00
Gery Debongnie 223939d548 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140103154803-bgrq8nmkru39krzl
bzr revid: ged@openerp.com-20140106083918-fb1eojisumk08vr5
 2014-01-06 09:39:18 +01:00
Launchpad Translations on behalf of openerp a5f3084ac4 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101052634-06unjy412n3xm508
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106043902-000yyr2clg1qc9lb
 2014-01-06 04:39:02 +00:00
Launchpad Translations on behalf of openerp ced63415b7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103054140-sxa6ru24qvhgz2ve
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104054255-7o6b0x7c1vifv0do
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105052647-pckbu2ehnp5l8217
 2014-01-05 05:26:47 +00:00
Frédéric van der Essen 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
Frédéric van der Essen 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
Frédéric van der Essen 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
Frédéric van der Essen 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
Gery Debongnie 1b7e21a38b [FIX] removes reference to invoice report tree view in sale_crm because it was already removed in a previous commit to replace it with a graph view (addon web_graph) 
bzr revid: ged@openerp.com-20140103135342-ba1r15d2r3mrt0k9
 2014-01-03 14:53:42 +01:00
Frédéric van der Essen a82f9ec6f2 [IMP] hw_proxy: adding correct module dependencies for hw_escpos and hw_scanner 
bzr revid: fva@openerp.com-20140103133439-n2tp9laduf8tbn2u
 2014-01-03 14:34:39 +01:00
Frédéric van der Essen 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
Frédéric van der Essen 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
Thibault Delavallée 2488f78e6d [FORWARD] Forward port of latest saas-2 fixes, until revision 9062 (revid tde@openerp.com-20140102124143-m1qv8koovjcl8mah) 
bzr revid: tde@openerp.com-20140102133028-xhvkzstqy5t8dquh
 2014-01-02 14:30:28 +01:00
Thibault Delavallée 5e7fdb5bcc [MERGE] [IMP] hr: changed some pictures of employees in demo data to avoid copyright issues 
bzr revid: tde@openerp.com-20140102125858-b2r3mntmj5uu15nl
 2014-01-02 13:58:58 +01:00
Thibault Delavallée c243854aae [FIX] account_anglo_saxon: fixed yml tests using an hardocded year instead of the current year. 
bzr revid: tde@openerp.com-20140102124143-m1qv8koovjcl8mah
 2014-01-02 13:41:43 +01:00
Thibault Delavallée 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