lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2012-08-20

Diff: 420 lines (+76/-79)

23 files modified

account/account.py (+1/-1)
account_voucher/test/case2_suppl_usd_eur.yml (+1/-1)
account_voucher/test/case2_usd_eur_debtor_in_eur.yml (+1/-1)
account_voucher/test/case2_usd_eur_debtor_in_usd.yml (+1/-1)
account_voucher/test/case3_eur_eur.yml (+1/-1)
account_voucher/test/case4_cad_chf.yml (+1/-1)
base_calendar/base_calendar.py (+19/-18)
delivery/delivery_demo.xml (+1/-1)
document_ftp/__openerp__.py (+1/-1)
document_ftp/test/document_ftp_test4.yml (+25/-22)
hr_expense/hr_expense_demo.xml (+1/-1)
hr_timesheet_invoice/hr_timesheet_invoice_data.xml (+0/-5)
hr_timesheet_invoice/hr_timesheet_invoice_demo.xml (+0/-10)
l10n_in_hr_payroll/data/hr.salary.rule.csv (+5/-5)
portal/__openerp__.py (+1/-0)
project_timesheet/project_timesheet_demo.xml (+1/-1)
purchase/purchase_workflow.xml (+2/-1)
purchase/test/process/generate_invoice_from_reception.yml (+5/-0)
sale/test/cancel_order.yml (+3/-2)
sale_journal/__openerp__.py (+1/-1)
sale_mrp/sale_mrp.py (+2/-2)
sale_stock/sale_stock_demo.xml (+1/-1)
survey/test/survey_report.yml (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

7063. By Olivier Dony (Odoo) on 2012-11-09

[MERGE] Sync with trunk again

7062. By Olivier Dony (Odoo) on 2012-11-09

[MERGE] Sync with trunk

7061. By Jigar A. on 2012-10-04

[MERGE] Sync With Trunk

7060. By Vo Minh Thu on 2012-10-03

[FIX] sale_mrp: make sale_name and sale_ref stored fields (because they are searched in tests).

7059. By Vo Minh Thu on 2012-10-03

[FIX] sale: dont use the default product (otherwise a tax set by, say, l10n_be later would change the result).

7058. By Jigar A. on 2012-10-03

[FIX] l10n_in_hr_payroll: In data wrong fielf ref

7057. By Jigar A. on 2012-10-03

[MERGE] lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-l10n-in-hr-payroll-fix-tch

Merged branch lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-l10n-in-hr-payroll-fix-tch

7056. By Jigar A. on 2012-10-03

[FIX] sale_stock : Demo shoud load on update mode to sync with yaml test case.
lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-sale-stock-fix-tch

Merged branch lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-sale-stock-fix-tch

7055. By Jigar A. on 2012-10-03

[MERGE] lp:openobject-addons

7054. By Vo Minh Thu on 2012-10-02

[MERGE] merged trunk.