Merge lp://staging/~jfb-tempo-consulting/unifield-server/US-3935 into lp://staging/unifield-server/uf7
Proposed by
jftempo
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~jfb-tempo-consulting/unifield-server/US-3935 |
Merge into: | lp://staging/unifield-server/uf7 |
Diff against target: |
4464 lines (+1654/-521) (has conflicts) 40 files modified
bin/addons/account/account_cash_statement.py (+19/-16) bin/addons/account_corrections/account_move_line.py (+10/-2) bin/addons/base/module/module.py (+0/-7) bin/addons/delivery_mechanism/wizard/enter_reason.py (+3/-1) bin/addons/msf_homere_interface/wizard/hr_payroll_import.py (+3/-0) bin/addons/msf_instance/__openerp__.py (+1/-0) bin/addons/msf_instance/add_instance.py (+40/-3) bin/addons/msf_instance/data/instance_data.xml (+15/-2) bin/addons/msf_instance/data/remote_backup.xml (+18/-0) bin/addons/msf_instance/msf_instance.py (+371/-36) bin/addons/msf_instance/msf_instance_view.xml (+72/-0) bin/addons/msf_outgoing/msf_outgoing.py (+97/-97) bin/addons/msf_outgoing/report/labels.rml (+1/-1) bin/addons/msf_profile/data/patches.xml (+5/-0) bin/addons/msf_profile/i18n/fr_MF.po (+282/-40) bin/addons/msf_profile/msf_profile.py (+12/-0) bin/addons/msf_supply_doc_export/wizard/po_follow_up.py (+49/-49) bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+2/-1) bin/addons/purchase/purchase_workflow.py (+39/-27) bin/addons/register_accounting/report/fully_report_xls.mako (+10/-2) bin/addons/register_accounting/wizard/import_invoice_on_registers.py (+2/-1) bin/addons/register_accounting/wizard/wizard_register_import.py (+93/-70) bin/addons/sale/sale_workflow.py (+42/-27) bin/addons/sync_client/backup.py (+97/-4) bin/addons/sync_client/backup_view.xml (+61/-2) bin/addons/sync_client/hq_monitor_view.xml (+5/-1) bin/addons/sync_client/monitor.py (+8/-6) bin/addons/sync_client/sync_client_view.xml (+2/-0) bin/addons/sync_common/common.py (+1/-0) bin/addons/sync_so/purchase.py (+1/-1) bin/addons/tender_flow/tender_flow.py (+89/-84) bin/osv/orm.py (+1/-1) bin/release.py (+4/-0) bin/service/web_services.py (+3/-7) bin/sql_db.py (+3/-0) bin/tools/misc.py (+15/-0) bin/tools/webdav.py (+112/-0) doc/openerp-server.conf (+1/-0) setup.py (+46/-33) setup_py2exe_custom.py (+19/-0) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po Text conflict in bin/release.py |
To merge this branch: | bzr merge lp://staging/~jfb-tempo-consulting/unifield-server/US-3935 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Dev Team | Pending | ||
Review via email: mp+337637@code.staging.launchpad.net |
To post a comment you must log in.