git.freeside.biz Git - freeside.git/commit

author	Ivan Kohler <ivan@freeside.biz>
	Fri, 28 Sep 2012 03:27:43 +0000 (20:27 -0700)
committer	Ivan Kohler <ivan@freeside.biz>
	Fri, 28 Sep 2012 03:27:43 +0000 (20:27 -0700)
commit	3185fe4edea62dd3fa9818cf80902e96fe2a2d21
tree	824a6cdb4b8ccc163127e00e1e86435b4c523476	tree \| snapshot
parent	f50a821d306b561d602edbdac0dac958b862ec0c	commit \| diff
parent	39533c66139210655fc47404a17fd4e9b9ca8a00	commit \| diff

Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
FS/FS/cust_main/Billing.pm

61 files changed:

FS/FS/Misc.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/TicketSystem/RT_Internal.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/cust_main/Billing.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/cust_pkg_discount.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/discount.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/part_event/Action/pkg_agent_credit.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/part_export/shellcommands.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/rate.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/svc_Tower_Mixin.pm	diff1 \|	diff2 \|	blob \| history
bin/231commit	diff1 \|	diff2 \|	blob \| history
bin/23diff	diff1 \|	diff2 \|	blob \| history
bin/cdr.import	diff1 \|	diff2 \|	blob \| history
bin/cust_main-bill_now	diff1 \|	diff2 \|	blob \| history
bin/pod2x	diff1 \|	diff2 \|	blob \| history
fs_selfservice/DEPLOY	diff1 \|	diff2 \|	blob \| history
fs_selfservice/FS-SelfService/cgi/agent.cgi	diff1 \|	diff2 \|	blob \| history
fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi	diff1 \|	diff2 \|	blob \| history
fs_selfservice/FS-SelfService/cgi/xmlrpc.cgi	diff1 \|	diff2 \|	blob \| history
httemplate/browse/cust_note_class.html	diff1 \|	diff2 \|	blob \| history
httemplate/docs/license.html	diff1 \|	diff2 \|	blob \| history
httemplate/edit/discount.html	diff1 \|	diff2 \|	blob \| history
httemplate/edit/process/cust_pkg_discount.html	diff1 \|	diff2 \|	blob \| history
httemplate/edit/process/quick-cust_pkg.cgi	diff1 \|	diff2 \|	blob \| history
httemplate/edit/process/svc_broadband.cgi	diff1 \|	diff2 \|	blob \| history
httemplate/elements/tr-select-discount.html	diff1 \|	diff2 \|	blob \| history
httemplate/view/cust_main/custom_content/.birthdate.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.small_custview.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.spouse_birthdate.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.svc_Common.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.svc_acct.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.svc_hardware.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.svc_phone.html.swp	blob1 \|	blob2 \|	history
rt/sbin/rt-server.fcgi.in	diff1 \|	diff2 \|	blob \| history
rt/sbin/rt-server.in	diff1 \|	diff2 \|	blob \| history
rt/sbin/rt-test-dependencies.in	diff1 \|	diff2 \|	blob \| history
rt/share/html/Search/Results.xls	diff1 \|	diff2 \|	blob \| history
rt/t/api/config.t	diff1 \|	diff2 \|	blob \| history
rt/t/api/template-insert.t	blob1 \|	blob2 \|	history
rt/t/api/template-simple.t	blob1 \|	blob2 \|	history
rt/t/api/template.t	diff1 \|	diff2 \|	blob \| history
rt/t/articles/search-interface.t	diff1 \|	diff2 \|	blob \| history
rt/t/articles/uri-a.t	diff1 \|	diff2 \|	blob \| history
rt/t/data/configs/apache2.2+fastcgi.conf.in	diff1 \|	diff2 \|	blob \| history
rt/t/data/configs/apache2.2+mod_perl.conf.in	diff1 \|	diff2 \|	blob \| history
rt/t/mail/dashboard-chart-with-utf8.t	diff1 \|	diff2 \|	blob \| history
rt/t/mail/dashboards.t	diff1 \|	diff2 \|	blob \| history
rt/t/mail/gateway.t	diff1 \|	diff2 \|	blob \| history
rt/t/shredder/01ticket.t	diff1 \|	diff2 \|	blob \| history
rt/t/shredder/03plugin_tickets.t	diff1 \|	diff2 \|	blob \| history
rt/t/shredder/03plugin_users.t	diff1 \|	diff2 \|	blob \| history
rt/t/shredder/utils.pl	diff1 \|	diff2 \|	blob \| history
rt/t/ticket/search_by_watcher.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/attachments.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/command_line.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/command_line_with_unknown_field.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/crypt-gnupg.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/googleish_search.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/query_builder_queue_limits.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/search_simple.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/ticket_modify_all.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/transaction_batch.t	diff1 \|	diff2 \|	blob \| history

