lp:~jfb-tempo-consulting/unifield-server/US-5859
Created by
jftempo
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- UniField Reviewer Team: Pending requested
-
Diff: 21447 lines (+4454/-9884) (has conflicts)72 files modifiedbin/addons/base/ir/ir_actions.py (+2/-0)
bin/addons/base/ir/ir_ui_view.py (+1/-0)
bin/addons/base/rng/view.rng (+3/-0)
bin/addons/delete_button/view/picking_view.xml (+0/-17)
bin/addons/delivery_mechanism/delivery_mechanism.py (+40/-116)
bin/addons/delivery_mechanism/delivery_mechanism_view.xml (+0/-34)
bin/addons/msf_cross_docking/cross_docking_view.xml (+0/-34)
bin/addons/msf_custom_settings/view/delivery_mecanism_view.xml (+0/-16)
bin/addons/msf_custom_settings/view/stock_view.xml (+0/-36)
bin/addons/msf_doc_import/view/stock_picking_import_lines_view.xml (+0/-26)
bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py (+0/-2)
bin/addons/msf_outgoing/__init__.py (+8/-0)
bin/addons/msf_outgoing/__openerp__.py (+2/-4)
bin/addons/msf_outgoing/msf_outgoing.py (+991/-1489)
bin/addons/msf_outgoing/msf_outgoing_report.xml (+2/-1)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+553/-501)
bin/addons/msf_outgoing/report/certificate_free_gift.rml (+1/-1)
bin/addons/msf_outgoing/report/picking_ticket.py (+6/-0)
bin/addons/msf_outgoing/report/picking_ticket.rml (+2/-2)
bin/addons/msf_outgoing/wizard/__init__.py (+2/-5)
bin/addons/msf_outgoing/wizard/check_ppl_integrity.py (+7/-13)
bin/addons/msf_outgoing/wizard/check_ppl_integrity.xml (+11/-12)
bin/addons/msf_outgoing/wizard/create_picking_processor.py (+0/-1306)
bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml (+0/-105)
bin/addons/msf_outgoing/wizard/ppl_processor.py (+37/-643)
bin/addons/msf_outgoing/wizard/ppl_processor_view.xml (+3/-82)
bin/addons/msf_outgoing/wizard/ppl_set_pack_on_lines.py (+73/-0)
bin/addons/msf_outgoing/wizard/ppl_set_pack_on_lines_view.xml (+24/-0)
bin/addons/msf_outgoing/wizard/return_pack_shipment_processor.py (+2/-2)
bin/addons/msf_outgoing/wizard/return_ppl_processor.py (+19/-1)
bin/addons/msf_outgoing/wizard/return_shipment_processor.py (+236/-2)
bin/addons/msf_outgoing/wizard/shipment.py (+0/-611)
bin/addons/msf_outgoing/wizard/shipment_processor.py (+0/-469)
bin/addons/msf_outgoing/wizard/shipment_processor_view.xml (+0/-77)
bin/addons/msf_outgoing/wizard/shipment_view.xml (+0/-23)
bin/addons/msf_outgoing/wizard/split_move_processor.py (+4/-0)
bin/addons/msf_outgoing/wizard/stock_partial_move_view.xml (+0/-16)
bin/addons/msf_outgoing/wizard/validate_picking_processor.py (+0/-458)
bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml (+0/-105)
bin/addons/msf_printed_documents/report/freight_manifest.py (+18/-37)
bin/addons/msf_printed_documents/report/freight_manifest.rml (+154/-108)
bin/addons/msf_profile/data/patches.xml (+12/-10)
bin/addons/msf_profile/i18n/es_MF.po (+2/-2)
bin/addons/msf_profile/i18n/fr_MF.po (+1201/-1217)
bin/addons/msf_profile/msf_profile.py (+26/-0)
bin/addons/msf_profile/user_rights/ir.model.access.csv (+0/-8)
bin/addons/msf_profile/user_rights/msf_button_access_rights.button_access_rule.csv (+9/-47)
bin/addons/msf_supply_doc_export/report/report_pick_export_xls.mako (+5/-5)
bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py (+145/-209)
bin/addons/msf_tools/msf_tools.py (+102/-1)
bin/addons/order_types/stock_view.xml (+0/-87)
bin/addons/product_asset/product_asset.py (+5/-29)
bin/addons/product_expiry/product_expiry.py (+0/-246)
bin/addons/purchase/stock_view.xml (+0/-12)
bin/addons/reason_types_moves/stock_view.xml (+0/-74)
bin/addons/sale/stock_view.xml (+0/-36)
bin/addons/service_purchasing/service_purchasing.py (+0/-102)
bin/addons/specific_locations/specific_locations_view.xml (+1/-51)
bin/addons/specific_rules/specific_rules.py (+6/-50)
bin/addons/specific_rules/specific_rules_view.xml (+0/-151)
bin/addons/stock/stock.py (+465/-423)
bin/addons/stock/stock_view.xml (+135/-126)
bin/addons/stock/wizard/stock_move.py (+0/-151)
bin/addons/stock/wizard/stock_move_view.xml (+0/-95)
bin/addons/stock_override/stock.py (+1/-222)
bin/addons/stock_override/stock_view.xml (+0/-125)
bin/addons/stock_override/wizard/change_dest_location.py (+105/-40)
bin/addons/stock_override/wizard/change_dest_location_view.xml (+24/-5)
bin/import_xml.rng (+1/-0)
bin/osv/orm.py (+4/-4)
bin/report/interface.py (+3/-1)
bin/tools/convert.py (+1/-1)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:unifield-server