diff options
| author | Rob Van Dam <rvandam00@gmail.com> | 2013-11-07 15:27:24 -0700 |
|---|---|---|
| committer | Rob Van Dam <rvandam00@gmail.com> | 2013-11-07 15:27:24 -0700 |
| commit | df1ebf662a9fc3f89503036e0dbf6833c1b95f9e (patch) | |
| tree | f62eafd9d77427277e6aaa4353fb3bf8567926fd /FS/FS.pm | |
| parent | 45cd27b19e8ad50f835915746fb89e486cbb69c0 (diff) | |
| parent | a180208786cccb72ab017e39fff0cb128aa6ba01 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
FS/FS/cust_pkg.pm
Diffstat (limited to 'FS/FS.pm')
| -rw-r--r-- | FS/FS.pm | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -312,7 +312,9 @@ L<FS:;cust_pkg_discount> - Customer package discount class L<FS:;cust_bill_pkg_discount> - Customer package discount line item application class -L<FS:;discount> - Discount class +L<FS::discount> - Discount class + +L<FS::discount_class> - Discount class class L<FS::reason_type> - Reason type class |