Необходимо реорганизовать справочники физ. и юрлиц - информация должна храниться в client, client_fl, client_ul
Bug #567768 reported by
Alexey Mikhaylovskiy
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
cbadmin |
Fix Released
|
High
|
Unassigned |
Bug Description
Мы этот вопрос обсуждали, если что-то нужно с моей стороны - я готов.
Related branches
lp:cbadmin
Approved
for merging
into
lp:cbadmin/release
- McSeem: Approve
-
Diff: 28955 lines (+13612/-5443)174 files modifiednbproject/build-impl.xml (+202/-55)
nbproject/genfiles.properties (+5/-2)
nbproject/private/private.properties (+2/-2)
nbproject/private/private.xml (+94/-50)
nbproject/private/profiler/configurations.xml (+141/-0)
nbproject/project.properties (+3/-1)
src/backupscripts/mysqlbackup (+1/-1)
src/backupscripts/mysqlrestore (+4/-1)
src/build-info.properties (+4/-2)
src/build.number (+2/-2)
src/cayenne.xml (+6/-3)
src/cbadmin.map.xml (+71/-48)
src/cbadmin.properties (+15/-1)
src/cbadmin/business/Money.java (+334/-0)
src/cbadmin/business/PaymentVendorInterface.java (+52/-0)
src/cbadmin/business/Price.java (+100/-0)
src/cbadmin/business/PriceInterface.java (+62/-0)
src/cbadmin/business/PriceVendorDefault.java (+161/-0)
src/cbadmin/business/PriceVendorFlight.java (+237/-0)
src/cbadmin/business/PriceVendorInterface.java (+54/-0)
src/cbadmin/business/PriceVendorProto.java (+92/-0)
src/cbadmin/business/ReporterInterface.java (+49/-0)
src/cbadmin/business/xlsbuilder.java (+572/-0)
src/cbadmin/entity2/Block.java (+143/-28)
src/cbadmin/entity2/Client.java (+24/-3)
src/cbadmin/entity2/Flight.java (+61/-4)
src/cbadmin/entity2/FlightProgram.java (+13/-1)
src/cbadmin/entity2/FlightProgramPeriods.java (+17/-2)
src/cbadmin/entity2/ListAge.java (+14/-5)
src/cbadmin/entity2/ListAirline.java (+17/-0)
src/cbadmin/entity2/ListClass.java (+7/-0)
src/cbadmin/entity2/ListEmail.java (+7/-0)
src/cbadmin/entity2/ListPayMethod.java (+31/-0)
src/cbadmin/entity2/Passenger.java (+18/-28)
src/cbadmin/entity2/Payment.java (+56/-29)
src/cbadmin/entity2/Reservation.java (+274/-41)
src/cbadmin/entity2/ReservationUl.java (+1/-0)
src/cbadmin/entity2/Service.java (+11/-1)
src/cbadmin/entity2/ServicePrice.java (+19/-1)
src/cbadmin/entity2/auto/_Block.java (+14/-3)
src/cbadmin/entity2/auto/_Client.java (+8/-0)
src/cbadmin/entity2/auto/_ClientFl.java (+8/-0)
src/cbadmin/entity2/auto/_ClientUl.java (+8/-0)
src/cbadmin/entity2/auto/_FlightProgram.java (+19/-8)
src/cbadmin/entity2/auto/_ListAge.java (+20/-15)
src/cbadmin/entity2/auto/_ListCountry.java (+11/-0)
src/cbadmin/entity2/auto/_ListEmail.java (+67/-0)
src/cbadmin/entity2/auto/_ListPayMethod.java (+33/-0)
src/cbadmin/entity2/auto/_Passenger.java (+8/-0)
src/cbadmin/entity2/auto/_Payment.java (+11/-0)
src/cbadmin/entity2/auto/_Reservation.java (+40/-24)
src/cbadmin/entity2/auto/_ReservationFl.java (+8/-0)
src/cbadmin/entity2/auto/_ReservationUl.java (+16/-0)
src/cbadmin/entity2/auto/_Service.java (+8/-0)
src/cbadmin/entity2/db_interface.java (+90/-20)
src/cbadmin/gui/PanelReservationFlight.form (+57/-70)
src/cbadmin/gui/PanelReservationFlight.java (+257/-111)
src/cbadmin/gui/PanelReservationInterface.java (+47/-0)
src/cbadmin/gui/PanelReservationServices.form (+45/-69)
src/cbadmin/gui/PanelReservationServices.java (+267/-156)
src/cbadmin/gui/dic_ClientFl.form (+40/-72)
src/cbadmin/gui/dic_ClientFl.java (+41/-46)
src/cbadmin/gui/dic_ClientUl.form (+195/-199)
src/cbadmin/gui/dic_ClientUl.java (+150/-130)
src/cbadmin/gui/dic_ListAirline.form (+4/-14)
src/cbadmin/gui/dic_ListAirline.java (+6/-16)
src/cbadmin/gui/dic_ListAirport.java (+2/-2)
src/cbadmin/gui/dic_ListCity.java (+3/-3)
src/cbadmin/gui/dic_ListEmail.form (+299/-0)
src/cbadmin/gui/dic_ListEmail.java (+335/-0)
src/cbadmin/gui/dic_ListFl.java (+0/-6)
src/cbadmin/gui/dic_ListPayMethod.form (+262/-0)
src/cbadmin/gui/dic_ListPayMethod.java (+309/-11)
src/cbadmin/gui/dic_ListUl.form (+27/-17)
src/cbadmin/gui/dic_ListUl.java (+29/-15)
src/cbadmin/gui/dic_PreferredVendor.java (+2/-2)
src/cbadmin/gui/dic_helper.java (+221/-34)
src/cbadmin/gui/dic_userrole.java (+2/-1)
src/cbadmin/gui/main.form (+12/-0)
src/cbadmin/gui/main.java (+34/-26)
src/cbadmin/gui/support/JTextFieldNumber.java (+174/-0)
src/cbadmin/gui/support/PanelDictionaryCombo.java (+134/-43)
src/cbadmin/gui/support/PanelMultiValue.java (+16/-15)
src/cbadmin/gui/support/PriceFieldsHelper.java (+93/-0)
src/cbadmin/gui/support/SettingsMgr.java (+22/-3)
src/cbadmin/gui/support/proto2.java (+124/-19)
src/cbadmin/gui/win_flight.form (+52/-84)
src/cbadmin/gui/win_flight.java (+223/-235)
src/cbadmin/gui/win_flight_add.form (+45/-59)
src/cbadmin/gui/win_flight_add.java (+78/-59)
src/cbadmin/gui/win_flight_block_add.form (+20/-66)
src/cbadmin/gui/win_flight_block_add.java (+30/-59)
src/cbadmin/gui/win_flight_program_add.form (+32/-54)
src/cbadmin/gui/win_flight_program_add.java (+95/-44)
src/cbadmin/gui/win_flight_program_period_add.java (+23/-27)
src/cbadmin/gui/win_flight_report.java (+2/-2)
src/cbadmin/gui/win_flightload.form (+9/-16)
src/cbadmin/gui/win_flightload.java (+169/-150)
src/cbadmin/gui/win_flightload_passenger_details.form (+123/-0)
src/cbadmin/gui/win_flightload_passenger_details.java (+228/-0)
src/cbadmin/gui/win_offer.form (+4/-2)
src/cbadmin/gui/win_offer.java (+5/-3)
src/cbadmin/gui/win_payment_add.java (+27/-12)
src/cbadmin/gui/win_payment_add_income.form (+472/-0)
src/cbadmin/gui/win_payment_add_income.java (+903/-0)
src/cbadmin/gui/win_payment_block.java (+2/-2)
src/cbadmin/gui/win_payment_reservation.form (+7/-30)
src/cbadmin/gui/win_payment_reservation.java (+298/-114)
src/cbadmin/gui/win_payment_service.form (+28/-58)
src/cbadmin/gui/win_payment_service.java (+257/-202)
src/cbadmin/gui/win_price.java (+1/-1)
src/cbadmin/gui/win_reservations.form (+224/-138)
src/cbadmin/gui/win_reservations.java (+726/-501)
src/cbadmin/gui/win_reservations_dependent.form (+2/-2)
src/cbadmin/gui/win_reservations_dependent.java (+3/-9)
src/cbadmin/gui/win_reservations_set_accdate.form (+107/-0)
src/cbadmin/gui/win_reservations_set_accdate.java (+167/-0)
src/cbadmin/gui/win_reservations_set_billdate.form (+107/-0)
src/cbadmin/gui/win_reservations_set_billdate.java (+181/-0)
src/cbadmin/gui/win_reservations_set_billldate.form (+0/-107)
src/cbadmin/gui/win_reservations_set_billldate.java (+0/-181)
src/cbadmin/gui/win_statuscheck.form (+18/-18)
src/cbadmin/gui/win_statuscheck.java (+19/-19)
src/cbadmin/gui/win_statuscheck_past.form (+133/-60)
src/cbadmin/gui/win_statuscheck_past.java (+177/-87)
src/cbadmin/util/CommandLineMgr.java (+44/-0)
src/cbadmin/util/CurrencyMgr.java (+9/-3)
src/cbadmin/util/CustomSMTPAppender.java (+85/-0)
src/cbadmin/util/EmailMgr.java (+139/-0)
src/cbadmin/util/InstallMgr.java (+47/-21)
src/cbadmin/util/JasperReporter.java (+48/-0)
src/cbadmin/util/Logger.java (+7/-21)
src/cbadmin/util/PaymentMgr.java (+56/-0)
src/cbadmin/util/PluginMgr.java (+72/-62)
src/cbadmin/util/PriceMgr.java (+64/-6)
src/cbadmin/util/PriceVendorDefault.java (+0/-266)
src/cbadmin/util/PriceVendorFlight.java (+0/-229)
src/cbadmin/util/PriceVendorInterface.java (+0/-43)
src/cbadmin/util/PropertiesMgr.java (+18/-1)
src/cbadmin/util/ReporterInterface.java (+0/-49)
src/cbadmin/util/ReservationMgr.java (+36/-1)
src/cbadmin/util/UpdateMgr.java (+101/-27)
src/cbadmin/util/email.java (+0/-71)
src/cbadmin/util/utils.java (+198/-23)
src/cbadmin/util/xlsbuilder.java (+0/-512)
src/cbadminExportPnlPlugin.map.xml (+2/-0)
src/cbadminNode.driver.xml (+2/-2)
src/cbadminPluginDeposit.map.xml (+60/-0)
src/cbadminPluginDocpack.map.xml (+4/-2)
src/cbadminPluginHotel.map.xml (+212/-4)
src/cbadminPluginPayrequest.map.xml (+0/-8)
src/cbadminPluginRcc.map.xml (+190/-0)
src/cbadminPluginTour.map.xml (+40/-13)
src/cbadminPluginWeb.map.xml (+137/-12)
src/di.config (+3/-0)
src/local.properties (+176/-122)
src/log4j.xml (+22/-9)
src/plugins.docpack.cbadmin.properties (+0/-2)
src/plugins.loadcurrency.cbadmin.properties (+1/-0)
src/plugins/BlockListenerPlugin.java (+23/-0)
src/plugins/ReservationPlugin.java (+7/-0)
src/plugins/core/impl/CorePluginImpl.java (+81/-70)
src/plugins/core/impl/updates/11.sql (+9/-0)
src/plugins/core/impl/updates/12.sql (+2/-0)
src/plugins/core/impl/updates/13.sql (+14/-0)
src/plugins/core/impl/updates/14.sql (+11/-0)
src/plugins/core/impl/updates/15.h2.sql (+19/-0)
src/plugins/core/impl/updates/15.mysql.sql (+19/-0)
src/plugins/core/impl/updates/15.sql (+11/-0)
src/plugins/core/impl/updates/16.sql (+48/-0)
src/plugins/core/impl/updates/17.sql (+22/-0)
src/plugins/core/impl/updates/18.sql (+12/-0)
src/plugins/core/impl/updates/7.sql (+1/-1)
src/readme.txt (+9/-1)
Changed in cbadmin: | |
importance: | Undecided → Medium |
status: | New → Confirmed |
milestone: | none → stage10 |
Changed in cbadmin: | |
importance: | Medium → High |
Changed in cbadmin: | |
status: | Confirmed → In Progress |
Changed in cbadmin: | |
status: | In Progress → Fix Released |
To post a comment you must log in.
Логика будет следующая:
Справочники редактируют client_ul/fl
В заявке выбирается client_ul/fl.
В момент первого сохранения создается reservation_ul/fl, прописывается в заявке.
В момент смены client_ul/fl в заявке данные из него копируются в поля контактов заявки (те, которые есть).
В момент сохранения заявки, если её client_ul/fl отличается от выбранных, то текущие reservation_ul/fl удаляются, создаются новые.