Freeside billing, trouble ticketing, network monitoring and provisioning

RSS Atom

FS/FS/Misc.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/TicketSystem/RT_Internal.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/cust_main/Billing.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/cust_pkg_discount.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/discount.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/part_event/Action/pkg_agent_credit.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/part_export/shellcommands.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/rate.pm	diff1 \|	diff2 \|	blob \| history
FS/FS/svc_Tower_Mixin.pm	diff1 \|	diff2 \|	blob \| history
bin/231commit	diff1 \|	diff2 \|	blob \| history
bin/23diff	diff1 \|	diff2 \|	blob \| history
bin/cdr.import	diff1 \|	diff2 \|	blob \| history
bin/cust_main-bill_now	diff1 \|	diff2 \|	blob \| history
bin/pod2x	diff1 \|	diff2 \|	blob \| history
fs_selfservice/DEPLOY	diff1 \|	diff2 \|	blob \| history
fs_selfservice/FS-SelfService/cgi/agent.cgi	diff1 \|	diff2 \|	blob \| history
fs_selfservice/FS-SelfService/cgi/cust_bill-logo.cgi	diff1 \|	diff2 \|	blob \| history
fs_selfservice/FS-SelfService/cgi/xmlrpc.cgi	diff1 \|	diff2 \|	blob \| history
httemplate/browse/cust_note_class.html	diff1 \|	diff2 \|	blob \| history
httemplate/docs/license.html	diff1 \|	diff2 \|	blob \| history
httemplate/edit/discount.html	diff1 \|	diff2 \|	blob \| history
httemplate/edit/process/cust_pkg_discount.html	diff1 \|	diff2 \|	blob \| history
httemplate/edit/process/quick-cust_pkg.cgi	diff1 \|	diff2 \|	blob \| history
httemplate/edit/process/svc_broadband.cgi	diff1 \|	diff2 \|	blob \| history
httemplate/elements/tr-select-discount.html	diff1 \|	diff2 \|	blob \| history
httemplate/view/cust_main/custom_content/.birthdate.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.small_custview.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.spouse_birthdate.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.svc_Common.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.svc_acct.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.svc_hardware.html.swp	blob1 \|	blob2 \|	history
httemplate/view/cust_main/custom_content/.svc_phone.html.swp	blob1 \|	blob2 \|	history
rt/sbin/rt-server.fcgi.in	diff1 \|	diff2 \|	blob \| history
rt/sbin/rt-server.in	diff1 \|	diff2 \|	blob \| history
rt/sbin/rt-test-dependencies.in	diff1 \|	diff2 \|	blob \| history
rt/share/html/Search/Results.xls	diff1 \|	diff2 \|	blob \| history
rt/t/api/config.t	diff1 \|	diff2 \|	blob \| history
rt/t/api/template-insert.t	blob1 \|	blob2 \|	history
rt/t/api/template-simple.t	blob1 \|	blob2 \|	history
rt/t/api/template.t	diff1 \|	diff2 \|	blob \| history
rt/t/articles/search-interface.t	diff1 \|	diff2 \|	blob \| history
rt/t/articles/uri-a.t	diff1 \|	diff2 \|	blob \| history
rt/t/data/configs/apache2.2+fastcgi.conf.in	diff1 \|	diff2 \|	blob \| history
rt/t/data/configs/apache2.2+mod_perl.conf.in	diff1 \|	diff2 \|	blob \| history
rt/t/mail/dashboard-chart-with-utf8.t	diff1 \|	diff2 \|	blob \| history
rt/t/mail/dashboards.t	diff1 \|	diff2 \|	blob \| history
rt/t/mail/gateway.t	diff1 \|	diff2 \|	blob \| history
rt/t/shredder/01ticket.t	diff1 \|	diff2 \|	blob \| history
rt/t/shredder/03plugin_tickets.t	diff1 \|	diff2 \|	blob \| history
rt/t/shredder/03plugin_users.t	diff1 \|	diff2 \|	blob \| history
rt/t/shredder/utils.pl	diff1 \|	diff2 \|	blob \| history
rt/t/ticket/search_by_watcher.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/attachments.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/command_line.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/command_line_with_unknown_field.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/crypt-gnupg.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/googleish_search.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/query_builder_queue_limits.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/search_simple.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/ticket_modify_all.t	diff1 \|	diff2 \|	blob \| history
rt/t/web/transaction_batch.t	diff1 \|	diff2 \|	blob \| history